diff --git a/README.md b/README.md index e020117..b8393f8 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.0.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.1.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 - Grasscutter
@@ -19,7 +19,7 @@ - Friend system (Assists are not working yet) - Forgotten hall - Pure Fiction -- ~~Simulated universe (Runs can be finished, but many features are missing)~~ +- Simulated universe (Runs can be finished, but many features are missing) # Running the server and client diff --git a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java index 6cdb15f..efe1568 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 entity_id = 3; + * optional uint32 entity_id = 4; */ private int entityId; /** - * optional uint32 world_level = 5; + * optional uint32 world_level = 15; */ private int worldLevel; @@ -39,7 +39,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 3; + * optional uint32 entity_id = 4; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -47,7 +47,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 3; + * optional uint32 entity_id = 4; * @return this */ public ActivateFarmElementCsReq clearEntityId() { @@ -57,7 +57,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 3; + * optional uint32 entity_id = 4; * @return the entityId */ public int getEntityId() { @@ -65,7 +65,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 3; + * optional uint32 entity_id = 4; * @param value the entityId to set * @return this */ @@ -76,7 +76,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 world_level = 5; + * optional uint32 world_level = 15; * @return whether the worldLevel field is set */ public boolean hasWorldLevel() { @@ -84,7 +84,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 world_level = 5; + * optional uint32 world_level = 15; * @return this */ public ActivateFarmElementCsReq clearWorldLevel() { @@ -94,7 +94,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 world_level = 5; + * optional uint32 world_level = 15; * @return the worldLevel */ public int getWorldLevel() { @@ -102,7 +102,7 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 world_level = 5; + * optional uint32 world_level = 15; * @param value the worldLevel 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) 24); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(worldLevel); } } @@ -205,16 +205,16 @@ public final class ActivateFarmElementCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 32: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 120) { break; } } - case 40: { + case 120: { // worldLevel worldLevel = 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 08308d9..7451ddd 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java @@ -19,20 +19,20 @@ public final class ActivateFarmElementScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 world_level = 1; + * optional uint32 world_level = 4; */ private int worldLevel; - /** - * optional uint32 entity_id = 4; - */ - private int entityId; - /** * optional uint32 retcode = 5; */ private int retcode; + /** + * optional uint32 entity_id = 7; + */ + private int entityId; + private ActivateFarmElementScRsp() { } @@ -44,7 +44,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 world_level = 1; + * optional uint32 world_level = 4; * @return whether the worldLevel field is set */ public boolean hasWorldLevel() { @@ -52,7 +52,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 world_level = 1; + * optional uint32 world_level = 4; * @return this */ public ActivateFarmElementScRsp clearWorldLevel() { @@ -62,7 +62,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 world_level = 1; + * optional uint32 world_level = 4; * @return the worldLevel */ public int getWorldLevel() { @@ -70,7 +70,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 world_level = 1; + * optional uint32 world_level = 4; * @param value the worldLevel to set * @return this */ @@ -80,49 +80,12 @@ public final class ActivateFarmElementScRspOuterClass { return this; } - /** - * optional uint32 entity_id = 4; - * @return whether the entityId field is set - */ - public boolean hasEntityId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 entity_id = 4; - * @return this - */ - public ActivateFarmElementScRsp clearEntityId() { - bitField0_ &= ~0x00000002; - 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 ActivateFarmElementScRsp setEntityId(final int value) { - bitField0_ |= 0x00000002; - entityId = value; - return this; - } - /** * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -130,7 +93,7 @@ public final class ActivateFarmElementScRspOuterClass { * @return this */ public ActivateFarmElementScRsp clearRetcode() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; retcode = 0; return this; } @@ -149,19 +112,56 @@ public final class ActivateFarmElementScRspOuterClass { * @return this */ public ActivateFarmElementScRsp setRetcode(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; retcode = value; return this; } + /** + * optional uint32 entity_id = 7; + * @return whether the entityId field is set + */ + public boolean hasEntityId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 entity_id = 7; + * @return this + */ + public ActivateFarmElementScRsp clearEntityId() { + bitField0_ &= ~0x00000004; + entityId = 0; + return this; + } + + /** + * optional uint32 entity_id = 7; + * @return the entityId + */ + public int getEntityId() { + return entityId; + } + + /** + * optional uint32 entity_id = 7; + * @param value the entityId to set + * @return this + */ + public ActivateFarmElementScRsp setEntityId(final int value) { + bitField0_ |= 0x00000004; + entityId = value; + return this; + } + @Override public ActivateFarmElementScRsp copyFrom(final ActivateFarmElementScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; worldLevel = other.worldLevel; - entityId = other.entityId; retcode = other.retcode; + entityId = other.entityId; } return this; } @@ -175,12 +175,12 @@ public final class ActivateFarmElementScRspOuterClass { if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } - if (other.hasEntityId()) { - setEntityId(other.entityId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasEntityId()) { + setEntityId(other.entityId); + } return this; } @@ -192,8 +192,8 @@ public final class ActivateFarmElementScRspOuterClass { cachedSize = -1; bitField0_ = 0; worldLevel = 0; - entityId = 0; retcode = 0; + entityId = 0; return this; } @@ -218,24 +218,24 @@ public final class ActivateFarmElementScRspOuterClass { ActivateFarmElementScRsp other = (ActivateFarmElementScRsp) o; return bitField0_ == other.bitField0_ && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasEntityId() || entityId == other.entityId) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasEntityId() || entityId == other.entityId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(entityId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(entityId); + } } @Override @@ -245,10 +245,10 @@ public final class ActivateFarmElementScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } return size; } @@ -260,20 +260,11 @@ public final class ActivateFarmElementScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 32: { // worldLevel worldLevel = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // entityId - entityId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 40) { break; } @@ -281,6 +272,15 @@ public final class ActivateFarmElementScRspOuterClass { case 40: { // retcode retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // entityId + entityId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -308,10 +308,10 @@ public final class ActivateFarmElementScRspOuterClass { output.writeUInt32(FieldNames.worldLevel, worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.entityId, entityId); } output.endObject(); } @@ -335,11 +335,10 @@ public final class ActivateFarmElementScRspOuterClass { } break; } - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -347,10 +346,11 @@ public final class ActivateFarmElementScRspOuterClass { } break; } - 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_ |= 0x00000004; } } else { @@ -413,9 +413,9 @@ public final class ActivateFarmElementScRspOuterClass { static class FieldNames { static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName entityId = FieldName.forField("entityId", "entity_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java index 430827a..cb922ee 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java @@ -19,22 +19,22 @@ public final class ActivityScheduleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 6; + * optional int64 begin_time = 1; */ private long beginTime; /** - * optional int64 end_time = 7; + * optional int64 end_time = 5; */ private long endTime; /** - * optional uint32 module_id = 5; + * optional uint32 module_id = 2; */ private int moduleId; /** - * optional uint32 activity_id = 12; + * optional uint32 activity_id = 13; */ private int activityId; @@ -49,7 +49,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional int64 begin_time = 6; + * optional int64 begin_time = 1; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -57,7 +57,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional int64 begin_time = 6; + * optional int64 begin_time = 1; * @return this */ public ActivityScheduleInfo clearBeginTime() { @@ -67,7 +67,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional int64 begin_time = 6; + * optional int64 begin_time = 1; * @return the beginTime */ public long getBeginTime() { @@ -75,7 +75,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional int64 begin_time = 6; + * optional int64 begin_time = 1; * @param value the beginTime to set * @return this */ @@ -86,7 +86,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional int64 end_time = 7; + * optional int64 end_time = 5; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -94,7 +94,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional int64 end_time = 7; + * optional int64 end_time = 5; * @return this */ public ActivityScheduleInfo clearEndTime() { @@ -104,7 +104,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional int64 end_time = 7; + * optional int64 end_time = 5; * @return the endTime */ public long getEndTime() { @@ -112,7 +112,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional int64 end_time = 7; + * optional int64 end_time = 5; * @param value the endTime to set * @return this */ @@ -123,7 +123,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 module_id = 5; + * optional uint32 module_id = 2; * @return whether the moduleId field is set */ public boolean hasModuleId() { @@ -131,7 +131,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 module_id = 5; + * optional uint32 module_id = 2; * @return this */ public ActivityScheduleInfo clearModuleId() { @@ -141,7 +141,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 module_id = 5; + * optional uint32 module_id = 2; * @return the moduleId */ public int getModuleId() { @@ -149,7 +149,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 module_id = 5; + * optional uint32 module_id = 2; * @param value the moduleId to set * @return this */ @@ -160,7 +160,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 12; + * optional uint32 activity_id = 13; * @return whether the activityId field is set */ public boolean hasActivityId() { @@ -168,7 +168,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 12; + * optional uint32 activity_id = 13; * @return this */ public ActivityScheduleInfo clearActivityId() { @@ -178,7 +178,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 12; + * optional uint32 activity_id = 13; * @return the activityId */ public int getActivityId() { @@ -186,7 +186,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 12; + * optional uint32 activity_id = 13; * @param value the activityId to set * @return this */ @@ -273,19 +273,19 @@ public final class ActivityScheduleInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 8); output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 40); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(moduleId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(activityId); } } @@ -315,34 +315,34 @@ public final class ActivityScheduleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 8: { // beginTime beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // endTime - endTime = input.readInt64(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 40) { break; } } case 40: { + // endTime + endTime = input.readInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { // moduleId moduleId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 96) { + if (tag != 104) { break; } } - case 96: { + case 104: { // activityId activityId = input.readUInt32(); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java index 40def87..c13dcf7 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 = 9; */ private int uid; /** - * optional .FriendApplySource source = 14; + * optional .FriendApplySource source = 5; */ private int source; @@ -39,7 +39,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 9; * @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 = 9; * @return this */ public ApplyFriendCsReq clearUid() { @@ -57,7 +57,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 9; * @return the uid */ public int getUid() { @@ -65,7 +65,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 9; * @param value the uid to set * @return this */ @@ -76,7 +76,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 14; + * optional .FriendApplySource source = 5; * @return whether the source field is set */ public boolean hasSource() { @@ -84,7 +84,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 14; + * optional .FriendApplySource source = 5; * @return this */ public ApplyFriendCsReq clearSource() { @@ -94,7 +94,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 14; + * optional .FriendApplySource source = 5; * @return the source */ public FriendApplySourceOuterClass.FriendApplySource getSource() { @@ -127,7 +127,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 14; + * optional .FriendApplySource source = 5; * @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) 72); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 40); output.writeEnumNoTag(source); } } @@ -230,16 +230,16 @@ public final class ApplyFriendCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 72: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 40) { break; } } - case 112: { + case 40: { // 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 389b62a..4c9bcc7 100644 --- a/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java @@ -21,27 +21,39 @@ public final class ArchiveDataOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 archive_equipment_id_list = 4; + * 
+     *  PGDKODMDBJG
+     *
+ * + * repeated uint32 archive_equipment_id_list = 3; */ private final RepeatedInt archiveEquipmentIdList = RepeatedInt.newEmptyInstance(); /** + * 
+     *  EMKDCKBMGNO
+     *
+ * + * repeated uint32 archive_missing_equipment_id_list = 6; + */ + private final RepeatedInt archiveMissingEquipmentIdList = RepeatedInt.newEmptyInstance(); + + /** + * 
+     *  GKHKFMGJNOG
+     *
+ * * repeated uint32 archive_missing_avatar_id_list = 7; */ private final RepeatedInt archiveMissingAvatarIdList = RepeatedInt.newEmptyInstance(); - /** - * repeated uint32 archive_missing_equipment_id_list = 11; - */ - private final RepeatedInt archiveMissingEquipmentIdList = RepeatedInt.newEmptyInstance(); - /** * repeated .RelicArchive relic_list = 1; */ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicArchiveOuterClass.RelicArchive.getFactory()); /** - * repeated .MonsterArchive archive_monster_id_list = 14; + * repeated .MonsterArchive archive_monster_id_list = 5; */ private final RepeatedMessage archiveMonsterIdList = RepeatedMessage.newEmptyInstance(MonsterArchiveOuterClass.MonsterArchive.getFactory()); @@ -56,7 +68,11 @@ public final class ArchiveDataOuterClass { } /** - * repeated uint32 archive_equipment_id_list = 4; + * 
+     *  PGDKODMDBJG
+     *
+ * + * repeated uint32 archive_equipment_id_list = 3; * @return whether the archiveEquipmentIdList field is set */ public boolean hasArchiveEquipmentIdList() { @@ -64,7 +80,11 @@ public final class ArchiveDataOuterClass { } /** - * repeated uint32 archive_equipment_id_list = 4; + * 
+     *  PGDKODMDBJG
+     *
+ * + * repeated uint32 archive_equipment_id_list = 3; * @return this */ public ArchiveData clearArchiveEquipmentIdList() { @@ -74,7 +94,11 @@ public final class ArchiveDataOuterClass { } /** - * repeated uint32 archive_equipment_id_list = 4; + * 
+     *  PGDKODMDBJG
+     *
+ * + * repeated uint32 archive_equipment_id_list = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -88,7 +112,11 @@ public final class ArchiveDataOuterClass { } /** - * repeated uint32 archive_equipment_id_list = 4; + * 
+     *  PGDKODMDBJG
+     *
+ * + * repeated uint32 archive_equipment_id_list = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -102,7 +130,11 @@ public final class ArchiveDataOuterClass { } /** - * repeated uint32 archive_equipment_id_list = 4; + * 
+     *  PGDKODMDBJG
+     *
+ * + * repeated uint32 archive_equipment_id_list = 3; * @param value the archiveEquipmentIdList to add * @return this */ @@ -113,7 +145,11 @@ public final class ArchiveDataOuterClass { } /** - * repeated uint32 archive_equipment_id_list = 4; + * 
+     *  PGDKODMDBJG
+     *
+ * + * repeated uint32 archive_equipment_id_list = 3; * @param values the archiveEquipmentIdList to add * @return this */ @@ -124,24 +160,128 @@ public final class ArchiveDataOuterClass { } /** - * repeated uint32 archive_missing_avatar_id_list = 7; - * @return whether the archiveMissingAvatarIdList field is set + * 
+     *  EMKDCKBMGNO
+     *
+ * + * repeated uint32 archive_missing_equipment_id_list = 6; + * @return whether the archiveMissingEquipmentIdList field is set */ - public boolean hasArchiveMissingAvatarIdList() { + public boolean hasArchiveMissingEquipmentIdList() { return (bitField0_ & 0x00000002) != 0; } /** + * 
+     *  EMKDCKBMGNO
+     *
+ * + * repeated uint32 archive_missing_equipment_id_list = 6; + * @return this + */ + public ArchiveData clearArchiveMissingEquipmentIdList() { + bitField0_ &= ~0x00000002; + archiveMissingEquipmentIdList.clear(); + return this; + } + + /** + * 
+     *  EMKDCKBMGNO
+     *
+ * + * repeated uint32 archive_missing_equipment_id_list = 6; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableArchiveMissingEquipmentIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getArchiveMissingEquipmentIdList() { + return archiveMissingEquipmentIdList; + } + + /** + * 
+     *  EMKDCKBMGNO
+     *
+ * + * repeated uint32 archive_missing_equipment_id_list = 6; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableArchiveMissingEquipmentIdList() { + bitField0_ |= 0x00000002; + return archiveMissingEquipmentIdList; + } + + /** + * 
+     *  EMKDCKBMGNO
+     *
+ * + * repeated uint32 archive_missing_equipment_id_list = 6; + * @param value the archiveMissingEquipmentIdList to add + * @return this + */ + public ArchiveData addArchiveMissingEquipmentIdList(final int value) { + bitField0_ |= 0x00000002; + archiveMissingEquipmentIdList.add(value); + return this; + } + + /** + * 
+     *  EMKDCKBMGNO
+     *
+ * + * repeated uint32 archive_missing_equipment_id_list = 6; + * @param values the archiveMissingEquipmentIdList to add + * @return this + */ + public ArchiveData addAllArchiveMissingEquipmentIdList(final int... values) { + bitField0_ |= 0x00000002; + archiveMissingEquipmentIdList.addAll(values); + return this; + } + + /** + * 
+     *  GKHKFMGJNOG
+     *
+ * + * repeated uint32 archive_missing_avatar_id_list = 7; + * @return whether the archiveMissingAvatarIdList field is set + */ + public boolean hasArchiveMissingAvatarIdList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * 
+     *  GKHKFMGJNOG
+     *
+ * * repeated uint32 archive_missing_avatar_id_list = 7; * @return this */ public ArchiveData clearArchiveMissingAvatarIdList() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; archiveMissingAvatarIdList.clear(); return this; } /** + * 
+     *  GKHKFMGJNOG
+     *
+ * * repeated uint32 archive_missing_avatar_id_list = 7; * * This method returns the internal storage object without modifying any has state. @@ -156,6 +296,10 @@ public final class ArchiveDataOuterClass { } /** + * 
+     *  GKHKFMGJNOG
+     *
+ * * repeated uint32 archive_missing_avatar_id_list = 7; * * This method returns the internal storage object and sets the corresponding @@ -165,100 +309,40 @@ public final class ArchiveDataOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableArchiveMissingAvatarIdList() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return archiveMissingAvatarIdList; } /** + * 
+     *  GKHKFMGJNOG
+     *
+ * * repeated uint32 archive_missing_avatar_id_list = 7; * @param value the archiveMissingAvatarIdList to add * @return this */ public ArchiveData addArchiveMissingAvatarIdList(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; archiveMissingAvatarIdList.add(value); return this; } /** + * 
+     *  GKHKFMGJNOG
+     *
+ * * repeated uint32 archive_missing_avatar_id_list = 7; * @param values the archiveMissingAvatarIdList to add * @return this */ public ArchiveData addAllArchiveMissingAvatarIdList(final int... values) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; archiveMissingAvatarIdList.addAll(values); return this; } - /** - * repeated uint32 archive_missing_equipment_id_list = 11; - * @return whether the archiveMissingEquipmentIdList field is set - */ - public boolean hasArchiveMissingEquipmentIdList() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated uint32 archive_missing_equipment_id_list = 11; - * @return this - */ - public ArchiveData clearArchiveMissingEquipmentIdList() { - bitField0_ &= ~0x00000004; - archiveMissingEquipmentIdList.clear(); - return this; - } - - /** - * repeated uint32 archive_missing_equipment_id_list = 11; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableArchiveMissingEquipmentIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getArchiveMissingEquipmentIdList() { - return archiveMissingEquipmentIdList; - } - - /** - * repeated uint32 archive_missing_equipment_id_list = 11; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableArchiveMissingEquipmentIdList() { - bitField0_ |= 0x00000004; - return archiveMissingEquipmentIdList; - } - - /** - * repeated uint32 archive_missing_equipment_id_list = 11; - * @param value the archiveMissingEquipmentIdList to add - * @return this - */ - public ArchiveData addArchiveMissingEquipmentIdList(final int value) { - bitField0_ |= 0x00000004; - archiveMissingEquipmentIdList.add(value); - return this; - } - - /** - * repeated uint32 archive_missing_equipment_id_list = 11; - * @param values the archiveMissingEquipmentIdList to add - * @return this - */ - public ArchiveData addAllArchiveMissingEquipmentIdList(final int... values) { - bitField0_ |= 0x00000004; - archiveMissingEquipmentIdList.addAll(values); - return this; - } - /** * repeated .RelicArchive relic_list = 1; * @return whether the relicList field is set @@ -328,7 +412,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .MonsterArchive archive_monster_id_list = 14; + * repeated .MonsterArchive archive_monster_id_list = 5; * @return whether the archiveMonsterIdList field is set */ public boolean hasArchiveMonsterIdList() { @@ -336,7 +420,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .MonsterArchive archive_monster_id_list = 14; + * repeated .MonsterArchive archive_monster_id_list = 5; * @return this */ public ArchiveData clearArchiveMonsterIdList() { @@ -346,7 +430,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .MonsterArchive archive_monster_id_list = 14; + * 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. @@ -360,7 +444,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .MonsterArchive archive_monster_id_list = 14; + * 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 @@ -375,7 +459,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .MonsterArchive archive_monster_id_list = 14; + * repeated .MonsterArchive archive_monster_id_list = 5; * @param value the archiveMonsterIdList to add * @return this */ @@ -387,7 +471,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .MonsterArchive archive_monster_id_list = 14; + * repeated .MonsterArchive archive_monster_id_list = 5; * @param values the archiveMonsterIdList to add * @return this */ @@ -404,8 +488,8 @@ public final class ArchiveDataOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; archiveEquipmentIdList.copyFrom(other.archiveEquipmentIdList); - archiveMissingAvatarIdList.copyFrom(other.archiveMissingAvatarIdList); archiveMissingEquipmentIdList.copyFrom(other.archiveMissingEquipmentIdList); + archiveMissingAvatarIdList.copyFrom(other.archiveMissingAvatarIdList); relicList.copyFrom(other.relicList); archiveMonsterIdList.copyFrom(other.archiveMonsterIdList); } @@ -421,12 +505,12 @@ public final class ArchiveDataOuterClass { if (other.hasArchiveEquipmentIdList()) { getMutableArchiveEquipmentIdList().addAll(other.archiveEquipmentIdList); } - if (other.hasArchiveMissingAvatarIdList()) { - getMutableArchiveMissingAvatarIdList().addAll(other.archiveMissingAvatarIdList); - } if (other.hasArchiveMissingEquipmentIdList()) { getMutableArchiveMissingEquipmentIdList().addAll(other.archiveMissingEquipmentIdList); } + if (other.hasArchiveMissingAvatarIdList()) { + getMutableArchiveMissingAvatarIdList().addAll(other.archiveMissingAvatarIdList); + } if (other.hasRelicList()) { getMutableRelicList().addAll(other.relicList); } @@ -444,8 +528,8 @@ public final class ArchiveDataOuterClass { cachedSize = -1; bitField0_ = 0; archiveEquipmentIdList.clear(); - archiveMissingAvatarIdList.clear(); archiveMissingEquipmentIdList.clear(); + archiveMissingAvatarIdList.clear(); relicList.clear(); archiveMonsterIdList.clear(); return this; @@ -459,8 +543,8 @@ public final class ArchiveDataOuterClass { cachedSize = -1; bitField0_ = 0; archiveEquipmentIdList.clear(); - archiveMissingAvatarIdList.clear(); archiveMissingEquipmentIdList.clear(); + archiveMissingAvatarIdList.clear(); relicList.clearQuick(); archiveMonsterIdList.clearQuick(); return this; @@ -477,8 +561,8 @@ public final class ArchiveDataOuterClass { ArchiveData other = (ArchiveData) o; return bitField0_ == other.bitField0_ && (!hasArchiveEquipmentIdList() || archiveEquipmentIdList.equals(other.archiveEquipmentIdList)) - && (!hasArchiveMissingAvatarIdList() || archiveMissingAvatarIdList.equals(other.archiveMissingAvatarIdList)) && (!hasArchiveMissingEquipmentIdList() || archiveMissingEquipmentIdList.equals(other.archiveMissingEquipmentIdList)) + && (!hasArchiveMissingAvatarIdList() || archiveMissingAvatarIdList.equals(other.archiveMissingAvatarIdList)) && (!hasRelicList() || relicList.equals(other.relicList)) && (!hasArchiveMonsterIdList() || archiveMonsterIdList.equals(other.archiveMonsterIdList)); } @@ -487,20 +571,20 @@ public final class ArchiveDataOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < archiveEquipmentIdList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(archiveEquipmentIdList.array()[i]); } } if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < archiveMissingAvatarIdList.length(); i++) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(archiveMissingAvatarIdList.array()[i]); + for (int i = 0; i < archiveMissingEquipmentIdList.length(); i++) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(archiveMissingEquipmentIdList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < archiveMissingEquipmentIdList.length(); i++) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(archiveMissingEquipmentIdList.array()[i]); + for (int i = 0; i < archiveMissingAvatarIdList.length(); i++) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(archiveMissingAvatarIdList.array()[i]); } } if ((bitField0_ & 0x00000008) != 0) { @@ -511,7 +595,7 @@ public final class ArchiveDataOuterClass { } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < archiveMonsterIdList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 42); output.writeMessageNoTag(archiveMonsterIdList.get(i)); } } @@ -524,10 +608,10 @@ public final class ArchiveDataOuterClass { size += (1 * archiveEquipmentIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveEquipmentIdList); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * archiveMissingAvatarIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveMissingAvatarIdList); + size += (1 * archiveMissingEquipmentIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveMissingEquipmentIdList); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * archiveMissingEquipmentIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveMissingEquipmentIdList); + size += (1 * archiveMissingAvatarIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveMissingAvatarIdList); } if ((bitField0_ & 0x00000008) != 0) { size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); @@ -545,11 +629,20 @@ public final class ArchiveDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { + case 26: { // archiveEquipmentIdList [packed=true] input.readPackedUInt32(archiveEquipmentIdList, tag); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 50) { + break; + } + } + case 50: { + // archiveMissingEquipmentIdList [packed=true] + input.readPackedUInt32(archiveMissingEquipmentIdList, tag); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 58) { break; } @@ -557,15 +650,6 @@ public final class ArchiveDataOuterClass { case 58: { // archiveMissingAvatarIdList [packed=true] input.readPackedUInt32(archiveMissingAvatarIdList, tag); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { - // archiveMissingEquipmentIdList [packed=true] - input.readPackedUInt32(archiveMissingEquipmentIdList, tag); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 10) { @@ -576,11 +660,11 @@ public final class ArchiveDataOuterClass { // relicList tag = input.readRepeatedMessage(relicList, tag); bitField0_ |= 0x00000008; - if (tag != 114) { + if (tag != 42) { break; } } - case 114: { + case 42: { // archiveMonsterIdList tag = input.readRepeatedMessage(archiveMonsterIdList, tag); bitField0_ |= 0x00000010; @@ -598,21 +682,21 @@ public final class ArchiveDataOuterClass { tag = input.readTag(); break; } - case 32: { + case 24: { // archiveEquipmentIdList [packed=false] tag = input.readRepeatedUInt32(archiveEquipmentIdList, tag); bitField0_ |= 0x00000001; break; } - case 56: { - // archiveMissingAvatarIdList [packed=false] - tag = input.readRepeatedUInt32(archiveMissingAvatarIdList, tag); + case 48: { + // archiveMissingEquipmentIdList [packed=false] + tag = input.readRepeatedUInt32(archiveMissingEquipmentIdList, tag); bitField0_ |= 0x00000002; break; } - case 88: { - // archiveMissingEquipmentIdList [packed=false] - tag = input.readRepeatedUInt32(archiveMissingEquipmentIdList, tag); + case 56: { + // archiveMissingAvatarIdList [packed=false] + tag = input.readRepeatedUInt32(archiveMissingAvatarIdList, tag); bitField0_ |= 0x00000004; break; } @@ -627,10 +711,10 @@ public final class ArchiveDataOuterClass { output.writeRepeatedUInt32(FieldNames.archiveEquipmentIdList, archiveEquipmentIdList); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedUInt32(FieldNames.archiveMissingAvatarIdList, archiveMissingAvatarIdList); + output.writeRepeatedUInt32(FieldNames.archiveMissingEquipmentIdList, archiveMissingEquipmentIdList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.archiveMissingEquipmentIdList, archiveMissingEquipmentIdList); + output.writeRepeatedUInt32(FieldNames.archiveMissingAvatarIdList, archiveMissingAvatarIdList); } if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.relicList, relicList); @@ -660,11 +744,11 @@ public final class ArchiveDataOuterClass { } break; } - case 891812726: - case 1757924466: { - if (input.isAtField(FieldNames.archiveMissingAvatarIdList)) { + case 1781811363: + case 1210317755: { + if (input.isAtField(FieldNames.archiveMissingEquipmentIdList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(archiveMissingAvatarIdList); + input.readRepeatedUInt32(archiveMissingEquipmentIdList); bitField0_ |= 0x00000002; } } else { @@ -672,11 +756,11 @@ public final class ArchiveDataOuterClass { } break; } - case 1781811363: - case 1210317755: { - if (input.isAtField(FieldNames.archiveMissingEquipmentIdList)) { + case 891812726: + case 1757924466: { + if (input.isAtField(FieldNames.archiveMissingAvatarIdList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(archiveMissingEquipmentIdList); + input.readRepeatedUInt32(archiveMissingAvatarIdList); bitField0_ |= 0x00000004; } } else { @@ -762,10 +846,10 @@ public final class ArchiveDataOuterClass { static class FieldNames { static final FieldName archiveEquipmentIdList = FieldName.forField("archiveEquipmentIdList", "archive_equipment_id_list"); - static final FieldName archiveMissingAvatarIdList = FieldName.forField("archiveMissingAvatarIdList", "archive_missing_avatar_id_list"); - static final FieldName archiveMissingEquipmentIdList = FieldName.forField("archiveMissingEquipmentIdList", "archive_missing_equipment_id_list"); + static final FieldName archiveMissingAvatarIdList = FieldName.forField("archiveMissingAvatarIdList", "archive_missing_avatar_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/AssistSimpleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/AssistSimpleInfoOuterClass.java index bad243d..e629144 100644 --- a/src/generated/main/emu/lunarcore/proto/AssistSimpleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AssistSimpleInfoOuterClass.java @@ -19,24 +19,24 @@ public final class AssistSimpleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 pos = 4; + * optional uint32 dressed_skin_id = 4; */ - private int pos; + private int dressedSkinId; /** - * optional uint32 avatar_id = 7; + * optional uint32 avatar_id = 10; */ private int avatarId; /** - * optional uint32 level = 8; + * optional uint32 pos = 13; */ - private int level; + private int pos; /** - * optional uint32 dressed_skin_id = 11; + * optional uint32 level = 15; */ - private int dressedSkinId; + private int level; private AssistSimpleInfo() { } @@ -49,44 +49,44 @@ public final class AssistSimpleInfoOuterClass { } /** - * optional uint32 pos = 4; - * @return whether the pos field is set + * optional uint32 dressed_skin_id = 4; + * @return whether the dressedSkinId field is set */ - public boolean hasPos() { + public boolean hasDressedSkinId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 pos = 4; + * optional uint32 dressed_skin_id = 4; * @return this */ - public AssistSimpleInfo clearPos() { + public AssistSimpleInfo clearDressedSkinId() { bitField0_ &= ~0x00000001; - pos = 0; + dressedSkinId = 0; return this; } /** - * optional uint32 pos = 4; - * @return the pos + * optional uint32 dressed_skin_id = 4; + * @return the dressedSkinId */ - public int getPos() { - return pos; + public int getDressedSkinId() { + return dressedSkinId; } /** - * optional uint32 pos = 4; - * @param value the pos to set + * optional uint32 dressed_skin_id = 4; + * @param value the dressedSkinId to set * @return this */ - public AssistSimpleInfo setPos(final int value) { + public AssistSimpleInfo setDressedSkinId(final int value) { bitField0_ |= 0x00000001; - pos = value; + dressedSkinId = value; return this; } /** - * optional uint32 avatar_id = 7; + * optional uint32 avatar_id = 10; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -94,7 +94,7 @@ public final class AssistSimpleInfoOuterClass { } /** - * optional uint32 avatar_id = 7; + * optional uint32 avatar_id = 10; * @return this */ public AssistSimpleInfo clearAvatarId() { @@ -104,7 +104,7 @@ public final class AssistSimpleInfoOuterClass { } /** - * optional uint32 avatar_id = 7; + * optional uint32 avatar_id = 10; * @return the avatarId */ public int getAvatarId() { @@ -112,7 +112,7 @@ public final class AssistSimpleInfoOuterClass { } /** - * optional uint32 avatar_id = 7; + * optional uint32 avatar_id = 10; * @param value the avatarId to set * @return this */ @@ -123,25 +123,62 @@ public final class AssistSimpleInfoOuterClass { } /** - * optional uint32 level = 8; - * @return whether the level field is set + * optional uint32 pos = 13; + * @return whether the pos field is set */ - public boolean hasLevel() { + public boolean hasPos() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 level = 8; + * optional uint32 pos = 13; + * @return this + */ + public AssistSimpleInfo clearPos() { + bitField0_ &= ~0x00000004; + 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 AssistSimpleInfo setPos(final int value) { + bitField0_ |= 0x00000004; + pos = value; + return this; + } + + /** + * optional uint32 level = 15; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 level = 15; * @return this */ public AssistSimpleInfo clearLevel() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; level = 0; return this; } /** - * optional uint32 level = 8; + * optional uint32 level = 15; * @return the level */ public int getLevel() { @@ -149,50 +186,13 @@ public final class AssistSimpleInfoOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 15; * @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 = 11; - * @return whether the dressedSkinId field is set - */ - public boolean hasDressedSkinId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 dressed_skin_id = 11; - * @return this - */ - public AssistSimpleInfo clearDressedSkinId() { - bitField0_ &= ~0x00000008; - dressedSkinId = 0; - return this; - } - - /** - * optional uint32 dressed_skin_id = 11; - * @return the dressedSkinId - */ - public int getDressedSkinId() { - return dressedSkinId; - } - - /** - * optional uint32 dressed_skin_id = 11; - * @param value the dressedSkinId to set - * @return this - */ - public AssistSimpleInfo setDressedSkinId(final int value) { bitField0_ |= 0x00000008; - dressedSkinId = value; + level = value; return this; } @@ -201,10 +201,10 @@ public final class AssistSimpleInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - pos = other.pos; - avatarId = other.avatarId; - level = other.level; dressedSkinId = other.dressedSkinId; + avatarId = other.avatarId; + pos = other.pos; + level = other.level; } return this; } @@ -215,18 +215,18 @@ public final class AssistSimpleInfoOuterClass { return this; } cachedSize = -1; - if (other.hasPos()) { - setPos(other.pos); + 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; - pos = 0; - avatarId = 0; - level = 0; dressedSkinId = 0; + avatarId = 0; + pos = 0; + level = 0; return this; } @@ -264,29 +264,29 @@ public final class AssistSimpleInfoOuterClass { } AssistSimpleInfo other = (AssistSimpleInfo) o; return bitField0_ == other.bitField0_ - && (!hasPos() || pos == other.pos) + && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) && (!hasAvatarId() || avatarId == other.avatarId) - && (!hasLevel() || level == other.level) - && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId); + && (!hasPos() || pos == other.pos) + && (!hasLevel() || level == other.level); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(pos); + output.writeUInt32NoTag(dressedSkinId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(pos); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(dressedSkinId); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(level); } } @@ -294,16 +294,16 @@ public final class AssistSimpleInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pos); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(pos); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } return size; } @@ -316,35 +316,35 @@ public final class AssistSimpleInfoOuterClass { while (true) { switch (tag) { case 32: { - // pos - pos = input.readUInt32(); + // dressedSkinId + dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 80) { break; } } - case 56: { + case 80: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 104) { break; } } - case 64: { - // level - level = input.readUInt32(); + case 104: { + // pos + pos = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 88) { + if (tag != 120) { break; } } - case 88: { - // dressedSkinId - dressedSkinId = input.readUInt32(); + case 120: { + // level + level = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public final class AssistSimpleInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.pos, pos); + output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.avatarId, avatarId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.pos, pos); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); + output.writeUInt32(FieldNames.level, level); } output.endObject(); } @@ -390,10 +390,11 @@ public final class AssistSimpleInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 111188: { - if (input.isAtField(FieldNames.pos)) { + case -407000018: + case 2012697844: { + if (input.isAtField(FieldNames.dressedSkinId)) { if (!input.trySkipNullValue()) { - pos = input.readUInt32(); + dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -413,10 +414,10 @@ public final class AssistSimpleInfoOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case 111188: { + if (input.isAtField(FieldNames.pos)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + pos = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -424,11 +425,10 @@ public final class AssistSimpleInfoOuterClass { } break; } - case -407000018: - case 2012697844: { - if (input.isAtField(FieldNames.dressedSkinId)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - dressedSkinId = input.readUInt32(); + level = 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 pos = FieldName.forField("pos"); + static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); 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 dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); + static final FieldName level = FieldName.forField("level"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java index 1a05f7e..8994e30 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 = 9; + * optional uint32 base_avatar_id = 13; */ private int baseAvatarId; /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 13; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -47,7 +47,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 13; * @return this */ public AvatarExpUpCsReq clearBaseAvatarId() { @@ -57,7 +57,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 13; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -65,7 +65,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 13; * @param value the baseAvatarId to set * @return this */ @@ -76,7 +76,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; * @return this */ public AvatarExpUpCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; * @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) 72); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 10); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class AvatarExpUpCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 104: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 10) { break; } } - case 26: { + case 10: { // 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 962282d..a4b8a20 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 = 13; + * optional uint32 retcode = 7; */ private int retcode; /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 9; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 7; * @return this */ public AvatarExpUpScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 9; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 9; * @return this */ public AvatarExpUpScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_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. @@ -109,7 +109,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_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 @@ -123,7 +123,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 9; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 9; * @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) 104); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 74); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public final class AvatarExpUpScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 74) { break; } } - case 82: { + case 74: { // 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 2bbac38..abf26f0 100644 --- a/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java @@ -21,7 +21,7 @@ public final class AvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 first_met_timestamp = 6; + * optional uint64 first_met_timestamp = 13; */ private long firstMetTimestamp; @@ -31,47 +31,47 @@ public final class AvatarOuterClass { private int promotion; /** - * optional uint32 exp = 2; - */ - private int exp; - - /** - * optional uint32 base_avatar_id = 5; - */ - private int baseAvatarId; - - /** - * optional uint32 level = 7; - */ - private int level; - - /** - * optional uint32 dressed_skin_id = 8; - */ - private int dressedSkinId; - - /** - * optional uint32 rank = 12; + * optional uint32 rank = 2; */ private int rank; /** - * optional uint32 equipment_unique_id = 15; + * optional uint32 level = 3; + */ + private int level; + + /** + * optional uint32 dressed_skin_id = 7; + */ + private int dressedSkinId; + + /** + * optional uint32 base_avatar_id = 9; + */ + private int baseAvatarId; + + /** + * optional uint32 equipment_unique_id = 10; */ private int equipmentUniqueId; /** - * repeated uint32 taken_rewards = 10; + * optional uint32 exp = 12; + */ + private int exp; + + /** + * repeated uint32 taken_rewards = 4; */ private final RepeatedInt takenRewards = RepeatedInt.newEmptyInstance(); /** - * repeated .EquipRelic equip_relic_list = 9; + * repeated .EquipRelic equip_relic_list = 6; */ private final RepeatedMessage equipRelicList = RepeatedMessage.newEmptyInstance(EquipRelicOuterClass.EquipRelic.getFactory()); /** - * repeated .AvatarSkillTree skilltree_list = 11; + * repeated .AvatarSkillTree skilltree_list = 8; */ private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); @@ -86,7 +86,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 6; + * optional uint64 first_met_timestamp = 13; * @return whether the firstMetTimestamp field is set */ public boolean hasFirstMetTimestamp() { @@ -94,7 +94,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 6; + * optional uint64 first_met_timestamp = 13; * @return this */ public Avatar clearFirstMetTimestamp() { @@ -104,7 +104,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 6; + * optional uint64 first_met_timestamp = 13; * @return the firstMetTimestamp */ public long getFirstMetTimestamp() { @@ -112,7 +112,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 6; + * optional uint64 first_met_timestamp = 13; * @param value the firstMetTimestamp to set * @return this */ @@ -160,173 +160,25 @@ public final class AvatarOuterClass { } /** - * optional uint32 exp = 2; - * @return whether the exp field is set + * optional uint32 rank = 2; + * @return whether the rank field is set */ - public boolean hasExp() { + public boolean hasRank() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 exp = 2; - * @return this - */ - public Avatar clearExp() { - bitField0_ &= ~0x00000004; - exp = 0; - return this; - } - - /** - * optional uint32 exp = 2; - * @return the exp - */ - public int getExp() { - return exp; - } - - /** - * optional uint32 exp = 2; - * @param value the exp to set - * @return this - */ - public Avatar setExp(final int value) { - bitField0_ |= 0x00000004; - exp = 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; - * @return this - */ - public Avatar clearBaseAvatarId() { - bitField0_ &= ~0x00000008; - baseAvatarId = 0; - return this; - } - - /** - * optional uint32 base_avatar_id = 5; - * @return the baseAvatarId - */ - public int getBaseAvatarId() { - return baseAvatarId; - } - - /** - * optional uint32 base_avatar_id = 5; - * @param value the baseAvatarId to set - * @return this - */ - public Avatar setBaseAvatarId(final int value) { - bitField0_ |= 0x00000008; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 level = 7; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 level = 7; - * @return this - */ - public Avatar clearLevel() { - bitField0_ &= ~0x00000010; - level = 0; - return this; - } - - /** - * optional uint32 level = 7; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 7; - * @param value the level to set - * @return this - */ - public Avatar setLevel(final int value) { - bitField0_ |= 0x00000010; - level = value; - return this; - } - - /** - * optional uint32 dressed_skin_id = 8; - * @return whether the dressedSkinId field is set - */ - public boolean hasDressedSkinId() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 dressed_skin_id = 8; - * @return this - */ - public Avatar clearDressedSkinId() { - bitField0_ &= ~0x00000020; - dressedSkinId = 0; - return this; - } - - /** - * optional uint32 dressed_skin_id = 8; - * @return the dressedSkinId - */ - public int getDressedSkinId() { - return dressedSkinId; - } - - /** - * optional uint32 dressed_skin_id = 8; - * @param value the dressedSkinId to set - * @return this - */ - public Avatar setDressedSkinId(final int value) { - bitField0_ |= 0x00000020; - dressedSkinId = value; - return this; - } - - /** - * optional uint32 rank = 12; - * @return whether the rank field is set - */ - public boolean hasRank() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional uint32 rank = 12; + * optional uint32 rank = 2; * @return this */ public Avatar clearRank() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000004; rank = 0; return this; } /** - * optional uint32 rank = 12; + * optional uint32 rank = 2; * @return the rank */ public int getRank() { @@ -334,36 +186,147 @@ public final class AvatarOuterClass { } /** - * optional uint32 rank = 12; + * optional uint32 rank = 2; * @param value the rank to set * @return this */ public Avatar setRank(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000004; rank = value; return this; } /** - * optional uint32 equipment_unique_id = 15; - * @return whether the equipmentUniqueId field is set + * optional uint32 level = 3; + * @return whether the level field is set */ - public boolean hasEquipmentUniqueId() { - return (bitField0_ & 0x00000080) != 0; + public boolean hasLevel() { + return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 equipment_unique_id = 15; + * optional uint32 level = 3; + * @return this + */ + public Avatar clearLevel() { + bitField0_ &= ~0x00000008; + 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 Avatar setLevel(final int value) { + bitField0_ |= 0x00000008; + level = value; + return this; + } + + /** + * optional uint32 dressed_skin_id = 7; + * @return whether the dressedSkinId field is set + */ + public boolean hasDressedSkinId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 dressed_skin_id = 7; + * @return this + */ + public Avatar clearDressedSkinId() { + bitField0_ &= ~0x00000010; + dressedSkinId = 0; + return this; + } + + /** + * optional uint32 dressed_skin_id = 7; + * @return the dressedSkinId + */ + public int getDressedSkinId() { + return dressedSkinId; + } + + /** + * optional uint32 dressed_skin_id = 7; + * @param value the dressedSkinId to set + * @return this + */ + public Avatar setDressedSkinId(final int value) { + bitField0_ |= 0x00000010; + dressedSkinId = value; + return this; + } + + /** + * optional uint32 base_avatar_id = 9; + * @return whether the baseAvatarId field is set + */ + public boolean hasBaseAvatarId() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 base_avatar_id = 9; + * @return this + */ + public Avatar clearBaseAvatarId() { + bitField0_ &= ~0x00000020; + baseAvatarId = 0; + return this; + } + + /** + * optional uint32 base_avatar_id = 9; + * @return the baseAvatarId + */ + public int getBaseAvatarId() { + return baseAvatarId; + } + + /** + * optional uint32 base_avatar_id = 9; + * @param value the baseAvatarId to set + * @return this + */ + public Avatar setBaseAvatarId(final int value) { + bitField0_ |= 0x00000020; + baseAvatarId = value; + return this; + } + + /** + * optional uint32 equipment_unique_id = 10; + * @return whether the equipmentUniqueId field is set + */ + public boolean hasEquipmentUniqueId() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional uint32 equipment_unique_id = 10; * @return this */ public Avatar clearEquipmentUniqueId() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; equipmentUniqueId = 0; return this; } /** - * optional uint32 equipment_unique_id = 15; + * optional uint32 equipment_unique_id = 10; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -371,18 +334,55 @@ public final class AvatarOuterClass { } /** - * optional uint32 equipment_unique_id = 15; + * optional uint32 equipment_unique_id = 10; * @param value the equipmentUniqueId to set * @return this */ public Avatar setEquipmentUniqueId(final int value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; equipmentUniqueId = value; return this; } /** - * repeated uint32 taken_rewards = 10; + * optional uint32 exp = 12; + * @return whether the exp field is set + */ + public boolean hasExp() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional uint32 exp = 12; + * @return this + */ + public Avatar clearExp() { + bitField0_ &= ~0x00000080; + 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 Avatar setExp(final int value) { + bitField0_ |= 0x00000080; + exp = value; + return this; + } + + /** + * repeated uint32 taken_rewards = 4; * @return whether the takenRewards field is set */ public boolean hasTakenRewards() { @@ -390,7 +390,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 10; + * repeated uint32 taken_rewards = 4; * @return this */ public Avatar clearTakenRewards() { @@ -400,7 +400,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 10; + * repeated uint32 taken_rewards = 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. @@ -414,7 +414,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 10; + * repeated uint32 taken_rewards = 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 @@ -428,7 +428,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 10; + * repeated uint32 taken_rewards = 4; * @param value the takenRewards to add * @return this */ @@ -439,7 +439,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 10; + * repeated uint32 taken_rewards = 4; * @param values the takenRewards to add * @return this */ @@ -450,7 +450,7 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 9; + * repeated .EquipRelic equip_relic_list = 6; * @return whether the equipRelicList field is set */ public boolean hasEquipRelicList() { @@ -458,7 +458,7 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 9; + * repeated .EquipRelic equip_relic_list = 6; * @return this */ public Avatar clearEquipRelicList() { @@ -468,7 +468,7 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 9; + * repeated .EquipRelic equip_relic_list = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -482,7 +482,7 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 9; + * repeated .EquipRelic equip_relic_list = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -496,7 +496,7 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 9; + * repeated .EquipRelic equip_relic_list = 6; * @param value the equipRelicList to add * @return this */ @@ -507,7 +507,7 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 9; + * repeated .EquipRelic equip_relic_list = 6; * @param values the equipRelicList to add * @return this */ @@ -518,7 +518,7 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 11; + * repeated .AvatarSkillTree skilltree_list = 8; * @return whether the skilltreeList field is set */ public boolean hasSkilltreeList() { @@ -526,7 +526,7 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 11; + * repeated .AvatarSkillTree skilltree_list = 8; * @return this */ public Avatar clearSkilltreeList() { @@ -536,7 +536,7 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 11; + * repeated .AvatarSkillTree skilltree_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. @@ -550,7 +550,7 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 11; + * repeated .AvatarSkillTree skilltree_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 @@ -564,7 +564,7 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 11; + * repeated .AvatarSkillTree skilltree_list = 8; * @param value the skilltreeList to add * @return this */ @@ -575,7 +575,7 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 11; + * repeated .AvatarSkillTree skilltree_list = 8; * @param values the skilltreeList to add * @return this */ @@ -592,12 +592,12 @@ public final class AvatarOuterClass { bitField0_ = other.bitField0_; firstMetTimestamp = other.firstMetTimestamp; promotion = other.promotion; - exp = other.exp; - baseAvatarId = other.baseAvatarId; + rank = other.rank; level = other.level; dressedSkinId = other.dressedSkinId; - rank = other.rank; + baseAvatarId = other.baseAvatarId; equipmentUniqueId = other.equipmentUniqueId; + exp = other.exp; takenRewards.copyFrom(other.takenRewards); equipRelicList.copyFrom(other.equipRelicList); skilltreeList.copyFrom(other.skilltreeList); @@ -617,11 +617,8 @@ public final class AvatarOuterClass { if (other.hasPromotion()) { setPromotion(other.promotion); } - if (other.hasExp()) { - setExp(other.exp); - } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); + if (other.hasRank()) { + setRank(other.rank); } if (other.hasLevel()) { setLevel(other.level); @@ -629,12 +626,15 @@ public final class AvatarOuterClass { if (other.hasDressedSkinId()) { setDressedSkinId(other.dressedSkinId); } - if (other.hasRank()) { - setRank(other.rank); + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); } if (other.hasEquipmentUniqueId()) { setEquipmentUniqueId(other.equipmentUniqueId); } + if (other.hasExp()) { + setExp(other.exp); + } if (other.hasTakenRewards()) { getMutableTakenRewards().addAll(other.takenRewards); } @@ -656,12 +656,12 @@ public final class AvatarOuterClass { bitField0_ = 0; firstMetTimestamp = 0L; promotion = 0; - exp = 0; - baseAvatarId = 0; + rank = 0; level = 0; dressedSkinId = 0; - rank = 0; + baseAvatarId = 0; equipmentUniqueId = 0; + exp = 0; takenRewards.clear(); equipRelicList.clear(); skilltreeList.clear(); @@ -693,12 +693,12 @@ public final class AvatarOuterClass { return bitField0_ == other.bitField0_ && (!hasFirstMetTimestamp() || firstMetTimestamp == other.firstMetTimestamp) && (!hasPromotion() || promotion == other.promotion) - && (!hasExp() || exp == other.exp) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasRank() || rank == other.rank) && (!hasLevel() || level == other.level) && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) - && (!hasRank() || rank == other.rank) + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) + && (!hasExp() || exp == other.exp) && (!hasTakenRewards() || takenRewards.equals(other.takenRewards)) && (!hasEquipRelicList() || equipRelicList.equals(other.equipRelicList)) && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList)); @@ -707,7 +707,7 @@ public final class AvatarOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 104); output.writeUInt64NoTag(firstMetTimestamp); } if ((bitField0_ & 0x00000002) != 0) { @@ -716,43 +716,43 @@ public final class AvatarOuterClass { } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(exp); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 56); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 64); output.writeUInt32NoTag(dressedSkinId); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(baseAvatarId); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(rank); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(equipmentUniqueId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < takenRewards.length(); i++) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(takenRewards.array()[i]); } } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < equipRelicList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 50); output.writeMessageNoTag(equipRelicList.get(i)); } } if ((bitField0_ & 0x00000400) != 0) { for (int i = 0; i < skilltreeList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 66); output.writeMessageNoTag(skilltreeList.get(i)); } } @@ -768,23 +768,23 @@ public final class AvatarOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); - } - if ((bitField0_ & 0x00000040) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + } + if ((bitField0_ & 0x00000040) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); } + if ((bitField0_ & 0x00000080) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + } if ((bitField0_ & 0x00000100) != 0) { size += (1 * takenRewards.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(takenRewards); } @@ -804,7 +804,7 @@ public final class AvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 104: { // firstMetTimestamp firstMetTimestamp = input.readUInt64(); bitField0_ |= 0x00000001; @@ -823,17 +823,17 @@ public final class AvatarOuterClass { } } case 16: { - // exp - exp = input.readUInt32(); + // rank + rank = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 40) { + if (tag != 24) { break; } } - case 40: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 24: { + // level + level = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 56) { @@ -841,59 +841,59 @@ public final class AvatarOuterClass { } } case 56: { - // level - level = input.readUInt32(); + // dressedSkinId + dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 64) { + if (tag != 72) { break; } } - case 64: { - // dressedSkinId - dressedSkinId = input.readUInt32(); + case 72: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // equipmentUniqueId + equipmentUniqueId = input.readUInt32(); + bitField0_ |= 0x00000040; + tag = input.readTag(); if (tag != 96) { break; } } case 96: { - // rank - rank = input.readUInt32(); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // equipmentUniqueId - equipmentUniqueId = input.readUInt32(); + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 82) { + if (tag != 34) { break; } } - case 82: { + case 34: { // takenRewards [packed=true] input.readPackedUInt32(takenRewards, tag); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 74) { + if (tag != 50) { break; } } - case 74: { + case 50: { // equipRelicList tag = input.readRepeatedMessage(equipRelicList, tag); bitField0_ |= 0x00000200; - if (tag != 90) { + if (tag != 66) { break; } } - case 90: { + case 66: { // skilltreeList tag = input.readRepeatedMessage(skilltreeList, tag); bitField0_ |= 0x00000400; @@ -911,7 +911,7 @@ public final class AvatarOuterClass { tag = input.readTag(); break; } - case 80: { + case 32: { // takenRewards [packed=false] tag = input.readRepeatedUInt32(takenRewards, tag); bitField0_ |= 0x00000100; @@ -931,23 +931,23 @@ public final class AvatarOuterClass { output.writeUInt32(FieldNames.promotion, promotion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.exp, exp); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); - } - if ((bitField0_ & 0x00000040) != 0) { output.writeUInt32(FieldNames.rank, rank); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.level, level); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + } + if ((bitField0_ & 0x00000040) != 0) { output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); } + if ((bitField0_ & 0x00000080) != 0) { + output.writeUInt32(FieldNames.exp, exp); + } if ((bitField0_ & 0x00000100) != 0) { output.writeRepeatedUInt32(FieldNames.takenRewards, takenRewards); } @@ -990,10 +990,10 @@ public final class AvatarOuterClass { } 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_ |= 0x00000004; } } else { @@ -1001,23 +1001,11 @@ public final class AvatarOuterClass { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { - if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case 102865796: { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -1029,18 +1017,19 @@ public final class AvatarOuterClass { if (input.isAtField(FieldNames.dressedSkinId)) { if (!input.trySkipNullValue()) { dressedSkinId = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); } break; } - case 3492908: { - if (input.isAtField(FieldNames.rank)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - rank = input.readUInt32(); - bitField0_ |= 0x00000040; + baseAvatarId = input.readUInt32(); + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -1052,6 +1041,17 @@ public final class AvatarOuterClass { if (input.isAtField(FieldNames.equipmentUniqueId)) { if (!input.trySkipNullValue()) { equipmentUniqueId = input.readUInt32(); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } + case 100893: { + if (input.isAtField(FieldNames.exp)) { + if (!input.trySkipNullValue()) { + exp = input.readUInt32(); bitField0_ |= 0x00000080; } } else { @@ -1151,18 +1151,18 @@ public final class AvatarOuterClass { static final FieldName promotion = FieldName.forField("promotion"); - static final FieldName exp = FieldName.forField("exp"); - - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + 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 rank = FieldName.forField("rank"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); + static final FieldName exp = FieldName.forField("exp"); + static final FieldName takenRewards = FieldName.forField("takenRewards", "taken_rewards"); static final FieldName equipRelicList = FieldName.forField("equipRelicList", "equip_relic_list"); diff --git a/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java index b1c06de..7aa1227 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 = 9; + * repeated .Avatar avatar_list = 13; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory()); @@ -35,7 +35,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 9; + * repeated .Avatar avatar_list = 13; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -43,7 +43,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 9; + * repeated .Avatar avatar_list = 13; * @return this */ public AvatarSync clearAvatarList() { @@ -53,7 +53,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 9; + * 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. @@ -67,7 +67,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 9; + * 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 @@ -81,7 +81,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 9; + * repeated .Avatar avatar_list = 13; * @param value the avatarList to add * @return this */ @@ -92,7 +92,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 9; + * repeated .Avatar avatar_list = 13; * @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) 74); + output.writeRawByte((byte) 106); output.writeMessageNoTag(avatarList.get(i)); } } @@ -185,7 +185,7 @@ public final class AvatarSyncOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 106: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java index 646b1f5..f91f45e 100644 --- a/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java @@ -21,44 +21,34 @@ public final class BattlePassInfoNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 taken_premium_reward2 = 1; + * optional uint64 taken_free_reward = 1; + */ + private long takenFreeReward; + + /** + * optional uint64 taken_premium_reward2 = 7; */ private long takenPremiumReward2; /** - * optional uint64 unkfield = 2; - */ - private long unkfield; - - /** - * optional uint64 taken_premium_reward1 = 4; + * optional uint64 taken_premium_reward1 = 9; */ private long takenPremiumReward1; /** - * optional uint64 taken_premium_extended_reward = 7; + * optional uint64 taken_premium_extended_reward = 11; */ private long takenPremiumExtendedReward; - /** - * optional uint64 taken_premium_optional_reward = 8; - */ - private long takenPremiumOptionalReward; - - /** - * optional uint64 taken_free_reward = 9; - */ - private long takenFreeReward; - /** * optional uint64 taken_free_extended_reward = 12; */ private long takenFreeExtendedReward; /** - * optional uint32 cur_week_add_exp_sum = 3; + * optional uint64 taken_premium_optional_reward = 13; */ - private int curWeekAddExpSum; + private long takenPremiumOptionalReward; /** * optional uint32 cur_bp_id = 5; @@ -66,17 +56,22 @@ public final class BattlePassInfoNotifyOuterClass { private int curBpId; /** - * optional uint32 exp = 6; + * optional uint32 cur_week_add_exp_sum = 8; + */ + private int curWeekAddExpSum; + + /** + * optional uint32 exp = 14; */ private int exp; /** - * optional uint32 level = 10; + * optional uint32 level = 15; */ private int level; /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 15; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 3; */ private int bpTierType; @@ -91,25 +86,62 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_reward2 = 1; - * @return whether the takenPremiumReward2 field is set + * optional uint64 taken_free_reward = 1; + * @return whether the takenFreeReward field is set */ - public boolean hasTakenPremiumReward2() { + public boolean hasTakenFreeReward() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint64 taken_premium_reward2 = 1; + * optional uint64 taken_free_reward = 1; + * @return this + */ + public BattlePassInfoNotify clearTakenFreeReward() { + bitField0_ &= ~0x00000001; + takenFreeReward = 0L; + return this; + } + + /** + * optional uint64 taken_free_reward = 1; + * @return the takenFreeReward + */ + public long getTakenFreeReward() { + return takenFreeReward; + } + + /** + * optional uint64 taken_free_reward = 1; + * @param value the takenFreeReward to set + * @return this + */ + public BattlePassInfoNotify setTakenFreeReward(final long value) { + bitField0_ |= 0x00000001; + takenFreeReward = value; + return this; + } + + /** + * optional uint64 taken_premium_reward2 = 7; + * @return whether the takenPremiumReward2 field is set + */ + public boolean hasTakenPremiumReward2() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint64 taken_premium_reward2 = 7; * @return this */ public BattlePassInfoNotify clearTakenPremiumReward2() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; takenPremiumReward2 = 0L; return this; } /** - * optional uint64 taken_premium_reward2 = 1; + * optional uint64 taken_premium_reward2 = 7; * @return the takenPremiumReward2 */ public long getTakenPremiumReward2() { @@ -117,55 +149,18 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_reward2 = 1; + * optional uint64 taken_premium_reward2 = 7; * @param value the takenPremiumReward2 to set * @return this */ public BattlePassInfoNotify setTakenPremiumReward2(final long value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; takenPremiumReward2 = value; return this; } /** - * optional uint64 unkfield = 2; - * @return whether the unkfield field is set - */ - public boolean hasUnkfield() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint64 unkfield = 2; - * @return this - */ - public BattlePassInfoNotify clearUnkfield() { - bitField0_ &= ~0x00000002; - unkfield = 0L; - return this; - } - - /** - * optional uint64 unkfield = 2; - * @return the unkfield - */ - public long getUnkfield() { - return unkfield; - } - - /** - * optional uint64 unkfield = 2; - * @param value the unkfield to set - * @return this - */ - public BattlePassInfoNotify setUnkfield(final long value) { - bitField0_ |= 0x00000002; - unkfield = value; - return this; - } - - /** - * optional uint64 taken_premium_reward1 = 4; + * optional uint64 taken_premium_reward1 = 9; * @return whether the takenPremiumReward1 field is set */ public boolean hasTakenPremiumReward1() { @@ -173,7 +168,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_reward1 = 4; + * optional uint64 taken_premium_reward1 = 9; * @return this */ public BattlePassInfoNotify clearTakenPremiumReward1() { @@ -183,7 +178,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_reward1 = 4; + * optional uint64 taken_premium_reward1 = 9; * @return the takenPremiumReward1 */ public long getTakenPremiumReward1() { @@ -191,7 +186,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_reward1 = 4; + * optional uint64 taken_premium_reward1 = 9; * @param value the takenPremiumReward1 to set * @return this */ @@ -202,7 +197,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_extended_reward = 7; + * optional uint64 taken_premium_extended_reward = 11; * @return whether the takenPremiumExtendedReward field is set */ public boolean hasTakenPremiumExtendedReward() { @@ -210,7 +205,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_extended_reward = 7; + * optional uint64 taken_premium_extended_reward = 11; * @return this */ public BattlePassInfoNotify clearTakenPremiumExtendedReward() { @@ -220,7 +215,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_extended_reward = 7; + * optional uint64 taken_premium_extended_reward = 11; * @return the takenPremiumExtendedReward */ public long getTakenPremiumExtendedReward() { @@ -228,7 +223,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_extended_reward = 7; + * optional uint64 taken_premium_extended_reward = 11; * @param value the takenPremiumExtendedReward to set * @return this */ @@ -238,86 +233,12 @@ public final class BattlePassInfoNotifyOuterClass { return this; } - /** - * optional uint64 taken_premium_optional_reward = 8; - * @return whether the takenPremiumOptionalReward field is set - */ - public boolean hasTakenPremiumOptionalReward() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint64 taken_premium_optional_reward = 8; - * @return this - */ - public BattlePassInfoNotify clearTakenPremiumOptionalReward() { - bitField0_ &= ~0x00000010; - takenPremiumOptionalReward = 0L; - return this; - } - - /** - * optional uint64 taken_premium_optional_reward = 8; - * @return the takenPremiumOptionalReward - */ - public long getTakenPremiumOptionalReward() { - return takenPremiumOptionalReward; - } - - /** - * optional uint64 taken_premium_optional_reward = 8; - * @param value the takenPremiumOptionalReward to set - * @return this - */ - public BattlePassInfoNotify setTakenPremiumOptionalReward(final long value) { - bitField0_ |= 0x00000010; - takenPremiumOptionalReward = value; - return this; - } - - /** - * optional uint64 taken_free_reward = 9; - * @return whether the takenFreeReward field is set - */ - public boolean hasTakenFreeReward() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint64 taken_free_reward = 9; - * @return this - */ - public BattlePassInfoNotify clearTakenFreeReward() { - bitField0_ &= ~0x00000020; - takenFreeReward = 0L; - return this; - } - - /** - * optional uint64 taken_free_reward = 9; - * @return the takenFreeReward - */ - public long getTakenFreeReward() { - return takenFreeReward; - } - - /** - * optional uint64 taken_free_reward = 9; - * @param value the takenFreeReward to set - * @return this - */ - public BattlePassInfoNotify setTakenFreeReward(final long value) { - bitField0_ |= 0x00000020; - takenFreeReward = value; - return this; - } - /** * optional uint64 taken_free_extended_reward = 12; * @return whether the takenFreeExtendedReward field is set */ public boolean hasTakenFreeExtendedReward() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000010) != 0; } /** @@ -325,7 +246,7 @@ public final class BattlePassInfoNotifyOuterClass { * @return this */ public BattlePassInfoNotify clearTakenFreeExtendedReward() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000010; takenFreeExtendedReward = 0L; return this; } @@ -344,45 +265,45 @@ public final class BattlePassInfoNotifyOuterClass { * @return this */ public BattlePassInfoNotify setTakenFreeExtendedReward(final long value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; takenFreeExtendedReward = value; return this; } /** - * optional uint32 cur_week_add_exp_sum = 3; - * @return whether the curWeekAddExpSum field is set + * optional uint64 taken_premium_optional_reward = 13; + * @return whether the takenPremiumOptionalReward field is set */ - public boolean hasCurWeekAddExpSum() { - return (bitField0_ & 0x00000080) != 0; + public boolean hasTakenPremiumOptionalReward() { + return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 cur_week_add_exp_sum = 3; + * optional uint64 taken_premium_optional_reward = 13; * @return this */ - public BattlePassInfoNotify clearCurWeekAddExpSum() { - bitField0_ &= ~0x00000080; - curWeekAddExpSum = 0; + public BattlePassInfoNotify clearTakenPremiumOptionalReward() { + bitField0_ &= ~0x00000020; + takenPremiumOptionalReward = 0L; return this; } /** - * optional uint32 cur_week_add_exp_sum = 3; - * @return the curWeekAddExpSum + * optional uint64 taken_premium_optional_reward = 13; + * @return the takenPremiumOptionalReward */ - public int getCurWeekAddExpSum() { - return curWeekAddExpSum; + public long getTakenPremiumOptionalReward() { + return takenPremiumOptionalReward; } /** - * optional uint32 cur_week_add_exp_sum = 3; - * @param value the curWeekAddExpSum to set + * optional uint64 taken_premium_optional_reward = 13; + * @param value the takenPremiumOptionalReward to set * @return this */ - public BattlePassInfoNotify setCurWeekAddExpSum(final int value) { - bitField0_ |= 0x00000080; - curWeekAddExpSum = value; + public BattlePassInfoNotify setTakenPremiumOptionalReward(final long value) { + bitField0_ |= 0x00000020; + takenPremiumOptionalReward = value; return this; } @@ -391,7 +312,7 @@ public final class BattlePassInfoNotifyOuterClass { * @return whether the curBpId field is set */ public boolean hasCurBpId() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000040) != 0; } /** @@ -399,7 +320,7 @@ public final class BattlePassInfoNotifyOuterClass { * @return this */ public BattlePassInfoNotify clearCurBpId() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000040; curBpId = 0; return this; } @@ -418,31 +339,68 @@ public final class BattlePassInfoNotifyOuterClass { * @return this */ public BattlePassInfoNotify setCurBpId(final int value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; curBpId = value; return this; } /** - * optional uint32 exp = 6; - * @return whether the exp field is set + * optional uint32 cur_week_add_exp_sum = 8; + * @return whether the curWeekAddExpSum field is set */ - public boolean hasExp() { - return (bitField0_ & 0x00000200) != 0; + public boolean hasCurWeekAddExpSum() { + return (bitField0_ & 0x00000080) != 0; } /** - * optional uint32 exp = 6; + * optional uint32 cur_week_add_exp_sum = 8; + * @return this + */ + public BattlePassInfoNotify clearCurWeekAddExpSum() { + bitField0_ &= ~0x00000080; + curWeekAddExpSum = 0; + return this; + } + + /** + * optional uint32 cur_week_add_exp_sum = 8; + * @return the curWeekAddExpSum + */ + public int getCurWeekAddExpSum() { + return curWeekAddExpSum; + } + + /** + * optional uint32 cur_week_add_exp_sum = 8; + * @param value the curWeekAddExpSum to set + * @return this + */ + public BattlePassInfoNotify setCurWeekAddExpSum(final int value) { + bitField0_ |= 0x00000080; + curWeekAddExpSum = value; + return this; + } + + /** + * optional uint32 exp = 14; + * @return whether the exp field is set + */ + public boolean hasExp() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * optional uint32 exp = 14; * @return this */ public BattlePassInfoNotify clearExp() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000100; exp = 0; return this; } /** - * optional uint32 exp = 6; + * optional uint32 exp = 14; * @return the exp */ public int getExp() { @@ -450,36 +408,36 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint32 exp = 6; + * optional uint32 exp = 14; * @param value the exp to set * @return this */ public BattlePassInfoNotify setExp(final int value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; exp = value; return this; } /** - * optional uint32 level = 10; + * optional uint32 level = 15; * @return whether the level field is set */ public boolean hasLevel() { - return (bitField0_ & 0x00000400) != 0; + return (bitField0_ & 0x00000200) != 0; } /** - * optional uint32 level = 10; + * optional uint32 level = 15; * @return this */ public BattlePassInfoNotify clearLevel() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00000200; level = 0; return this; } /** - * optional uint32 level = 10; + * optional uint32 level = 15; * @return the level */ public int getLevel() { @@ -487,36 +445,36 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint32 level = 10; + * optional uint32 level = 15; * @param value the level to set * @return this */ public BattlePassInfoNotify setLevel(final int value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; level = value; return this; } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 15; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 3; * @return whether the bpTierType field is set */ public boolean hasBpTierType() { - return (bitField0_ & 0x00000800) != 0; + return (bitField0_ & 0x00000400) != 0; } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 15; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 3; * @return this */ public BattlePassInfoNotify clearBpTierType() { - bitField0_ &= ~0x00000800; + bitField0_ &= ~0x00000400; bpTierType = 0; return this; } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 15; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 3; * @return the bpTierType */ public BpTierType getBpTierType() { @@ -543,18 +501,18 @@ public final class BattlePassInfoNotifyOuterClass { * @return this */ public BattlePassInfoNotify setBpTierTypeValue(final int value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; bpTierType = value; return this; } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 15; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 3; * @param value the bpTierType to set * @return this */ public BattlePassInfoNotify setBpTierType(final BpTierType value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; bpTierType = value.getNumber(); return this; } @@ -564,15 +522,14 @@ public final class BattlePassInfoNotifyOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + takenFreeReward = other.takenFreeReward; takenPremiumReward2 = other.takenPremiumReward2; - unkfield = other.unkfield; takenPremiumReward1 = other.takenPremiumReward1; takenPremiumExtendedReward = other.takenPremiumExtendedReward; - takenPremiumOptionalReward = other.takenPremiumOptionalReward; - takenFreeReward = other.takenFreeReward; takenFreeExtendedReward = other.takenFreeExtendedReward; - curWeekAddExpSum = other.curWeekAddExpSum; + takenPremiumOptionalReward = other.takenPremiumOptionalReward; curBpId = other.curBpId; + curWeekAddExpSum = other.curWeekAddExpSum; exp = other.exp; level = other.level; bpTierType = other.bpTierType; @@ -586,33 +543,30 @@ public final class BattlePassInfoNotifyOuterClass { return this; } cachedSize = -1; + if (other.hasTakenFreeReward()) { + setTakenFreeReward(other.takenFreeReward); + } if (other.hasTakenPremiumReward2()) { setTakenPremiumReward2(other.takenPremiumReward2); } - if (other.hasUnkfield()) { - setUnkfield(other.unkfield); - } if (other.hasTakenPremiumReward1()) { setTakenPremiumReward1(other.takenPremiumReward1); } if (other.hasTakenPremiumExtendedReward()) { setTakenPremiumExtendedReward(other.takenPremiumExtendedReward); } - if (other.hasTakenPremiumOptionalReward()) { - setTakenPremiumOptionalReward(other.takenPremiumOptionalReward); - } - if (other.hasTakenFreeReward()) { - setTakenFreeReward(other.takenFreeReward); - } if (other.hasTakenFreeExtendedReward()) { setTakenFreeExtendedReward(other.takenFreeExtendedReward); } - if (other.hasCurWeekAddExpSum()) { - setCurWeekAddExpSum(other.curWeekAddExpSum); + if (other.hasTakenPremiumOptionalReward()) { + setTakenPremiumOptionalReward(other.takenPremiumOptionalReward); } if (other.hasCurBpId()) { setCurBpId(other.curBpId); } + if (other.hasCurWeekAddExpSum()) { + setCurWeekAddExpSum(other.curWeekAddExpSum); + } if (other.hasExp()) { setExp(other.exp); } @@ -632,15 +586,14 @@ public final class BattlePassInfoNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; + takenFreeReward = 0L; takenPremiumReward2 = 0L; - unkfield = 0L; takenPremiumReward1 = 0L; takenPremiumExtendedReward = 0L; - takenPremiumOptionalReward = 0L; - takenFreeReward = 0L; takenFreeExtendedReward = 0L; - curWeekAddExpSum = 0; + takenPremiumOptionalReward = 0L; curBpId = 0; + curWeekAddExpSum = 0; exp = 0; level = 0; bpTierType = 0; @@ -667,15 +620,14 @@ public final class BattlePassInfoNotifyOuterClass { } BattlePassInfoNotify other = (BattlePassInfoNotify) o; return bitField0_ == other.bitField0_ + && (!hasTakenFreeReward() || takenFreeReward == other.takenFreeReward) && (!hasTakenPremiumReward2() || takenPremiumReward2 == other.takenPremiumReward2) - && (!hasUnkfield() || unkfield == other.unkfield) && (!hasTakenPremiumReward1() || takenPremiumReward1 == other.takenPremiumReward1) && (!hasTakenPremiumExtendedReward() || takenPremiumExtendedReward == other.takenPremiumExtendedReward) - && (!hasTakenPremiumOptionalReward() || takenPremiumOptionalReward == other.takenPremiumOptionalReward) - && (!hasTakenFreeReward() || takenFreeReward == other.takenFreeReward) && (!hasTakenFreeExtendedReward() || takenFreeExtendedReward == other.takenFreeExtendedReward) - && (!hasCurWeekAddExpSum() || curWeekAddExpSum == other.curWeekAddExpSum) + && (!hasTakenPremiumOptionalReward() || takenPremiumOptionalReward == other.takenPremiumOptionalReward) && (!hasCurBpId() || curBpId == other.curBpId) + && (!hasCurWeekAddExpSum() || curWeekAddExpSum == other.curWeekAddExpSum) && (!hasExp() || exp == other.exp) && (!hasLevel() || level == other.level) && (!hasBpTierType() || bpTierType == other.bpTierType); @@ -685,50 +637,46 @@ public final class BattlePassInfoNotifyOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt64NoTag(takenPremiumReward2); + output.writeUInt64NoTag(takenFreeReward); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt64NoTag(unkfield); + output.writeRawByte((byte) 56); + output.writeUInt64NoTag(takenPremiumReward2); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 72); output.writeUInt64NoTag(takenPremiumReward1); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 88); output.writeUInt64NoTag(takenPremiumExtendedReward); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt64NoTag(takenPremiumOptionalReward); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt64NoTag(takenFreeReward); - } - if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 96); output.writeUInt64NoTag(takenFreeExtendedReward); } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(curWeekAddExpSum); + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt64NoTag(takenPremiumOptionalReward); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 40); output.writeUInt32NoTag(curBpId); } - if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 48); + if ((bitField0_ & 0x00000080) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(curWeekAddExpSum); + } + if ((bitField0_ & 0x00000100) != 0) { + output.writeRawByte((byte) 112); output.writeUInt32NoTag(exp); } - if ((bitField0_ & 0x00000400) != 0) { - output.writeRawByte((byte) 80); + if ((bitField0_ & 0x00000200) != 0) { + output.writeRawByte((byte) 120); output.writeUInt32NoTag(level); } - if ((bitField0_ & 0x00000800) != 0) { - output.writeRawByte((byte) 120); + if ((bitField0_ & 0x00000400) != 0) { + output.writeRawByte((byte) 24); output.writeEnumNoTag(bpTierType); } } @@ -737,10 +685,10 @@ public final class BattlePassInfoNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward2); + size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeReward); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(unkfield); + size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward2); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward1); @@ -749,27 +697,24 @@ public final class BattlePassInfoNotifyOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumExtendedReward); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumOptionalReward); + size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeExtendedReward); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeReward); + size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumOptionalReward); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeExtendedReward); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curBpId); } if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curWeekAddExpSum); } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curBpId); - } - if ((bitField0_ & 0x00000200) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000200) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } - if ((bitField0_ & 0x00000800) != 0) { + if ((bitField0_ & 0x00000400) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(bpTierType); } return size; @@ -783,54 +728,36 @@ public final class BattlePassInfoNotifyOuterClass { while (true) { switch (tag) { case 8: { - // takenPremiumReward2 - takenPremiumReward2 = input.readUInt64(); + // takenFreeReward + takenFreeReward = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { - // unkfield - unkfield = input.readUInt64(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // takenPremiumReward1 - takenPremiumReward1 = input.readUInt64(); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 56) { break; } } case 56: { - // takenPremiumExtendedReward - takenPremiumExtendedReward = input.readUInt64(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { - // takenPremiumOptionalReward - takenPremiumOptionalReward = input.readUInt64(); - bitField0_ |= 0x00000010; + // takenPremiumReward2 + takenPremiumReward2 = input.readUInt64(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 72) { break; } } case 72: { - // takenFreeReward - takenFreeReward = input.readUInt64(); - bitField0_ |= 0x00000020; + // takenPremiumReward1 + takenPremiumReward1 = input.readUInt64(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // takenPremiumExtendedReward + takenPremiumExtendedReward = input.readUInt64(); + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 96) { break; @@ -839,16 +766,16 @@ public final class BattlePassInfoNotifyOuterClass { case 96: { // takenFreeExtendedReward takenFreeExtendedReward = input.readUInt64(); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 24) { + if (tag != 104) { break; } } - case 24: { - // curWeekAddExpSum - curWeekAddExpSum = input.readUInt32(); - bitField0_ |= 0x00000080; + case 104: { + // takenPremiumOptionalReward + takenPremiumOptionalReward = input.readUInt64(); + bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 40) { break; @@ -857,36 +784,45 @@ public final class BattlePassInfoNotifyOuterClass { case 40: { // curBpId curBpId = input.readUInt32(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 48) { + if (tag != 64) { break; } } - case 48: { + case 64: { + // curWeekAddExpSum + curWeekAddExpSum = input.readUInt32(); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { // exp exp = input.readUInt32(); - bitField0_ |= 0x00000200; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000100; tag = input.readTag(); if (tag != 120) { break; } } case 120: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000200; + tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { // bpTierType final int value = input.readInt32(); if (BpTierType.forNumber(value) != null) { bpTierType = value; - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; } tag = input.readTag(); if (tag != 0) { @@ -911,10 +847,10 @@ public final class BattlePassInfoNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt64(FieldNames.takenPremiumReward2, takenPremiumReward2); + output.writeUInt64(FieldNames.takenFreeReward, takenFreeReward); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt64(FieldNames.unkfield, unkfield); + output.writeUInt64(FieldNames.takenPremiumReward2, takenPremiumReward2); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt64(FieldNames.takenPremiumReward1, takenPremiumReward1); @@ -923,27 +859,24 @@ public final class BattlePassInfoNotifyOuterClass { output.writeUInt64(FieldNames.takenPremiumExtendedReward, takenPremiumExtendedReward); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt64(FieldNames.takenPremiumOptionalReward, takenPremiumOptionalReward); + output.writeUInt64(FieldNames.takenFreeExtendedReward, takenFreeExtendedReward); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt64(FieldNames.takenFreeReward, takenFreeReward); + output.writeUInt64(FieldNames.takenPremiumOptionalReward, takenPremiumOptionalReward); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt64(FieldNames.takenFreeExtendedReward, takenFreeExtendedReward); + output.writeUInt32(FieldNames.curBpId, curBpId); } if ((bitField0_ & 0x00000080) != 0) { output.writeUInt32(FieldNames.curWeekAddExpSum, curWeekAddExpSum); } if ((bitField0_ & 0x00000100) != 0) { - output.writeUInt32(FieldNames.curBpId, curBpId); - } - if ((bitField0_ & 0x00000200) != 0) { output.writeUInt32(FieldNames.exp, exp); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000200) != 0) { output.writeUInt32(FieldNames.level, level); } - if ((bitField0_ & 0x00000800) != 0) { + if ((bitField0_ & 0x00000400) != 0) { output.writeEnum(FieldNames.bpTierType, bpTierType, BpTierType.converter()); } output.endObject(); @@ -956,11 +889,11 @@ public final class BattlePassInfoNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 226926899: - case 1195903363: { - if (input.isAtField(FieldNames.takenPremiumReward2)) { + case 1065549026: + case 135671018: { + if (input.isAtField(FieldNames.takenFreeReward)) { if (!input.trySkipNullValue()) { - takenPremiumReward2 = input.readUInt64(); + takenFreeReward = input.readUInt64(); bitField0_ |= 0x00000001; } } else { @@ -968,10 +901,11 @@ public final class BattlePassInfoNotifyOuterClass { } break; } - case -247717048: { - if (input.isAtField(FieldNames.unkfield)) { + case 226926899: + case 1195903363: { + if (input.isAtField(FieldNames.takenPremiumReward2)) { if (!input.trySkipNullValue()) { - unkfield = input.readUInt64(); + takenPremiumReward2 = input.readUInt64(); bitField0_ |= 0x00000002; } } else { @@ -1003,11 +937,11 @@ public final class BattlePassInfoNotifyOuterClass { } break; } - case 736311903: - case 548161422: { - if (input.isAtField(FieldNames.takenPremiumOptionalReward)) { + case -1116117893: + case 1257087386: { + if (input.isAtField(FieldNames.takenFreeExtendedReward)) { if (!input.trySkipNullValue()) { - takenPremiumOptionalReward = input.readUInt64(); + takenFreeExtendedReward = input.readUInt64(); bitField0_ |= 0x00000010; } } else { @@ -1015,11 +949,11 @@ public final class BattlePassInfoNotifyOuterClass { } break; } - case 1065549026: - case 135671018: { - if (input.isAtField(FieldNames.takenFreeReward)) { + case 736311903: + case 548161422: { + if (input.isAtField(FieldNames.takenPremiumOptionalReward)) { if (!input.trySkipNullValue()) { - takenFreeReward = input.readUInt64(); + takenPremiumOptionalReward = input.readUInt64(); bitField0_ |= 0x00000020; } } else { @@ -1027,11 +961,11 @@ public final class BattlePassInfoNotifyOuterClass { } break; } - case -1116117893: - case 1257087386: { - if (input.isAtField(FieldNames.takenFreeExtendedReward)) { + case 1125519465: + case 110923757: { + if (input.isAtField(FieldNames.curBpId)) { if (!input.trySkipNullValue()) { - takenFreeExtendedReward = input.readUInt64(); + curBpId = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -1051,23 +985,11 @@ public final class BattlePassInfoNotifyOuterClass { } break; } - case 1125519465: - case 110923757: { - if (input.isAtField(FieldNames.curBpId)) { - if (!input.trySkipNullValue()) { - curBpId = input.readUInt32(); - bitField0_ |= 0x00000100; - } - } else { - input.skipUnknownField(); - } - break; - } case 100893: { if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { exp = input.readUInt32(); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; } } else { input.skipUnknownField(); @@ -1078,7 +1000,7 @@ public final class BattlePassInfoNotifyOuterClass { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; } } else { input.skipUnknownField(); @@ -1092,7 +1014,7 @@ public final class BattlePassInfoNotifyOuterClass { final BpTierType value = input.readEnum(BpTierType.converter()); if (value != null) { bpTierType = value.getNumber(); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; } else { input.skipUnknownEnumValue(); } @@ -1292,24 +1214,22 @@ 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 unkfield = FieldName.forField("unkfield"); + static final FieldName takenPremiumReward2 = FieldName.forField("takenPremiumReward2", "taken_premium_reward2"); static final FieldName takenPremiumReward1 = FieldName.forField("takenPremiumReward1", "taken_premium_reward1"); static final FieldName takenPremiumExtendedReward = FieldName.forField("takenPremiumExtendedReward", "taken_premium_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 takenFreeExtendedReward = FieldName.forField("takenFreeExtendedReward", "taken_free_extended_reward"); - static final FieldName curWeekAddExpSum = FieldName.forField("curWeekAddExpSum", "cur_week_add_exp_sum"); + static final FieldName takenPremiumOptionalReward = FieldName.forField("takenPremiumOptionalReward", "taken_premium_optional_reward"); static final FieldName curBpId = FieldName.forField("curBpId", "cur_bp_id"); + static final FieldName curWeekAddExpSum = FieldName.forField("curWeekAddExpSum", "cur_week_add_exp_sum"); + static final FieldName exp = FieldName.forField("exp"); static final FieldName level = FieldName.forField("level"); diff --git a/src/generated/main/emu/lunarcore/proto/BattleSkillInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattleSkillInfoOuterClass.java index 385a36a..7d6fdbb 100644 --- a/src/generated/main/emu/lunarcore/proto/BattleSkillInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BattleSkillInfoOuterClass.java @@ -11,7 +11,6 @@ import us.hebi.quickbuf.ProtoMessage; import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; import us.hebi.quickbuf.ProtoUtil; -import us.hebi.quickbuf.RepeatedInt; public final class BattleSkillInfoOuterClass { /** @@ -20,11 +19,6 @@ public final class BattleSkillInfoOuterClass { public static final class BattleSkillInfo extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional double ECLKNMPFOOF = 2; - */ - private double eCLKNMPFOOF; - /** * optional double damage = 4; */ @@ -35,11 +29,6 @@ public final class BattleSkillInfoOuterClass { */ private int skillId; - /** - * repeated uint32 HEOGMIOCDIC = 3; - */ - private final RepeatedInt hEOGMIOCDIC = RepeatedInt.newEmptyInstance(); - private BattleSkillInfo() { } @@ -50,49 +39,12 @@ public final class BattleSkillInfoOuterClass { return new BattleSkillInfo(); } - /** - * optional double ECLKNMPFOOF = 2; - * @return whether the eCLKNMPFOOF field is set - */ - public boolean hasECLKNMPFOOF() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional double ECLKNMPFOOF = 2; - * @return this - */ - public BattleSkillInfo clearECLKNMPFOOF() { - bitField0_ &= ~0x00000001; - eCLKNMPFOOF = 0D; - return this; - } - - /** - * optional double ECLKNMPFOOF = 2; - * @return the eCLKNMPFOOF - */ - public double getECLKNMPFOOF() { - return eCLKNMPFOOF; - } - - /** - * optional double ECLKNMPFOOF = 2; - * @param value the eCLKNMPFOOF to set - * @return this - */ - public BattleSkillInfo setECLKNMPFOOF(final double value) { - bitField0_ |= 0x00000001; - eCLKNMPFOOF = value; - return this; - } - /** * optional double damage = 4; * @return whether the damage field is set */ public boolean hasDamage() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -100,7 +52,7 @@ public final class BattleSkillInfoOuterClass { * @return this */ public BattleSkillInfo clearDamage() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; damage = 0D; return this; } @@ -119,7 +71,7 @@ public final class BattleSkillInfoOuterClass { * @return this */ public BattleSkillInfo setDamage(final double value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; damage = value; return this; } @@ -129,7 +81,7 @@ public final class BattleSkillInfoOuterClass { * @return whether the skillId field is set */ public boolean hasSkillId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -137,7 +89,7 @@ public final class BattleSkillInfoOuterClass { * @return this */ public BattleSkillInfo clearSkillId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; skillId = 0; return this; } @@ -156,88 +108,18 @@ public final class BattleSkillInfoOuterClass { * @return this */ public BattleSkillInfo setSkillId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; skillId = value; return this; } - /** - * repeated uint32 HEOGMIOCDIC = 3; - * @return whether the hEOGMIOCDIC field is set - */ - public boolean hasHEOGMIOCDIC() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated uint32 HEOGMIOCDIC = 3; - * @return this - */ - public BattleSkillInfo clearHEOGMIOCDIC() { - bitField0_ &= ~0x00000008; - hEOGMIOCDIC.clear(); - return this; - } - - /** - * repeated uint32 HEOGMIOCDIC = 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 #getMutableHEOGMIOCDIC()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getHEOGMIOCDIC() { - return hEOGMIOCDIC; - } - - /** - * repeated uint32 HEOGMIOCDIC = 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 getMutableHEOGMIOCDIC() { - bitField0_ |= 0x00000008; - return hEOGMIOCDIC; - } - - /** - * repeated uint32 HEOGMIOCDIC = 3; - * @param value the hEOGMIOCDIC to add - * @return this - */ - public BattleSkillInfo addHEOGMIOCDIC(final int value) { - bitField0_ |= 0x00000008; - hEOGMIOCDIC.add(value); - return this; - } - - /** - * repeated uint32 HEOGMIOCDIC = 3; - * @param values the hEOGMIOCDIC to add - * @return this - */ - public BattleSkillInfo addAllHEOGMIOCDIC(final int... values) { - bitField0_ |= 0x00000008; - hEOGMIOCDIC.addAll(values); - return this; - } - @Override public BattleSkillInfo copyFrom(final BattleSkillInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - eCLKNMPFOOF = other.eCLKNMPFOOF; damage = other.damage; skillId = other.skillId; - hEOGMIOCDIC.copyFrom(other.hEOGMIOCDIC); } return this; } @@ -248,18 +130,12 @@ public final class BattleSkillInfoOuterClass { return this; } cachedSize = -1; - if (other.hasECLKNMPFOOF()) { - setECLKNMPFOOF(other.eCLKNMPFOOF); - } if (other.hasDamage()) { setDamage(other.damage); } if (other.hasSkillId()) { setSkillId(other.skillId); } - if (other.hasHEOGMIOCDIC()) { - getMutableHEOGMIOCDIC().addAll(other.hEOGMIOCDIC); - } return this; } @@ -270,10 +146,8 @@ public final class BattleSkillInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - eCLKNMPFOOF = 0D; damage = 0D; skillId = 0; - hEOGMIOCDIC.clear(); return this; } @@ -284,7 +158,6 @@ public final class BattleSkillInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - hEOGMIOCDIC.clear(); return this; } @@ -298,32 +171,20 @@ public final class BattleSkillInfoOuterClass { } BattleSkillInfo other = (BattleSkillInfo) o; return bitField0_ == other.bitField0_ - && (!hasECLKNMPFOOF() || ProtoUtil.isEqual(eCLKNMPFOOF, other.eCLKNMPFOOF)) && (!hasDamage() || ProtoUtil.isEqual(damage, other.damage)) - && (!hasSkillId() || skillId == other.skillId) - && (!hasHEOGMIOCDIC() || hEOGMIOCDIC.equals(other.hEOGMIOCDIC)); + && (!hasSkillId() || skillId == other.skillId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 17); - output.writeDoubleNoTag(eCLKNMPFOOF); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 33); output.writeDoubleNoTag(damage); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 8); output.writeUInt32NoTag(skillId); } - if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < hEOGMIOCDIC.length(); i++) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(hEOGMIOCDIC.array()[i]); - } - } } @Override @@ -333,14 +194,8 @@ public final class BattleSkillInfoOuterClass { size += 9; } if ((bitField0_ & 0x00000002) != 0) { - size += 9; - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(skillId); } - if ((bitField0_ & 0x00000008) != 0) { - size += (1 * hEOGMIOCDIC.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(hEOGMIOCDIC); - } return size; } @@ -351,19 +206,10 @@ public final class BattleSkillInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 17: { - // eCLKNMPFOOF - eCLKNMPFOOF = input.readDouble(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 33) { - break; - } - } case 33: { // damage damage = input.readDouble(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 8) { break; @@ -372,16 +218,7 @@ public final class BattleSkillInfoOuterClass { case 8: { // skillId skillId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 26) { - break; - } - } - case 26: { - // hEOGMIOCDIC [packed=true] - input.readPackedUInt32(hEOGMIOCDIC, tag); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { break; @@ -397,12 +234,6 @@ public final class BattleSkillInfoOuterClass { tag = input.readTag(); break; } - case 24: { - // hEOGMIOCDIC [packed=false] - tag = input.readRepeatedUInt32(hEOGMIOCDIC, tag); - bitField0_ |= 0x00000008; - break; - } } } } @@ -411,17 +242,11 @@ public final class BattleSkillInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeDouble(FieldNames.eCLKNMPFOOF, eCLKNMPFOOF); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeDouble(FieldNames.damage, damage); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.skillId, skillId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.hEOGMIOCDIC, hEOGMIOCDIC); - } output.endObject(); } @@ -432,22 +257,11 @@ public final class BattleSkillInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 708408596: { - if (input.isAtField(FieldNames.eCLKNMPFOOF)) { - if (!input.trySkipNullValue()) { - eCLKNMPFOOF = input.readDouble(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -1339126929: { if (input.isAtField(FieldNames.damage)) { if (!input.trySkipNullValue()) { damage = input.readDouble(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -459,18 +273,7 @@ public final class BattleSkillInfoOuterClass { if (input.isAtField(FieldNames.skillId)) { if (!input.trySkipNullValue()) { skillId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1292251975: { - if (input.isAtField(FieldNames.hEOGMIOCDIC)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(hEOGMIOCDIC); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -530,13 +333,9 @@ public final class BattleSkillInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName eCLKNMPFOOF = FieldName.forField("ECLKNMPFOOF"); - static final FieldName damage = FieldName.forField("damage"); static final FieldName skillId = FieldName.forField("skillId", "skill_id"); - - static final FieldName hEOGMIOCDIC = FieldName.forField("HEOGMIOCDIC"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java index f7602b3..f88cf2f 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 = 10; + * optional string signature = 15; */ private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * repeated .HeadIcon unlocked_head_icon_list = 5; + * repeated .HeadIcon unlocked_head_icon_list = 9; */ private final RepeatedMessage unlockedHeadIconList = RepeatedMessage.newEmptyInstance(HeadIconOuterClass.HeadIcon.getFactory()); @@ -41,7 +41,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 10; + * optional string signature = 15; * @return whether the signature field is set */ public boolean hasSignature() { @@ -49,7 +49,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 10; + * optional string signature = 15; * @return this */ public BoardDataSync clearSignature() { @@ -59,7 +59,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 10; + * optional string signature = 15; * @return the signature */ public String getSignature() { @@ -67,7 +67,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 10; + * optional string signature = 15; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -75,7 +75,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 10; + * optional string signature = 15; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -84,7 +84,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 10; + * optional string signature = 15; * @param value the signature to set * @return this */ @@ -95,7 +95,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 10; + * optional string signature = 15; * @param value the signature to set * @return this */ @@ -106,7 +106,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 5; + * repeated .HeadIcon unlocked_head_icon_list = 9; * @return whether the unlockedHeadIconList field is set */ public boolean hasUnlockedHeadIconList() { @@ -114,7 +114,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 5; + * repeated .HeadIcon unlocked_head_icon_list = 9; * @return this */ public BoardDataSync clearUnlockedHeadIconList() { @@ -124,7 +124,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 5; + * repeated .HeadIcon unlocked_head_icon_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. @@ -138,7 +138,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 5; + * repeated .HeadIcon unlocked_head_icon_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 @@ -152,7 +152,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 5; + * repeated .HeadIcon unlocked_head_icon_list = 9; * @param value the unlockedHeadIconList to add * @return this */ @@ -163,7 +163,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 5; + * repeated .HeadIcon unlocked_head_icon_list = 9; * @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) 82); + output.writeRawByte((byte) 122); output.writeStringNoTag(signature); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unlockedHeadIconList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 74); output.writeMessageNoTag(unlockedHeadIconList.get(i)); } } @@ -270,16 +270,16 @@ public final class BoardDataSyncOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 122: { // signature input.readString(signature); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 74) { break; } } - case 42: { + case 74: { // 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 b5f50d2..9b0af1d 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 = 10; + * optional uint64 add_time_ms = 5; */ private long addTimeMs; /** - * optional float life_time = 11; + * optional float life_time = 10; */ private float lifeTime; /** - * optional uint32 level = 2; - */ - private int level; - - /** - * optional uint32 base_avatar_id = 3; + * optional uint32 base_avatar_id = 4; */ private int baseAvatarId; /** - * optional uint32 buff_id = 5; + * optional uint32 buff_id = 8; */ private int buffId; /** - * optional uint32 count = 14; + * optional uint32 count = 11; */ private int count; /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * optional uint32 level = 13; + */ + private int level; + + /** + * 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 = 10; + * optional uint64 add_time_ms = 5; * @return whether the addTimeMs field is set */ public boolean hasAddTimeMs() { @@ -75,7 +75,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 10; + * optional uint64 add_time_ms = 5; * @return this */ public BuffInfo clearAddTimeMs() { @@ -85,7 +85,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 10; + * optional uint64 add_time_ms = 5; * @return the addTimeMs */ public long getAddTimeMs() { @@ -93,7 +93,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 10; + * optional uint64 add_time_ms = 5; * @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 = 10; * @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 = 10; * @return this */ public BuffInfo clearLifeTime() { @@ -122,7 +122,7 @@ public final class BuffInfoOuterClass { } /** - * optional float life_time = 11; + * optional float life_time = 10; * @return the lifeTime */ public float getLifeTime() { @@ -130,7 +130,7 @@ public final class BuffInfoOuterClass { } /** - * optional float life_time = 11; + * optional float life_time = 10; * @param value the lifeTime to set * @return this */ @@ -141,62 +141,25 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 level = 2; - * @return whether the level field is set + * optional uint32 base_avatar_id = 4; + * @return whether the baseAvatarId field is set */ - public boolean hasLevel() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 level = 2; - * @return this - */ - public BuffInfo clearLevel() { - bitField0_ &= ~0x00000004; - 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 BuffInfo setLevel(final int value) { - bitField0_ |= 0x00000004; - level = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 3; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 base_avatar_id = 3; + * optional uint32 base_avatar_id = 4; * @return this */ public BuffInfo clearBaseAvatarId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; baseAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 3; + * optional uint32 base_avatar_id = 4; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -204,36 +167,36 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 base_avatar_id = 3; + * optional uint32 base_avatar_id = 4; * @param value the baseAvatarId to set * @return this */ public BuffInfo setBaseAvatarId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; baseAvatarId = value; return this; } /** - * optional uint32 buff_id = 5; + * optional uint32 buff_id = 8; * @return whether the buffId field is set */ public boolean hasBuffId() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 buff_id = 5; + * optional uint32 buff_id = 8; * @return this */ public BuffInfo clearBuffId() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; buffId = 0; return this; } /** - * optional uint32 buff_id = 5; + * optional uint32 buff_id = 8; * @return the buffId */ public int getBuffId() { @@ -241,36 +204,36 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 buff_id = 5; + * optional uint32 buff_id = 8; * @param value the buffId to set * @return this */ public BuffInfo setBuffId(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; buffId = value; return this; } /** - * optional uint32 count = 14; + * optional uint32 count = 11; * @return whether the count field is set */ public boolean hasCount() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 count = 14; + * optional uint32 count = 11; * @return this */ public BuffInfo clearCount() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; count = 0; return this; } /** - * optional uint32 count = 14; + * optional uint32 count = 11; * @return the count */ public int getCount() { @@ -278,18 +241,55 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 count = 14; + * optional uint32 count = 11; * @param value the count to set * @return this */ public BuffInfo setCount(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; count = value; return this; } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * optional uint32 level = 13; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 level = 13; + * @return this + */ + public BuffInfo clearLevel() { + bitField0_ &= ~0x00000020; + level = 0; + return this; + } + + /** + * optional uint32 level = 13; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 13; + * @param value the level to set + * @return this + */ + public BuffInfo setLevel(final int value) { + bitField0_ |= 0x00000020; + level = value; + return this; + } + + /** + * 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; - level = other.level; baseAvatarId = other.baseAvatarId; buffId = other.buffId; count = other.count; + level = other.level; dynamicValues.copyFrom(other.dynamicValues); } return this; @@ -384,9 +384,6 @@ public final class BuffInfoOuterClass { if (other.hasLifeTime()) { setLifeTime(other.lifeTime); } - if (other.hasLevel()) { - setLevel(other.level); - } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } @@ -396,6 +393,9 @@ public final class BuffInfoOuterClass { if (other.hasCount()) { setCount(other.count); } + if (other.hasLevel()) { + setLevel(other.level); + } if (other.hasDynamicValues()) { getMutableDynamicValues().addAll(other.dynamicValues); } @@ -411,10 +411,10 @@ public final class BuffInfoOuterClass { bitField0_ = 0; addTimeMs = 0L; lifeTime = 0F; - level = 0; baseAvatarId = 0; buffId = 0; count = 0; + level = 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)) - && (!hasLevel() || level == other.level) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasBuffId() || buffId == other.buffId) && (!hasCount() || count == other.count) + && (!hasLevel() || level == other.level) && (!hasDynamicValues() || dynamicValues.equals(other.dynamicValues)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 40); output.writeUInt64NoTag(addTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 93); + output.writeRawByte((byte) 85); output.writeFloatNoTag(lifeTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(baseAvatarId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 40); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 64); output.writeUInt32NoTag(buffId); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 88); output.writeUInt32NoTag(count); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(level); + } 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,17 +493,17 @@ public final class BuffInfoOuterClass { size += 5; } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } if ((bitField0_ & 0x00000040) != 0) { size += (1 * dynamicValues.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dynamicValues); } @@ -517,61 +517,61 @@ public final class BuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 40: { // addTimeMs addTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 93) { + if (tag != 85) { break; } } - case 93: { + case 85: { // lifeTime lifeTime = input.readFloat(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 16) { + if (tag != 32) { break; } } - case 16: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { + case 32: { // baseAvatarId baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 40) { + if (tag != 64) { break; } } - case 40: { + case 64: { // buffId buffId = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { + case 88: { // count count = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 34) { + if (tag != 104) { break; } } - case 34: { + case 104: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { // dynamicValues tag = input.readRepeatedMessage(dynamicValues, tag); bitField0_ |= 0x00000040; @@ -603,17 +603,17 @@ public final class BuffInfoOuterClass { output.writeFloat(FieldNames.lifeTime, lifeTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.buffId, buffId); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.count, count); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.level, level); + } if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.dynamicValues, dynamicValues); } @@ -651,23 +651,12 @@ public final class BuffInfoOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 118022725: case -1756826157: { if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -679,7 +668,7 @@ public final class BuffInfoOuterClass { if (input.isAtField(FieldNames.buffId)) { if (!input.trySkipNullValue()) { buffId = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -690,6 +679,17 @@ public final class BuffInfoOuterClass { if (input.isAtField(FieldNames.count)) { if (!input.trySkipNullValue()) { count = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -1119,14 +1119,14 @@ public final class BuffInfoOuterClass { static final FieldName lifeTime = FieldName.forField("lifeTime", "life_time"); - static final FieldName level = FieldName.forField("level"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName buffId = FieldName.forField("buffId", "buff_id"); static final FieldName count = FieldName.forField("count"); + static final FieldName level = FieldName.forField("level"); + static final FieldName dynamicValues = FieldName.forField("dynamicValues", "dynamic_values"); } } diff --git a/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java index 151b266..93dd6d3 100644 --- a/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java @@ -18,26 +18,26 @@ public final class BuyGoodsCsReqOuterClass { public static final class BuyGoodsCsReq extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 goods_num = 4; + */ + private int goodsNum; + /** * optional uint32 shop_id = 5; */ private int shopId; /** - * optional uint32 goods_id = 7; - */ - private int goodsId; - - /** - * optional uint32 goods_num = 10; - */ - private int goodsNum; - - /** - * optional uint32 item_id = 15; + * optional uint32 item_id = 14; */ private int itemId; + /** + * optional uint32 goods_id = 15; + */ + private int goodsId; + private BuyGoodsCsReq() { } @@ -48,12 +48,49 @@ public final class BuyGoodsCsReqOuterClass { return new BuyGoodsCsReq(); } + /** + * optional uint32 goods_num = 4; + * @return whether the goodsNum field is set + */ + public boolean hasGoodsNum() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 goods_num = 4; + * @return this + */ + public BuyGoodsCsReq clearGoodsNum() { + bitField0_ &= ~0x00000001; + goodsNum = 0; + return this; + } + + /** + * optional uint32 goods_num = 4; + * @return the goodsNum + */ + public int getGoodsNum() { + return goodsNum; + } + + /** + * optional uint32 goods_num = 4; + * @param value the goodsNum to set + * @return this + */ + public BuyGoodsCsReq setGoodsNum(final int value) { + bitField0_ |= 0x00000001; + goodsNum = value; + return this; + } + /** * optional uint32 shop_id = 5; * @return whether the shopId field is set */ public boolean hasShopId() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -61,7 +98,7 @@ public final class BuyGoodsCsReqOuterClass { * @return this */ public BuyGoodsCsReq clearShopId() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; shopId = 0; return this; } @@ -80,105 +117,31 @@ public final class BuyGoodsCsReqOuterClass { * @return this */ public BuyGoodsCsReq setShopId(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; shopId = value; return this; } /** - * optional uint32 goods_id = 7; - * @return whether the goodsId field is set + * optional uint32 item_id = 14; + * @return whether the itemId field is set */ - public boolean hasGoodsId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 goods_id = 7; - * @return this - */ - public BuyGoodsCsReq clearGoodsId() { - bitField0_ &= ~0x00000002; - goodsId = 0; - return this; - } - - /** - * optional uint32 goods_id = 7; - * @return the goodsId - */ - public int getGoodsId() { - return goodsId; - } - - /** - * optional uint32 goods_id = 7; - * @param value the goodsId to set - * @return this - */ - public BuyGoodsCsReq setGoodsId(final int value) { - bitField0_ |= 0x00000002; - goodsId = value; - return this; - } - - /** - * optional uint32 goods_num = 10; - * @return whether the goodsNum field is set - */ - public boolean hasGoodsNum() { + public boolean hasItemId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 goods_num = 10; - * @return this - */ - public BuyGoodsCsReq clearGoodsNum() { - bitField0_ &= ~0x00000004; - goodsNum = 0; - return this; - } - - /** - * optional uint32 goods_num = 10; - * @return the goodsNum - */ - public int getGoodsNum() { - return goodsNum; - } - - /** - * optional uint32 goods_num = 10; - * @param value the goodsNum to set - * @return this - */ - public BuyGoodsCsReq setGoodsNum(final int value) { - bitField0_ |= 0x00000004; - goodsNum = value; - return this; - } - - /** - * optional uint32 item_id = 15; - * @return whether the itemId field is set - */ - public boolean hasItemId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 item_id = 15; + * optional uint32 item_id = 14; * @return this */ public BuyGoodsCsReq clearItemId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; itemId = 0; return this; } /** - * optional uint32 item_id = 15; + * optional uint32 item_id = 14; * @return the itemId */ public int getItemId() { @@ -186,25 +149,62 @@ public final class BuyGoodsCsReqOuterClass { } /** - * optional uint32 item_id = 15; + * optional uint32 item_id = 14; * @param value the itemId to set * @return this */ public BuyGoodsCsReq setItemId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; itemId = value; return this; } + /** + * optional uint32 goods_id = 15; + * @return whether the goodsId field is set + */ + public boolean hasGoodsId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 goods_id = 15; + * @return this + */ + public BuyGoodsCsReq clearGoodsId() { + bitField0_ &= ~0x00000008; + goodsId = 0; + return this; + } + + /** + * optional uint32 goods_id = 15; + * @return the goodsId + */ + public int getGoodsId() { + return goodsId; + } + + /** + * optional uint32 goods_id = 15; + * @param value the goodsId to set + * @return this + */ + public BuyGoodsCsReq setGoodsId(final int value) { + bitField0_ |= 0x00000008; + goodsId = value; + return this; + } + @Override public BuyGoodsCsReq copyFrom(final BuyGoodsCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - shopId = other.shopId; - goodsId = other.goodsId; goodsNum = other.goodsNum; + shopId = other.shopId; itemId = other.itemId; + goodsId = other.goodsId; } return this; } @@ -215,18 +215,18 @@ public final class BuyGoodsCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasShopId()) { - setShopId(other.shopId); - } - if (other.hasGoodsId()) { - setGoodsId(other.goodsId); - } if (other.hasGoodsNum()) { setGoodsNum(other.goodsNum); } + if (other.hasShopId()) { + setShopId(other.shopId); + } if (other.hasItemId()) { setItemId(other.itemId); } + if (other.hasGoodsId()) { + setGoodsId(other.goodsId); + } return this; } @@ -237,10 +237,10 @@ public final class BuyGoodsCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - shopId = 0; - goodsId = 0; goodsNum = 0; + shopId = 0; itemId = 0; + goodsId = 0; return this; } @@ -264,29 +264,29 @@ public final class BuyGoodsCsReqOuterClass { } BuyGoodsCsReq other = (BuyGoodsCsReq) o; return bitField0_ == other.bitField0_ - && (!hasShopId() || shopId == other.shopId) - && (!hasGoodsId() || goodsId == other.goodsId) && (!hasGoodsNum() || goodsNum == other.goodsNum) - && (!hasItemId() || itemId == other.itemId); + && (!hasShopId() || shopId == other.shopId) + && (!hasItemId() || itemId == other.itemId) + && (!hasGoodsId() || goodsId == other.goodsId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(goodsNum); + } + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 40); output.writeUInt32NoTag(shopId); } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(goodsId); - } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(goodsNum); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(itemId); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(itemId); + output.writeUInt32NoTag(goodsId); } } @@ -294,17 +294,17 @@ public final class BuyGoodsCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsNum); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); + } + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); + } return size; } @@ -315,27 +315,27 @@ public final class BuyGoodsCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { + case 32: { + // goodsNum + goodsNum = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 40) { + break; + } + } case 40: { // shopId shopId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // goodsId - goodsId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 112) { break; } } - case 80: { - // goodsNum - goodsNum = input.readUInt32(); + case 112: { + // itemId + itemId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 120) { @@ -343,8 +343,8 @@ public final class BuyGoodsCsReqOuterClass { } } case 120: { - // itemId - itemId = input.readUInt32(); + // goodsId + goodsId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,17 +369,17 @@ public final class BuyGoodsCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.shopId, shopId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.goodsId, goodsId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.goodsNum, goodsNum); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.shopId, shopId); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.itemId, itemId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.goodsId, goodsId); + } output.endObject(); } @@ -390,11 +390,11 @@ public final class BuyGoodsCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -903151951: - case 2067081988: { - if (input.isAtField(FieldNames.shopId)) { + case 2123191376: + case 1394923293: { + if (input.isAtField(FieldNames.goodsNum)) { if (!input.trySkipNullValue()) { - shopId = input.readUInt32(); + goodsNum = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -402,11 +402,11 @@ public final class BuyGoodsCsReqOuterClass { } break; } - case 207037201: - case 2123207332: { - if (input.isAtField(FieldNames.goodsId)) { + case -903151951: + case 2067081988: { + if (input.isAtField(FieldNames.shopId)) { if (!input.trySkipNullValue()) { - goodsId = input.readUInt32(); + shopId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -414,23 +414,23 @@ public final class BuyGoodsCsReqOuterClass { } break; } - case 2123191376: - case 1394923293: { - if (input.isAtField(FieldNames.goodsNum)) { - if (!input.trySkipNullValue()) { - goodsNum = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -1178662002: case 2116204999: { if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { itemId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 207037201: + case 2123207332: { + if (input.isAtField(FieldNames.goodsId)) { + if (!input.trySkipNullValue()) { + goodsId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -490,13 +490,13 @@ public final class BuyGoodsCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName shopId = FieldName.forField("shopId", "shop_id"); - - static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); - static final FieldName goodsNum = FieldName.forField("goodsNum", "goods_num"); + static final FieldName shopId = FieldName.forField("shopId", "shop_id"); + static final FieldName itemId = FieldName.forField("itemId", "item_id"); + + static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java index d7dea53..1059d26 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 retcode = 3; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional uint32 goods_buy_times = 8; + * optional uint32 goods_buy_times = 9; */ private int goodsBuyTimes; /** - * optional uint32 goods_id = 14; - */ - private int goodsId; - - /** - * optional uint32 shop_id = 15; + * optional uint32 shop_id = 11; */ private int shopId; /** - * optional .ItemList return_item_list = 4; + * optional uint32 goods_id = 12; + */ + private int goodsId; + + /** + * optional .ItemList return_item_list = 1; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -54,7 +54,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -62,7 +62,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 7; * @return this */ public BuyGoodsScRsp clearRetcode() { @@ -72,7 +72,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -80,7 +80,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -91,7 +91,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 goods_buy_times = 8; + * optional uint32 goods_buy_times = 9; * @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 = 9; * @return this */ public BuyGoodsScRsp clearGoodsBuyTimes() { @@ -109,7 +109,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 goods_buy_times = 8; + * optional uint32 goods_buy_times = 9; * @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 = 9; * @param value the goodsBuyTimes to set * @return this */ @@ -128,62 +128,25 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 goods_id = 14; - * @return whether the goodsId field is set + * optional uint32 shop_id = 11; + * @return whether the shopId field is set */ - public boolean hasGoodsId() { + public boolean hasShopId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 goods_id = 14; - * @return this - */ - public BuyGoodsScRsp clearGoodsId() { - bitField0_ &= ~0x00000004; - goodsId = 0; - return this; - } - - /** - * optional uint32 goods_id = 14; - * @return the goodsId - */ - public int getGoodsId() { - return goodsId; - } - - /** - * optional uint32 goods_id = 14; - * @param value the goodsId to set - * @return this - */ - public BuyGoodsScRsp setGoodsId(final int value) { - bitField0_ |= 0x00000004; - goodsId = value; - return this; - } - - /** - * optional uint32 shop_id = 15; - * @return whether the shopId field is set - */ - public boolean hasShopId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 shop_id = 15; + * optional uint32 shop_id = 11; * @return this */ public BuyGoodsScRsp clearShopId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; shopId = 0; return this; } /** - * optional uint32 shop_id = 15; + * optional uint32 shop_id = 11; * @return the shopId */ public int getShopId() { @@ -191,18 +154,55 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 shop_id = 15; + * optional uint32 shop_id = 11; * @param value the shopId to set * @return this */ public BuyGoodsScRsp setShopId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; shopId = value; return this; } /** - * optional .ItemList return_item_list = 4; + * optional uint32 goods_id = 12; + * @return whether the goodsId field is set + */ + public boolean hasGoodsId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 goods_id = 12; + * @return this + */ + public BuyGoodsScRsp clearGoodsId() { + bitField0_ &= ~0x00000008; + goodsId = 0; + return this; + } + + /** + * optional uint32 goods_id = 12; + * @return the goodsId + */ + public int getGoodsId() { + return goodsId; + } + + /** + * optional uint32 goods_id = 12; + * @param value the goodsId to set + * @return this + */ + public BuyGoodsScRsp setGoodsId(final int value) { + bitField0_ |= 0x00000008; + goodsId = value; + return this; + } + + /** + * optional .ItemList return_item_list = 1; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -210,7 +210,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 1; * @return this */ public BuyGoodsScRsp clearReturnItemList() { @@ -220,7 +220,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -234,7 +234,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -248,7 +248,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 1; * @param value the returnItemList to set * @return this */ @@ -265,8 +265,8 @@ public final class BuyGoodsScRspOuterClass { bitField0_ = other.bitField0_; retcode = other.retcode; goodsBuyTimes = other.goodsBuyTimes; - goodsId = other.goodsId; shopId = other.shopId; + goodsId = other.goodsId; returnItemList.copyFrom(other.returnItemList); } return this; @@ -284,12 +284,12 @@ public final class BuyGoodsScRspOuterClass { if (other.hasGoodsBuyTimes()) { setGoodsBuyTimes(other.goodsBuyTimes); } - if (other.hasGoodsId()) { - setGoodsId(other.goodsId); - } if (other.hasShopId()) { setShopId(other.shopId); } + if (other.hasGoodsId()) { + setGoodsId(other.goodsId); + } if (other.hasReturnItemList()) { getMutableReturnItemList().mergeFrom(other.returnItemList); } @@ -305,8 +305,8 @@ public final class BuyGoodsScRspOuterClass { bitField0_ = 0; retcode = 0; goodsBuyTimes = 0; - goodsId = 0; shopId = 0; + goodsId = 0; returnItemList.clear(); return this; } @@ -334,31 +334,31 @@ public final class BuyGoodsScRspOuterClass { return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) && (!hasGoodsBuyTimes() || goodsBuyTimes == other.goodsBuyTimes) - && (!hasGoodsId() || goodsId == other.goodsId) && (!hasShopId() || shopId == other.shopId) + && (!hasGoodsId() || goodsId == other.goodsId) && (!hasReturnItemList() || returnItemList.equals(other.returnItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(goodsBuyTimes); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(goodsId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(shopId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(goodsId); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 10); output.writeMessageNoTag(returnItemList); } } @@ -373,10 +373,10 @@ public final class BuyGoodsScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsBuyTimes); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(returnItemList); @@ -391,43 +391,43 @@ public final class BuyGoodsScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 72) { break; } } - case 64: { + case 72: { // goodsBuyTimes goodsBuyTimes = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { - // goodsId - goodsId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 88: { // shopId shopId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 34) { + if (tag != 96) { break; } } - case 34: { + case 96: { + // goodsId + goodsId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { // returnItemList input.readMessage(returnItemList); bitField0_ |= 0x00000010; @@ -460,10 +460,10 @@ public final class BuyGoodsScRspOuterClass { output.writeUInt32(FieldNames.goodsBuyTimes, goodsBuyTimes); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.goodsId, goodsId); + output.writeUInt32(FieldNames.shopId, shopId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.shopId, shopId); + output.writeUInt32(FieldNames.goodsId, goodsId); } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.returnItemList, returnItemList); @@ -501,11 +501,11 @@ public final class BuyGoodsScRspOuterClass { } break; } - case 207037201: - case 2123207332: { - if (input.isAtField(FieldNames.goodsId)) { + case -903151951: + case 2067081988: { + if (input.isAtField(FieldNames.shopId)) { if (!input.trySkipNullValue()) { - goodsId = input.readUInt32(); + shopId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -513,11 +513,11 @@ public final class BuyGoodsScRspOuterClass { } break; } - case -903151951: - case 2067081988: { - if (input.isAtField(FieldNames.shopId)) { + case 207037201: + case 2123207332: { + if (input.isAtField(FieldNames.goodsId)) { if (!input.trySkipNullValue()) { - shopId = input.readUInt32(); + goodsId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -593,10 +593,10 @@ public final class BuyGoodsScRspOuterClass { static final FieldName goodsBuyTimes = FieldName.forField("goodsBuyTimes", "goods_buy_times"); - static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); - static final FieldName shopId = FieldName.forField("shopId", "shop_id"); + static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); + static final FieldName returnItemList = FieldName.forField("returnItemList", "return_item_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java index 0455a6b..2c76e98 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_two = 2; + * optional uint32 score_two = 4; */ private int scoreTwo; /** - * optional uint32 round_count = 5; - */ - private int roundCount; - - /** - * optional uint32 score = 9; - */ - private int score; - - /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 9; */ private int challengeId; /** - * optional .ExtraLineupType extra_lineup_type = 4; + * optional uint32 score = 12; + */ + private int score; + + /** + * optional uint32 round_count = 13; + */ + private int roundCount; + + /** + * optional .ExtraLineupType extra_lineup_type = 1; */ private int extraLineupType; /** - * optional .ChallengeStatus status = 10; + * optional .ChallengeStatus status = 11; */ private int status; /** - * optional .ChallengeStoryInfo story_info = 6; + * optional .ChallengeStoryInfo story_info = 3; */ private final ChallengeStoryInfoOuterClass.ChallengeStoryInfo storyInfo = ChallengeStoryInfoOuterClass.ChallengeStoryInfo.newInstance(); @@ -64,7 +64,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 score_two = 2; + * optional uint32 score_two = 4; * @return whether the scoreTwo field is set */ public boolean hasScoreTwo() { @@ -72,7 +72,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 score_two = 2; + * optional uint32 score_two = 4; * @return this */ public ChallengeInfo clearScoreTwo() { @@ -82,7 +82,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 score_two = 2; + * optional uint32 score_two = 4; * @return the scoreTwo */ public int getScoreTwo() { @@ -90,7 +90,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 score_two = 2; + * optional uint32 score_two = 4; * @param value the scoreTwo to set * @return this */ @@ -101,44 +101,44 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 round_count = 5; - * @return whether the roundCount field is set + * optional uint32 challenge_id = 9; + * @return whether the challengeId field is set */ - public boolean hasRoundCount() { + public boolean hasChallengeId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 round_count = 5; + * optional uint32 challenge_id = 9; * @return this */ - public ChallengeInfo clearRoundCount() { + public ChallengeInfo clearChallengeId() { bitField0_ &= ~0x00000002; - roundCount = 0; + challengeId = 0; return this; } /** - * optional uint32 round_count = 5; - * @return the roundCount + * optional uint32 challenge_id = 9; + * @return the challengeId */ - public int getRoundCount() { - return roundCount; + public int getChallengeId() { + return challengeId; } /** - * optional uint32 round_count = 5; - * @param value the roundCount to set + * optional uint32 challenge_id = 9; + * @param value the challengeId to set * @return this */ - public ChallengeInfo setRoundCount(final int value) { + public ChallengeInfo setChallengeId(final int value) { bitField0_ |= 0x00000002; - roundCount = value; + challengeId = value; return this; } /** - * optional uint32 score = 9; + * optional uint32 score = 12; * @return whether the score field is set */ public boolean hasScore() { @@ -146,7 +146,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 score = 9; + * optional uint32 score = 12; * @return this */ public ChallengeInfo clearScore() { @@ -156,7 +156,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 score = 9; + * optional uint32 score = 12; * @return the score */ public int getScore() { @@ -164,7 +164,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 score = 9; + * optional uint32 score = 12; * @param value the score to set * @return this */ @@ -175,44 +175,44 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 challenge_id = 14; - * @return whether the challengeId field is set + * optional uint32 round_count = 13; + * @return whether the roundCount field is set */ - public boolean hasChallengeId() { + public boolean hasRoundCount() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 challenge_id = 14; + * optional uint32 round_count = 13; * @return this */ - public ChallengeInfo clearChallengeId() { + public ChallengeInfo clearRoundCount() { bitField0_ &= ~0x00000008; - challengeId = 0; + roundCount = 0; return this; } /** - * optional uint32 challenge_id = 14; - * @return the challengeId + * optional uint32 round_count = 13; + * @return the roundCount */ - public int getChallengeId() { - return challengeId; + public int getRoundCount() { + return roundCount; } /** - * optional uint32 challenge_id = 14; - * @param value the challengeId to set + * optional uint32 round_count = 13; + * @param value the roundCount to set * @return this */ - public ChallengeInfo setChallengeId(final int value) { + public ChallengeInfo setRoundCount(final int value) { bitField0_ |= 0x00000008; - challengeId = value; + roundCount = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 4; + * optional .ExtraLineupType extra_lineup_type = 1; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -220,7 +220,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 4; + * optional .ExtraLineupType extra_lineup_type = 1; * @return this */ public ChallengeInfo clearExtraLineupType() { @@ -230,7 +230,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 4; + * optional .ExtraLineupType extra_lineup_type = 1; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -263,7 +263,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 4; + * optional .ExtraLineupType extra_lineup_type = 1; * @param value the extraLineupType to set * @return this */ @@ -274,7 +274,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStatus status = 10; + * optional .ChallengeStatus status = 11; * @return whether the status field is set */ public boolean hasStatus() { @@ -282,7 +282,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStatus status = 10; + * optional .ChallengeStatus status = 11; * @return this */ public ChallengeInfo clearStatus() { @@ -292,7 +292,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStatus status = 10; + * optional .ChallengeStatus status = 11; * @return the status */ public ChallengeStatusOuterClass.ChallengeStatus getStatus() { @@ -325,7 +325,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStatus status = 10; + * optional .ChallengeStatus status = 11; * @param value the status to set * @return this */ @@ -336,7 +336,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStoryInfo story_info = 6; + * optional .ChallengeStoryInfo story_info = 3; * @return whether the storyInfo field is set */ public boolean hasStoryInfo() { @@ -344,7 +344,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStoryInfo story_info = 6; + * optional .ChallengeStoryInfo story_info = 3; * @return this */ public ChallengeInfo clearStoryInfo() { @@ -354,7 +354,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStoryInfo story_info = 6; + * optional .ChallengeStoryInfo story_info = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -368,7 +368,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStoryInfo story_info = 6; + * optional .ChallengeStoryInfo story_info = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -382,7 +382,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStoryInfo story_info = 6; + * optional .ChallengeStoryInfo story_info = 3; * @param value the storyInfo to set * @return this */ @@ -398,9 +398,9 @@ public final class ChallengeInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; scoreTwo = other.scoreTwo; - roundCount = other.roundCount; - score = other.score; challengeId = other.challengeId; + score = other.score; + roundCount = other.roundCount; extraLineupType = other.extraLineupType; status = other.status; storyInfo.copyFrom(other.storyInfo); @@ -417,14 +417,14 @@ public final class ChallengeInfoOuterClass { if (other.hasScoreTwo()) { setScoreTwo(other.scoreTwo); } - if (other.hasRoundCount()) { - setRoundCount(other.roundCount); + if (other.hasChallengeId()) { + setChallengeId(other.challengeId); } if (other.hasScore()) { setScore(other.score); } - if (other.hasChallengeId()) { - setChallengeId(other.challengeId); + if (other.hasRoundCount()) { + setRoundCount(other.roundCount); } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); @@ -446,9 +446,9 @@ public final class ChallengeInfoOuterClass { cachedSize = -1; bitField0_ = 0; scoreTwo = 0; - roundCount = 0; - score = 0; challengeId = 0; + score = 0; + roundCount = 0; extraLineupType = 0; status = 0; storyInfo.clear(); @@ -477,9 +477,9 @@ public final class ChallengeInfoOuterClass { ChallengeInfo other = (ChallengeInfo) o; return bitField0_ == other.bitField0_ && (!hasScoreTwo() || scoreTwo == other.scoreTwo) - && (!hasRoundCount() || roundCount == other.roundCount) - && (!hasScore() || score == other.score) && (!hasChallengeId() || challengeId == other.challengeId) + && (!hasScore() || score == other.score) + && (!hasRoundCount() || roundCount == other.roundCount) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasStatus() || status == other.status) && (!hasStoryInfo() || storyInfo.equals(other.storyInfo)); @@ -488,31 +488,31 @@ public final class ChallengeInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(scoreTwo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(roundCount); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(score); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(challengeId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(roundCount); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 88); output.writeEnumNoTag(status); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 26); output.writeMessageNoTag(storyInfo); } } @@ -524,13 +524,13 @@ public final class ChallengeInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(roundCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(score); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(roundCount); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); @@ -551,43 +551,43 @@ public final class ChallengeInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 32: { // scoreTwo scoreTwo = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // roundCount - roundCount = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 72) { break; } } case 72: { + // challengeId + challengeId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { // score score = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { - // challengeId - challengeId = input.readUInt32(); + case 104: { + // roundCount + roundCount = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 32) { + if (tag != 8) { break; } } - case 32: { + case 8: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { @@ -595,11 +595,11 @@ public final class ChallengeInfoOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 80) { + if (tag != 88) { break; } } - case 80: { + case 88: { // status final int value = input.readInt32(); if (ChallengeStatusOuterClass.ChallengeStatus.forNumber(value) != null) { @@ -607,11 +607,11 @@ public final class ChallengeInfoOuterClass { bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 50) { + if (tag != 26) { break; } } - case 50: { + case 26: { // storyInfo input.readMessage(storyInfo); bitField0_ |= 0x00000040; @@ -641,13 +641,13 @@ public final class ChallengeInfoOuterClass { output.writeUInt32(FieldNames.scoreTwo, scoreTwo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.roundCount, roundCount); + output.writeUInt32(FieldNames.challengeId, challengeId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.score, score); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.challengeId, challengeId); + output.writeUInt32(FieldNames.roundCount, roundCount); } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); @@ -680,11 +680,11 @@ public final class ChallengeInfoOuterClass { } break; } - case -171935711: - case -244677858: { - if (input.isAtField(FieldNames.roundCount)) { + case -689112866: + case 112359031: { + if (input.isAtField(FieldNames.challengeId)) { if (!input.trySkipNullValue()) { - roundCount = input.readUInt32(); + challengeId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -703,11 +703,11 @@ public final class ChallengeInfoOuterClass { } break; } - case -689112866: - case 112359031: { - if (input.isAtField(FieldNames.challengeId)) { + case -171935711: + case -244677858: { + if (input.isAtField(FieldNames.roundCount)) { if (!input.trySkipNullValue()) { - challengeId = input.readUInt32(); + roundCount = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -814,11 +814,11 @@ public final class ChallengeInfoOuterClass { static class FieldNames { static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); - static final FieldName roundCount = FieldName.forField("roundCount", "round_count"); + static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); static final FieldName score = FieldName.forField("score"); - static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + static final FieldName roundCount = FieldName.forField("roundCount", "round_count"); static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java index 0cb0802..d9c1d21 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java @@ -19,7 +19,7 @@ public final class ChallengeLineupNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ExtraLineupType extra_lineup_type = 12; */ private int extraLineupType; @@ -34,7 +34,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ExtraLineupType extra_lineup_type = 12; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -42,7 +42,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ExtraLineupType extra_lineup_type = 12; * @return this */ public ChallengeLineupNotify clearExtraLineupType() { @@ -52,7 +52,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ExtraLineupType extra_lineup_type = 12; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -85,7 +85,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ExtraLineupType extra_lineup_type = 12; * @param value the extraLineupType to set * @return this */ @@ -155,7 +155,7 @@ public final class ChallengeLineupNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 96); output.writeEnumNoTag(extraLineupType); } } @@ -176,7 +176,7 @@ public final class ChallengeLineupNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 96: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java index d572f5d..4e1e42b 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java @@ -19,22 +19,22 @@ public final class ChallengeOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 score = 2; - */ - private int score; - - /** - * optional uint32 challenge_id = 8; - */ - private int challengeId; - - /** - * optional uint32 taken_reward = 10; + * optional uint32 taken_reward = 7; */ private int takenReward; /** - * optional uint32 stars = 11; + * optional uint32 score = 9; + */ + private int score; + + /** + * optional uint32 challenge_id = 10; + */ + private int challengeId; + + /** + * optional uint32 stars = 13; */ private int stars; @@ -49,99 +49,25 @@ public final class ChallengeOuterClass { } /** - * optional uint32 score = 2; - * @return whether the score field is set + * optional uint32 taken_reward = 7; + * @return whether the takenReward field is set */ - public boolean hasScore() { + public boolean hasTakenReward() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 score = 2; - * @return this - */ - public Challenge clearScore() { - bitField0_ &= ~0x00000001; - score = 0; - return this; - } - - /** - * optional uint32 score = 2; - * @return the score - */ - public int getScore() { - return score; - } - - /** - * optional uint32 score = 2; - * @param value the score to set - * @return this - */ - public Challenge setScore(final int value) { - bitField0_ |= 0x00000001; - score = value; - return this; - } - - /** - * optional uint32 challenge_id = 8; - * @return whether the challengeId field is set - */ - public boolean hasChallengeId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 challenge_id = 8; - * @return this - */ - public Challenge clearChallengeId() { - bitField0_ &= ~0x00000002; - challengeId = 0; - return this; - } - - /** - * optional uint32 challenge_id = 8; - * @return the challengeId - */ - public int getChallengeId() { - return challengeId; - } - - /** - * optional uint32 challenge_id = 8; - * @param value the challengeId to set - * @return this - */ - public Challenge setChallengeId(final int value) { - bitField0_ |= 0x00000002; - challengeId = value; - return this; - } - - /** - * optional uint32 taken_reward = 10; - * @return whether the takenReward field is set - */ - public boolean hasTakenReward() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 taken_reward = 10; + * optional uint32 taken_reward = 7; * @return this */ public Challenge clearTakenReward() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; takenReward = 0; return this; } /** - * optional uint32 taken_reward = 10; + * optional uint32 taken_reward = 7; * @return the takenReward */ public int getTakenReward() { @@ -149,18 +75,92 @@ public final class ChallengeOuterClass { } /** - * optional uint32 taken_reward = 10; + * optional uint32 taken_reward = 7; * @param value the takenReward to set * @return this */ public Challenge setTakenReward(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; takenReward = value; return this; } /** - * optional uint32 stars = 11; + * optional uint32 score = 9; + * @return whether the score field is set + */ + public boolean hasScore() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 score = 9; + * @return this + */ + public Challenge clearScore() { + bitField0_ &= ~0x00000002; + score = 0; + return this; + } + + /** + * optional uint32 score = 9; + * @return the score + */ + public int getScore() { + return score; + } + + /** + * optional uint32 score = 9; + * @param value the score to set + * @return this + */ + public Challenge setScore(final int value) { + bitField0_ |= 0x00000002; + score = value; + return this; + } + + /** + * optional uint32 challenge_id = 10; + * @return whether the challengeId field is set + */ + public boolean hasChallengeId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 challenge_id = 10; + * @return this + */ + public Challenge clearChallengeId() { + bitField0_ &= ~0x00000004; + 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_ |= 0x00000004; + challengeId = value; + return this; + } + + /** + * optional uint32 stars = 13; * @return whether the stars field is set */ public boolean hasStars() { @@ -168,7 +168,7 @@ public final class ChallengeOuterClass { } /** - * optional uint32 stars = 11; + * optional uint32 stars = 13; * @return this */ public Challenge clearStars() { @@ -178,7 +178,7 @@ public final class ChallengeOuterClass { } /** - * optional uint32 stars = 11; + * optional uint32 stars = 13; * @return the stars */ public int getStars() { @@ -186,7 +186,7 @@ public final class ChallengeOuterClass { } /** - * optional uint32 stars = 11; + * optional uint32 stars = 13; * @param value the stars to set * @return this */ @@ -201,9 +201,9 @@ public final class ChallengeOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + takenReward = other.takenReward; score = other.score; challengeId = other.challengeId; - takenReward = other.takenReward; stars = other.stars; } return this; @@ -215,15 +215,15 @@ public final class ChallengeOuterClass { return this; } cachedSize = -1; + 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); } @@ -237,9 +237,9 @@ public final class ChallengeOuterClass { } cachedSize = -1; bitField0_ = 0; + takenReward = 0; score = 0; challengeId = 0; - takenReward = 0; stars = 0; return this; } @@ -264,28 +264,28 @@ public final class ChallengeOuterClass { } Challenge other = (Challenge) o; return bitField0_ == other.bitField0_ + && (!hasTakenReward() || takenReward == other.takenReward) && (!hasScore() || score == other.score) && (!hasChallengeId() || challengeId == other.challengeId) - && (!hasTakenReward() || takenReward == other.takenReward) && (!hasStars() || stars == other.stars); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(score); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(takenReward); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(challengeId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(score); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 80); - output.writeUInt32NoTag(takenReward); + output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(stars); } } @@ -294,13 +294,13 @@ public final class ChallengeOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(score); + size += 1 + ProtoSink.computeUInt32SizeNoTag(takenReward); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(score); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(takenReward); + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); @@ -315,18 +315,18 @@ public final class ChallengeOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // score - score = input.readUInt32(); + case 56: { + // takenReward + takenReward = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 72) { break; } } - case 64: { - // challengeId - challengeId = input.readUInt32(); + case 72: { + // score + score = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 80) { @@ -334,15 +334,15 @@ public final class ChallengeOuterClass { } } case 80: { - // takenReward - takenReward = input.readUInt32(); + // challengeId + challengeId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 88) { + if (tag != 104) { break; } } - case 88: { + case 104: { // stars stars = input.readUInt32(); bitField0_ |= 0x00000008; @@ -369,13 +369,13 @@ 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.takenReward, takenReward); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.challengeId, challengeId); + output.writeUInt32(FieldNames.score, score); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.takenReward, takenReward); + output.writeUInt32(FieldNames.challengeId, challengeId); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.stars, stars); @@ -390,11 +390,23 @@ public final class ChallengeOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 1216849622: + case -1923526233: { + if (input.isAtField(FieldNames.takenReward)) { + if (!input.trySkipNullValue()) { + takenReward = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 109264530: { if (input.isAtField(FieldNames.score)) { if (!input.trySkipNullValue()) { score = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -406,18 +418,6 @@ public final class ChallengeOuterClass { 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_ |= 0x00000004; } } else { @@ -488,12 +488,12 @@ public final class ChallengeOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName takenReward = FieldName.forField("takenReward", "taken_reward"); + static final FieldName score = FieldName.forField("score"); static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); - static final FieldName takenReward = FieldName.forField("takenReward", "taken_reward"); - static final FieldName stars = FieldName.forField("stars"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java index c30a3ff..2b962ab 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 = 3; + * optional uint64 taken_challenge_reward = 10; */ private long takenChallengeReward; /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 12; */ private int groupId; @@ -39,7 +39,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 3; + * optional uint64 taken_challenge_reward = 10; * @return whether the takenChallengeReward field is set */ public boolean hasTakenChallengeReward() { @@ -47,7 +47,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 3; + * optional uint64 taken_challenge_reward = 10; * @return this */ public ChallengeReward clearTakenChallengeReward() { @@ -57,7 +57,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 3; + * optional uint64 taken_challenge_reward = 10; * @return the takenChallengeReward */ public long getTakenChallengeReward() { @@ -65,7 +65,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 3; + * optional uint64 taken_challenge_reward = 10; * @param value the takenChallengeReward to set * @return this */ @@ -76,7 +76,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 12; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -84,7 +84,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 12; * @return this */ public ChallengeReward clearGroupId() { @@ -94,7 +94,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 12; * @return the groupId */ public int getGroupId() { @@ -102,7 +102,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 12; * @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) 24); + output.writeRawByte((byte) 80); output.writeUInt64NoTag(takenChallengeReward); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(groupId); } } @@ -205,16 +205,16 @@ public final class ChallengeRewardOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 80: { // takenChallengeReward takenChallengeReward = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 96) { break; } } - case 112: { + case 96: { // 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 532c9a3..e7300b3 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java @@ -19,27 +19,27 @@ public final class ChallengeSettleNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 challenge_score = 9; + * optional uint32 challenge_score = 2; */ private int challengeScore; + /** + * optional uint32 challenge_id = 5; + */ + private int challengeId; + /** * optional uint32 score_two = 10; */ private int scoreTwo; /** - * optional uint32 stars = 13; + * optional uint32 stars = 14; */ private int stars; /** - * optional uint32 challenge_id = 14; - */ - private int challengeId; - - /** - * optional bool is_win = 15; + * optional bool is_win = 11; */ private boolean isWin; @@ -59,7 +59,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 challenge_score = 9; + * optional uint32 challenge_score = 2; * @return whether the challengeScore field is set */ public boolean hasChallengeScore() { @@ -67,7 +67,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 challenge_score = 9; + * optional uint32 challenge_score = 2; * @return this */ public ChallengeSettleNotify clearChallengeScore() { @@ -77,7 +77,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 challenge_score = 9; + * optional uint32 challenge_score = 2; * @return the challengeScore */ public int getChallengeScore() { @@ -85,7 +85,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 challenge_score = 9; + * optional uint32 challenge_score = 2; * @param value the challengeScore to set * @return this */ @@ -95,12 +95,49 @@ public final class ChallengeSettleNotifyOuterClass { 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 ChallengeSettleNotify 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 ChallengeSettleNotify setChallengeId(final int value) { + bitField0_ |= 0x00000002; + challengeId = value; + return this; + } + /** * optional uint32 score_two = 10; * @return whether the scoreTwo field is set */ public boolean hasScoreTwo() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -108,7 +145,7 @@ public final class ChallengeSettleNotifyOuterClass { * @return this */ public ChallengeSettleNotify clearScoreTwo() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; scoreTwo = 0; return this; } @@ -127,31 +164,31 @@ public final class ChallengeSettleNotifyOuterClass { * @return this */ public ChallengeSettleNotify setScoreTwo(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; scoreTwo = value; return this; } /** - * optional uint32 stars = 13; + * optional uint32 stars = 14; * @return whether the stars field is set */ public boolean hasStars() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 stars = 13; + * optional uint32 stars = 14; * @return this */ public ChallengeSettleNotify clearStars() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; stars = 0; return this; } /** - * optional uint32 stars = 13; + * optional uint32 stars = 14; * @return the stars */ public int getStars() { @@ -159,55 +196,18 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 stars = 13; + * optional uint32 stars = 14; * @param value the stars to set * @return this */ public ChallengeSettleNotify setStars(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; stars = value; return this; } /** - * optional uint32 challenge_id = 14; - * @return whether the challengeId field is set - */ - public boolean hasChallengeId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 challenge_id = 14; - * @return this - */ - public ChallengeSettleNotify clearChallengeId() { - bitField0_ &= ~0x00000008; - challengeId = 0; - return this; - } - - /** - * optional uint32 challenge_id = 14; - * @return the challengeId - */ - public int getChallengeId() { - return challengeId; - } - - /** - * optional uint32 challenge_id = 14; - * @param value the challengeId to set - * @return this - */ - public ChallengeSettleNotify setChallengeId(final int value) { - bitField0_ |= 0x00000008; - challengeId = value; - return this; - } - - /** - * optional bool is_win = 15; + * optional bool is_win = 11; * @return whether the isWin field is set */ public boolean hasIsWin() { @@ -215,7 +215,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 15; + * optional bool is_win = 11; * @return this */ public ChallengeSettleNotify clearIsWin() { @@ -225,7 +225,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 15; + * optional bool is_win = 11; * @return the isWin */ public boolean getIsWin() { @@ -233,7 +233,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 15; + * optional bool is_win = 11; * @param value the isWin to set * @return this */ @@ -306,9 +306,9 @@ public final class ChallengeSettleNotifyOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; challengeScore = other.challengeScore; + challengeId = other.challengeId; scoreTwo = other.scoreTwo; stars = other.stars; - challengeId = other.challengeId; isWin = other.isWin; reward.copyFrom(other.reward); } @@ -324,15 +324,15 @@ public final class ChallengeSettleNotifyOuterClass { 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.hasChallengeId()) { - setChallengeId(other.challengeId); - } if (other.hasIsWin()) { setIsWin(other.isWin); } @@ -350,9 +350,9 @@ public final class ChallengeSettleNotifyOuterClass { cachedSize = -1; bitField0_ = 0; challengeScore = 0; + challengeId = 0; scoreTwo = 0; stars = 0; - challengeId = 0; isWin = false; reward.clear(); return this; @@ -380,9 +380,9 @@ public final class ChallengeSettleNotifyOuterClass { ChallengeSettleNotify other = (ChallengeSettleNotify) o; return bitField0_ == other.bitField0_ && (!hasChallengeScore() || challengeScore == other.challengeScore) + && (!hasChallengeId() || challengeId == other.challengeId) && (!hasScoreTwo() || scoreTwo == other.scoreTwo) && (!hasStars() || stars == other.stars) - && (!hasChallengeId() || challengeId == other.challengeId) && (!hasIsWin() || isWin == other.isWin) && (!hasReward() || reward.equals(other.reward)); } @@ -390,23 +390,23 @@ public final class ChallengeSettleNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(challengeScore); } if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(challengeId); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 80); output.writeUInt32NoTag(scoreTwo); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(stars); - } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(challengeId); + output.writeUInt32NoTag(stars); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 88); output.writeBoolNoTag(isWin); } if ((bitField0_ & 0x00000020) != 0) { @@ -422,13 +422,13 @@ public final class ChallengeSettleNotifyOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeScore); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); + size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); } if ((bitField0_ & 0x00000010) != 0) { size += 2; @@ -446,11 +446,20 @@ public final class ChallengeSettleNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 16: { // 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 != 80) { break; } @@ -458,15 +467,6 @@ public final class ChallengeSettleNotifyOuterClass { case 80: { // scoreTwo scoreTwo = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // stars - stars = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 112) { @@ -474,15 +474,15 @@ public final class ChallengeSettleNotifyOuterClass { } } case 112: { - // challengeId - challengeId = input.readUInt32(); + // stars + stars = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 120) { + if (tag != 88) { break; } } - case 120: { + case 88: { // isWin isWin = input.readBool(); bitField0_ |= 0x00000010; @@ -521,13 +521,13 @@ public final class ChallengeSettleNotifyOuterClass { output.writeUInt32(FieldNames.challengeScore, challengeScore); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.scoreTwo, scoreTwo); + output.writeUInt32(FieldNames.challengeId, challengeId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.stars, stars); + output.writeUInt32(FieldNames.scoreTwo, scoreTwo); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.challengeId, challengeId); + output.writeUInt32(FieldNames.stars, stars); } if ((bitField0_ & 0x00000010) != 0) { output.writeBool(FieldNames.isWin, isWin); @@ -557,12 +557,24 @@ public final class ChallengeSettleNotifyOuterClass { } break; } + case -689112866: + case 112359031: { + if (input.isAtField(FieldNames.challengeId)) { + if (!input.trySkipNullValue()) { + challengeId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case -485512614: case 2129303327: { if (input.isAtField(FieldNames.scoreTwo)) { if (!input.trySkipNullValue()) { scoreTwo = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -573,18 +585,6 @@ public final class ChallengeSettleNotifyOuterClass { if (input.isAtField(FieldNames.stars)) { if (!input.trySkipNullValue()) { stars = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -689112866: - case 112359031: { - if (input.isAtField(FieldNames.challengeId)) { - if (!input.trySkipNullValue()) { - challengeId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -670,12 +670,12 @@ public final class ChallengeSettleNotifyOuterClass { static class FieldNames { 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 challengeId = FieldName.forField("challengeId", "challenge_id"); - 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/ChallengeStoryBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java index da5dbed..a394ef4 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 = 2; + * repeated uint32 buff_list = 6; */ private final RepeatedInt buffList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 2; + * repeated uint32 buff_list = 6; * @return whether the buffList field is set */ public boolean hasBuffList() { @@ -43,7 +43,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 2; + * repeated uint32 buff_list = 6; * @return this */ public ChallengeStoryBuffInfo clearBuffList() { @@ -53,7 +53,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 2; + * repeated uint32 buff_list = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 2; + * repeated uint32 buff_list = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 2; + * repeated uint32 buff_list = 6; * @param value the buffList to add * @return this */ @@ -92,7 +92,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 2; + * repeated uint32 buff_list = 6; * @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) 16); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(buffList.array()[i]); } } @@ -185,7 +185,7 @@ public final class ChallengeStoryBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 50: { // buffList [packed=true] input.readPackedUInt32(buffList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class ChallengeStoryBuffInfoOuterClass { tag = input.readTag(); break; } - case 16: { + case 48: { // buffList [packed=false] tag = input.readRepeatedUInt32(buffList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java index da8a4f3..6cba04d 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java @@ -33,6 +33,17 @@ public final class ChallengeStoryInfoOuterClass { return new ChallengeStoryInfo(); } + public boolean hasStoryBuffs() { + return (((bitField0_ & 0x00000001)) != 0); + } + + public ChallengeStoryInfo clearStoryBuffs() { + if (hasStoryBuffs()) { + clearCurStoryBuffs(); + } + return this; + } + /** * optional .ChallengeStoryBuffInfo cur_story_buffs = 1; * @return whether the curStoryBuffs field is set diff --git a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java index 723b166..9f0632e 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 = 1; */ private int slot; @@ -34,7 +34,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 9; + * optional uint32 slot = 1; * @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 = 1; * @return this */ public ChangeLineupLeaderCsReq clearSlot() { @@ -52,7 +52,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 9; + * optional uint32 slot = 1; * @return the slot */ public int getSlot() { @@ -60,7 +60,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 9; + * optional uint32 slot = 1; * @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) 8); output.writeUInt32NoTag(slot); } } @@ -150,7 +150,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 8: { // 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 a98652b..db5e842 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 retcode = 8; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional uint32 slot = 10; + * optional uint32 slot = 8; */ private int slot; @@ -39,7 +39,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 3; * @return this */ public ChangeLineupLeaderScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 slot = 10; + * optional uint32 slot = 8; * @return whether the slot field is set */ public boolean hasSlot() { @@ -84,7 +84,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 slot = 10; + * optional uint32 slot = 8; * @return this */ public ChangeLineupLeaderScRsp clearSlot() { @@ -94,7 +94,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 slot = 10; + * optional uint32 slot = 8; * @return the slot */ public int getSlot() { @@ -102,7 +102,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 slot = 10; + * optional uint32 slot = 8; * @param value the slot 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) 64); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(slot); } } @@ -205,16 +205,16 @@ public final class ChangeLineupLeaderScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 64) { break; } } - case 80: { + case 64: { // slot slot = 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 0cbe79b..029cd30 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 = 1; - */ - private int unkInt; - - /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 6; */ private int groupId; + /** + * optional uint32 unk_int = 11; + */ + private int unkInt; + private ChargerInfo() { } @@ -39,62 +39,25 @@ public final class ChargerInfoOuterClass { } /** - * optional uint32 unk_int = 1; - * @return whether the unkInt field is set + * optional uint32 group_id = 6; + * @return whether the groupId field is set */ - public boolean hasUnkInt() { + public boolean hasGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 unk_int = 1; - * @return this - */ - public ChargerInfo clearUnkInt() { - bitField0_ &= ~0x00000001; - unkInt = 0; - return this; - } - - /** - * optional uint32 unk_int = 1; - * @return the unkInt - */ - public int getUnkInt() { - return unkInt; - } - - /** - * optional uint32 unk_int = 1; - * @param value the unkInt to set - * @return this - */ - public ChargerInfo setUnkInt(final int value) { - bitField0_ |= 0x00000001; - unkInt = value; - return this; - } - - /** - * optional uint32 group_id = 14; - * @return whether the groupId field is set - */ - public boolean hasGroupId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 6; * @return this */ public ChargerInfo clearGroupId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; groupId = 0; return this; } /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 6; * @return the groupId */ public int getGroupId() { @@ -102,23 +65,60 @@ public final class ChargerInfoOuterClass { } /** - * optional uint32 group_id = 14; + * optional uint32 group_id = 6; * @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 = 11; + * @return whether the unkInt field is set + */ + public boolean hasUnkInt() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 unk_int = 11; + * @return this + */ + public ChargerInfo clearUnkInt() { + bitField0_ &= ~0x00000002; + unkInt = 0; + return this; + } + + /** + * optional uint32 unk_int = 11; + * @return the unkInt + */ + public int getUnkInt() { + return unkInt; + } + + /** + * optional uint32 unk_int = 11; + * @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) 8); - output.writeUInt32NoTag(unkInt); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 88); + 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 8: { - // unkInt - unkInt = input.readUInt32(); + case 48: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { - // groupId - groupId = input.readUInt32(); + case 88: { + // 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 031d496..18240c4 100644 --- a/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java @@ -20,7 +20,7 @@ public final class ChatOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 sent_time = 9; + * optional uint64 sent_time = 15; */ private long sentTime; @@ -30,17 +30,17 @@ public final class ChatOuterClass { private int senderUid; /** - * optional uint32 emote = 6; + * optional uint32 emote = 11; */ private int emote; /** - * optional .MsgType msg_type = 2; + * optional .MsgType msg_type = 10; */ private int msgType; /** - * optional string text = 5; + * optional string text = 8; */ private final Utf8String text = Utf8String.newEmptyInstance(); @@ -55,7 +55,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 9; + * optional uint64 sent_time = 15; * @return whether the sentTime field is set */ public boolean hasSentTime() { @@ -63,7 +63,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 9; + * optional uint64 sent_time = 15; * @return this */ public Chat clearSentTime() { @@ -73,7 +73,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 9; + * optional uint64 sent_time = 15; * @return the sentTime */ public long getSentTime() { @@ -81,7 +81,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 9; + * optional uint64 sent_time = 15; * @param value the sentTime to set * @return this */ @@ -129,7 +129,7 @@ public final class ChatOuterClass { } /** - * optional uint32 emote = 6; + * optional uint32 emote = 11; * @return whether the emote field is set */ public boolean hasEmote() { @@ -137,7 +137,7 @@ public final class ChatOuterClass { } /** - * optional uint32 emote = 6; + * optional uint32 emote = 11; * @return this */ public Chat clearEmote() { @@ -147,7 +147,7 @@ public final class ChatOuterClass { } /** - * optional uint32 emote = 6; + * optional uint32 emote = 11; * @return the emote */ public int getEmote() { @@ -155,7 +155,7 @@ public final class ChatOuterClass { } /** - * optional uint32 emote = 6; + * optional uint32 emote = 11; * @param value the emote to set * @return this */ @@ -166,7 +166,7 @@ public final class ChatOuterClass { } /** - * optional .MsgType msg_type = 2; + * 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 = 2; + * optional .MsgType msg_type = 10; * @return this */ public Chat clearMsgType() { @@ -184,7 +184,7 @@ public final class ChatOuterClass { } /** - * optional .MsgType msg_type = 2; + * optional .MsgType msg_type = 10; * @return the msgType */ public MsgTypeOuterClass.MsgType getMsgType() { @@ -217,7 +217,7 @@ public final class ChatOuterClass { } /** - * optional .MsgType msg_type = 2; + * optional .MsgType msg_type = 10; * @param value the msgType to set * @return this */ @@ -228,7 +228,7 @@ public final class ChatOuterClass { } /** - * optional string text = 5; + * optional string text = 8; * @return whether the text field is set */ public boolean hasText() { @@ -236,7 +236,7 @@ public final class ChatOuterClass { } /** - * optional string text = 5; + * optional string text = 8; * @return this */ public Chat clearText() { @@ -246,7 +246,7 @@ public final class ChatOuterClass { } /** - * optional string text = 5; + * optional string text = 8; * @return the text */ public String getText() { @@ -254,7 +254,7 @@ public final class ChatOuterClass { } /** - * optional string text = 5; + * optional string text = 8; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -262,7 +262,7 @@ public final class ChatOuterClass { } /** - * optional string text = 5; + * optional string text = 8; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -271,7 +271,7 @@ public final class ChatOuterClass { } /** - * optional string text = 5; + * optional string text = 8; * @param value the text to set * @return this */ @@ -282,7 +282,7 @@ public final class ChatOuterClass { } /** - * optional string text = 5; + * optional string text = 8; * @param value the text to set * @return this */ @@ -376,7 +376,7 @@ public final class ChatOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 120); output.writeUInt64NoTag(sentTime); } if ((bitField0_ & 0x00000002) != 0) { @@ -384,15 +384,15 @@ public final class ChatOuterClass { output.writeUInt32NoTag(senderUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(emote); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 80); output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 66); output.writeStringNoTag(text); } } @@ -425,7 +425,7 @@ public final class ChatOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 120: { // sentTime sentTime = input.readUInt64(); bitField0_ |= 0x00000001; @@ -439,20 +439,20 @@ public final class ChatOuterClass { senderUid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 88) { break; } } - case 48: { + case 88: { // emote emote = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 16) { + if (tag != 80) { break; } } - case 16: { + 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 != 42) { + if (tag != 66) { break; } } - case 42: { + case 66: { // text input.readString(text); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueAvatarOuterClass.java index bf7f569..f2d2931 100644 --- a/src/generated/main/emu/lunarcore/proto/ChessRogueAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChessRogueAvatarOuterClass.java @@ -19,12 +19,7 @@ public final class ChessRogueAvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 PGPLJENDONA = 9; - */ - private int pGPLJENDONA; - - /** - * optional uint32 avatar_id = 14; + * optional uint32 avatar_id = 7; */ private int avatarId; @@ -39,62 +34,25 @@ public final class ChessRogueAvatarOuterClass { } /** - * optional uint32 PGPLJENDONA = 9; - * @return whether the pGPLJENDONA field is set + * optional uint32 avatar_id = 7; + * @return whether the avatarId field is set */ - public boolean hasPGPLJENDONA() { + public boolean hasAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 PGPLJENDONA = 9; - * @return this - */ - public ChessRogueAvatar clearPGPLJENDONA() { - bitField0_ &= ~0x00000001; - pGPLJENDONA = 0; - return this; - } - - /** - * optional uint32 PGPLJENDONA = 9; - * @return the pGPLJENDONA - */ - public int getPGPLJENDONA() { - return pGPLJENDONA; - } - - /** - * optional uint32 PGPLJENDONA = 9; - * @param value the pGPLJENDONA to set - * @return this - */ - public ChessRogueAvatar setPGPLJENDONA(final int value) { - bitField0_ |= 0x00000001; - pGPLJENDONA = 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; + * optional uint32 avatar_id = 7; * @return this */ public ChessRogueAvatar clearAvatarId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; avatarId = 0; return this; } /** - * optional uint32 avatar_id = 14; + * optional uint32 avatar_id = 7; * @return the avatarId */ public int getAvatarId() { @@ -102,12 +60,12 @@ public final class ChessRogueAvatarOuterClass { } /** - * optional uint32 avatar_id = 14; + * optional uint32 avatar_id = 7; * @param value the avatarId to set * @return this */ public ChessRogueAvatar setAvatarId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; avatarId = value; return this; } @@ -117,7 +75,6 @@ public final class ChessRogueAvatarOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - pGPLJENDONA = other.pGPLJENDONA; avatarId = other.avatarId; } return this; @@ -129,9 +86,6 @@ public final class ChessRogueAvatarOuterClass { return this; } cachedSize = -1; - if (other.hasPGPLJENDONA()) { - setPGPLJENDONA(other.pGPLJENDONA); - } if (other.hasAvatarId()) { setAvatarId(other.avatarId); } @@ -145,7 +99,6 @@ public final class ChessRogueAvatarOuterClass { } cachedSize = -1; bitField0_ = 0; - pGPLJENDONA = 0; avatarId = 0; return this; } @@ -170,18 +123,13 @@ public final class ChessRogueAvatarOuterClass { } ChessRogueAvatar other = (ChessRogueAvatar) o; return bitField0_ == other.bitField0_ - && (!hasPGPLJENDONA() || pGPLJENDONA == other.pGPLJENDONA) && (!hasAvatarId() || avatarId == other.avatarId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(pGPLJENDONA); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(avatarId); } } @@ -190,9 +138,6 @@ public final class ChessRogueAvatarOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pGPLJENDONA); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } return size; @@ -205,19 +150,10 @@ public final class ChessRogueAvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // pGPLJENDONA - pGPLJENDONA = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 56: { // avatarId avatarId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { break; @@ -241,9 +177,6 @@ public final class ChessRogueAvatarOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.pGPLJENDONA, pGPLJENDONA); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.avatarId, avatarId); } output.endObject(); @@ -256,23 +189,12 @@ public final class ChessRogueAvatarOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 952698590: { - if (input.isAtField(FieldNames.pGPLJENDONA)) { - if (!input.trySkipNullValue()) { - pGPLJENDONA = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 1787287636: case -428636735: { if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { avatarId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -332,8 +254,6 @@ public final class ChessRogueAvatarOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName pGPLJENDONA = FieldName.forField("PGPLJENDONA"); - static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java b/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java index 9696745..653f007 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 = 14; - */ - private long expireTime; - - /** - * optional int64 time = 15; + * optional int64 time = 2; */ private long time; /** - * optional uint32 id = 1; + * optional int64 expire_time = 4; + */ + private long expireTime; + + /** + * optional uint32 id = 3; */ private int id; /** - * optional uint32 template_id = 9; + * optional uint32 template_id = 12; */ private int templateId; /** - * optional bool is_read = 2; + * optional bool is_read = 14; */ private boolean isRead; /** - * optional .ItemList attachment = 11; + * optional .ItemList attachment = 15; */ private final ItemListOuterClass.ItemList attachment = ItemListOuterClass.ItemList.newInstance(); /** - * optional string sender = 5; - */ - private final Utf8String sender = Utf8String.newEmptyInstance(); - - /** - * optional string content = 6; - */ - private final Utf8String content = Utf8String.newEmptyInstance(); - - /** - * optional string title = 7; + * optional string title = 1; */ private final Utf8String title = Utf8String.newEmptyInstance(); /** - * repeated string para_list = 4; + * optional string sender = 7; + */ + private final Utf8String sender = Utf8String.newEmptyInstance(); + + /** + * optional string content = 10; + */ + private final Utf8String content = Utf8String.newEmptyInstance(); + + /** + * repeated string para_list = 6; */ private final RepeatedString paraList = RepeatedString.newEmptyInstance(); @@ -81,62 +81,25 @@ public final class ClientMailOuterClass { } /** - * optional int64 expire_time = 14; - * @return whether the expireTime field is set + * optional int64 time = 2; + * @return whether the time field is set */ - public boolean hasExpireTime() { + public boolean hasTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional int64 expire_time = 14; - * @return this - */ - public ClientMail clearExpireTime() { - bitField0_ &= ~0x00000001; - expireTime = 0L; - return this; - } - - /** - * optional int64 expire_time = 14; - * @return the expireTime - */ - public long getExpireTime() { - return expireTime; - } - - /** - * optional int64 expire_time = 14; - * @param value the expireTime to set - * @return this - */ - public ClientMail setExpireTime(final long value) { - bitField0_ |= 0x00000001; - expireTime = value; - return this; - } - - /** - * optional int64 time = 15; - * @return whether the time field is set - */ - public boolean hasTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 time = 15; + * optional int64 time = 2; * @return this */ public ClientMail clearTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; time = 0L; return this; } /** - * optional int64 time = 15; + * optional int64 time = 2; * @return the time */ public long getTime() { @@ -144,18 +107,55 @@ public final class ClientMailOuterClass { } /** - * optional int64 time = 15; + * optional int64 time = 2; * @param value the time to set * @return this */ public ClientMail setTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; time = value; return this; } /** - * optional uint32 id = 1; + * optional int64 expire_time = 4; + * @return whether the expireTime field is set + */ + public boolean hasExpireTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 expire_time = 4; + * @return this + */ + public ClientMail clearExpireTime() { + bitField0_ &= ~0x00000002; + expireTime = 0L; + return this; + } + + /** + * optional int64 expire_time = 4; + * @return the expireTime + */ + public long getExpireTime() { + return expireTime; + } + + /** + * optional int64 expire_time = 4; + * @param value the expireTime to set + * @return this + */ + public ClientMail setExpireTime(final long value) { + bitField0_ |= 0x00000002; + expireTime = value; + return this; + } + + /** + * optional uint32 id = 3; * @return whether the id field is set */ public boolean hasId() { @@ -163,7 +163,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 3; * @return this */ public ClientMail clearId() { @@ -173,7 +173,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 3; * @return the id */ public int getId() { @@ -181,7 +181,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 3; * @param value the id to set * @return this */ @@ -192,7 +192,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 template_id = 9; + * optional uint32 template_id = 12; * @return whether the templateId field is set */ public boolean hasTemplateId() { @@ -200,7 +200,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 template_id = 9; + * optional uint32 template_id = 12; * @return this */ public ClientMail clearTemplateId() { @@ -210,7 +210,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 template_id = 9; + * optional uint32 template_id = 12; * @return the templateId */ public int getTemplateId() { @@ -218,7 +218,7 @@ public final class ClientMailOuterClass { } /** - * optional uint32 template_id = 9; + * optional uint32 template_id = 12; * @param value the templateId to set * @return this */ @@ -229,7 +229,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 2; + * optional bool is_read = 14; * @return whether the isRead field is set */ public boolean hasIsRead() { @@ -237,7 +237,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 2; + * optional bool is_read = 14; * @return this */ public ClientMail clearIsRead() { @@ -247,7 +247,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 2; + * optional bool is_read = 14; * @return the isRead */ public boolean getIsRead() { @@ -255,7 +255,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 2; + * optional bool is_read = 14; * @param value the isRead to set * @return this */ @@ -266,7 +266,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 11; + * optional .ItemList attachment = 15; * @return whether the attachment field is set */ public boolean hasAttachment() { @@ -274,7 +274,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 11; + * optional .ItemList attachment = 15; * @return this */ public ClientMail clearAttachment() { @@ -284,7 +284,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 11; + * optional .ItemList attachment = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -298,7 +298,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 11; + * optional .ItemList attachment = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -312,7 +312,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 11; + * optional .ItemList attachment = 15; * @param value the attachment to set * @return this */ @@ -323,155 +323,25 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 5; - * @return whether the sender field is set + * optional string title = 1; + * @return whether the title field is set */ - public boolean hasSender() { + public boolean hasTitle() { return (bitField0_ & 0x00000040) != 0; } /** - * optional string sender = 5; - * @return this - */ - public ClientMail clearSender() { - bitField0_ &= ~0x00000040; - sender.clear(); - return this; - } - - /** - * optional string sender = 5; - * @return the sender - */ - public String getSender() { - return sender.getString(); - } - - /** - * optional string sender = 5; - * @return internal {@code Utf8String} representation of sender for reading - */ - public Utf8String getSenderBytes() { - return this.sender; - } - - /** - * optional string sender = 5; - * @return internal {@code Utf8String} representation of sender for modifications - */ - public Utf8String getMutableSenderBytes() { - bitField0_ |= 0x00000040; - return this.sender; - } - - /** - * optional string sender = 5; - * @param value the sender to set - * @return this - */ - public ClientMail setSender(final CharSequence value) { - bitField0_ |= 0x00000040; - sender.copyFrom(value); - return this; - } - - /** - * optional string sender = 5; - * @param value the sender to set - * @return this - */ - public ClientMail setSender(final Utf8String value) { - bitField0_ |= 0x00000040; - sender.copyFrom(value); - return this; - } - - /** - * optional string content = 6; - * @return whether the content field is set - */ - public boolean hasContent() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional string content = 6; - * @return this - */ - public ClientMail clearContent() { - bitField0_ &= ~0x00000080; - content.clear(); - return this; - } - - /** - * optional string content = 6; - * @return the content - */ - public String getContent() { - return content.getString(); - } - - /** - * optional string content = 6; - * @return internal {@code Utf8String} representation of content for reading - */ - public Utf8String getContentBytes() { - return this.content; - } - - /** - * optional string content = 6; - * @return internal {@code Utf8String} representation of content for modifications - */ - public Utf8String getMutableContentBytes() { - bitField0_ |= 0x00000080; - return this.content; - } - - /** - * optional string content = 6; - * @param value the content to set - * @return this - */ - public ClientMail setContent(final CharSequence value) { - bitField0_ |= 0x00000080; - content.copyFrom(value); - return this; - } - - /** - * optional string content = 6; - * @param value the content to set - * @return this - */ - public ClientMail setContent(final Utf8String value) { - bitField0_ |= 0x00000080; - content.copyFrom(value); - return this; - } - - /** - * optional string title = 7; - * @return whether the title field is set - */ - public boolean hasTitle() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * optional string title = 7; + * optional string title = 1; * @return this */ public ClientMail clearTitle() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000040; title.clear(); return this; } /** - * optional string title = 7; + * optional string title = 1; * @return the title */ public String getTitle() { @@ -479,7 +349,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 7; + * optional string title = 1; * @return internal {@code Utf8String} representation of title for reading */ public Utf8String getTitleBytes() { @@ -487,38 +357,168 @@ public final class ClientMailOuterClass { } /** - * optional string title = 7; + * optional string title = 1; * @return internal {@code Utf8String} representation of title for modifications */ public Utf8String getMutableTitleBytes() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; return this.title; } /** - * optional string title = 7; + * optional string title = 1; * @param value the title to set * @return this */ public ClientMail setTitle(final CharSequence value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; title.copyFrom(value); return this; } /** - * optional string title = 7; + * optional string title = 1; * @param value the title to set * @return this */ public ClientMail setTitle(final Utf8String value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; title.copyFrom(value); return this; } /** - * repeated string para_list = 4; + * optional string sender = 7; + * @return whether the sender field is set + */ + public boolean hasSender() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional string sender = 7; + * @return this + */ + public ClientMail clearSender() { + bitField0_ &= ~0x00000080; + sender.clear(); + return this; + } + + /** + * optional string sender = 7; + * @return the sender + */ + public String getSender() { + return sender.getString(); + } + + /** + * optional string sender = 7; + * @return internal {@code Utf8String} representation of sender for reading + */ + public Utf8String getSenderBytes() { + return this.sender; + } + + /** + * optional string sender = 7; + * @return internal {@code Utf8String} representation of sender for modifications + */ + public Utf8String getMutableSenderBytes() { + bitField0_ |= 0x00000080; + return this.sender; + } + + /** + * optional string sender = 7; + * @param value the sender to set + * @return this + */ + public ClientMail setSender(final CharSequence value) { + bitField0_ |= 0x00000080; + sender.copyFrom(value); + return this; + } + + /** + * optional string sender = 7; + * @param value the sender to set + * @return this + */ + public ClientMail setSender(final Utf8String value) { + bitField0_ |= 0x00000080; + sender.copyFrom(value); + return this; + } + + /** + * optional string content = 10; + * @return whether the content field is set + */ + public boolean hasContent() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * optional string content = 10; + * @return this + */ + public ClientMail clearContent() { + bitField0_ &= ~0x00000100; + content.clear(); + return this; + } + + /** + * optional string content = 10; + * @return the content + */ + public String getContent() { + return content.getString(); + } + + /** + * optional string content = 10; + * @return internal {@code Utf8String} representation of content for reading + */ + public Utf8String getContentBytes() { + return this.content; + } + + /** + * optional string content = 10; + * @return internal {@code Utf8String} representation of content for modifications + */ + public Utf8String getMutableContentBytes() { + bitField0_ |= 0x00000100; + return this.content; + } + + /** + * optional string content = 10; + * @param value the content to set + * @return this + */ + public ClientMail setContent(final CharSequence value) { + bitField0_ |= 0x00000100; + content.copyFrom(value); + return this; + } + + /** + * optional string content = 10; + * @param value the content to set + * @return this + */ + public ClientMail setContent(final Utf8String value) { + bitField0_ |= 0x00000100; + content.copyFrom(value); + return this; + } + + /** + * repeated string para_list = 6; * @return whether the paraList field is set */ public boolean hasParaList() { @@ -526,7 +526,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 4; + * repeated string para_list = 6; * @return this */ public ClientMail clearParaList() { @@ -536,7 +536,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 4; + * repeated string para_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. @@ -550,7 +550,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 4; + * repeated string para_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 @@ -564,7 +564,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 4; + * repeated string para_list = 6; * @param value the paraList to add * @return this */ @@ -575,7 +575,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 4; + * repeated string para_list = 6; * @param values the paraList to add * @return this */ @@ -590,15 +590,15 @@ public final class ClientMailOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - expireTime = other.expireTime; time = other.time; + expireTime = other.expireTime; id = other.id; templateId = other.templateId; isRead = other.isRead; attachment.copyFrom(other.attachment); + title.copyFrom(other.title); sender.copyFrom(other.sender); content.copyFrom(other.content); - title.copyFrom(other.title); paraList.copyFrom(other.paraList); } return this; @@ -610,12 +610,12 @@ public final class ClientMailOuterClass { return this; } cachedSize = -1; - if (other.hasExpireTime()) { - setExpireTime(other.expireTime); - } if (other.hasTime()) { setTime(other.time); } + if (other.hasExpireTime()) { + setExpireTime(other.expireTime); + } if (other.hasId()) { setId(other.id); } @@ -628,15 +628,15 @@ public final class ClientMailOuterClass { if (other.hasAttachment()) { getMutableAttachment().mergeFrom(other.attachment); } + if (other.hasTitle()) { + getMutableTitleBytes().copyFrom(other.title); + } if (other.hasSender()) { getMutableSenderBytes().copyFrom(other.sender); } if (other.hasContent()) { getMutableContentBytes().copyFrom(other.content); } - if (other.hasTitle()) { - getMutableTitleBytes().copyFrom(other.title); - } if (other.hasParaList()) { getMutableParaList().addAll(other.paraList); } @@ -650,15 +650,15 @@ public final class ClientMailOuterClass { } cachedSize = -1; bitField0_ = 0; - expireTime = 0L; time = 0L; + expireTime = 0L; id = 0; templateId = 0; isRead = false; attachment.clear(); + title.clear(); sender.clear(); content.clear(); - title.clear(); paraList.clear(); return this; } @@ -671,9 +671,9 @@ public final class ClientMailOuterClass { cachedSize = -1; bitField0_ = 0; attachment.clearQuick(); + title.clear(); sender.clear(); content.clear(); - title.clear(); paraList.clear(); return this; } @@ -688,59 +688,59 @@ public final class ClientMailOuterClass { } ClientMail other = (ClientMail) o; return bitField0_ == other.bitField0_ - && (!hasExpireTime() || expireTime == other.expireTime) && (!hasTime() || time == other.time) + && (!hasExpireTime() || expireTime == other.expireTime) && (!hasId() || id == other.id) && (!hasTemplateId() || templateId == other.templateId) && (!hasIsRead() || isRead == other.isRead) && (!hasAttachment() || attachment.equals(other.attachment)) + && (!hasTitle() || title.equals(other.title)) && (!hasSender() || sender.equals(other.sender)) && (!hasContent() || content.equals(other.content)) - && (!hasTitle() || title.equals(other.title)) && (!hasParaList() || paraList.equals(other.paraList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); - output.writeInt64NoTag(expireTime); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 16); output.writeInt64NoTag(time); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 32); + output.writeInt64NoTag(expireTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(templateId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 112); output.writeBoolNoTag(isRead); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 122); output.writeMessageNoTag(attachment); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 42); - output.writeStringNoTag(sender); + output.writeRawByte((byte) 10); + output.writeStringNoTag(title); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 50); - output.writeStringNoTag(content); + output.writeRawByte((byte) 58); + output.writeStringNoTag(sender); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 58); - output.writeStringNoTag(title); + output.writeRawByte((byte) 82); + output.writeStringNoTag(content); } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < paraList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 50); output.writeStringNoTag(paraList.get(i)); } } @@ -750,10 +750,10 @@ public final class ClientMailOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(expireTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(time); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(time); + size += 1 + ProtoSink.computeInt64SizeNoTag(expireTime); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(id); @@ -768,13 +768,13 @@ public final class ClientMailOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(attachment); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(sender); + size += 1 + ProtoSink.computeStringSizeNoTag(title); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(content); + size += 1 + ProtoSink.computeStringSizeNoTag(sender); } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(title); + size += 1 + ProtoSink.computeStringSizeNoTag(content); } if ((bitField0_ & 0x00000200) != 0) { size += (1 * paraList.length()) + ProtoSink.computeRepeatedStringSizeNoTag(paraList); @@ -789,88 +789,88 @@ public final class ClientMailOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { - // expireTime - expireTime = input.readInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 16: { // time time = input.readInt64(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 32) { break; } } - case 8: { + case 32: { + // expireTime + expireTime = input.readInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { // id id = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 72) { + if (tag != 96) { break; } } - case 72: { + case 96: { // templateId templateId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 16) { + if (tag != 112) { break; } } - case 16: { + case 112: { // isRead isRead = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 90) { + if (tag != 122) { break; } } - case 90: { + case 122: { // attachment input.readMessage(attachment); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 42) { + if (tag != 10) { break; } } - case 42: { - // sender - input.readString(sender); + case 10: { + // title + input.readString(title); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { - // content - input.readString(content); - bitField0_ |= 0x00000080; - tag = input.readTag(); if (tag != 58) { break; } } case 58: { - // title - input.readString(title); - bitField0_ |= 0x00000100; + // sender + input.readString(sender); + bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 34) { + if (tag != 82) { break; } } - case 34: { + case 82: { + // content + input.readString(content); + bitField0_ |= 0x00000100; + tag = input.readTag(); + if (tag != 50) { + break; + } + } + case 50: { // paraList tag = input.readRepeatedString(paraList, tag); bitField0_ |= 0x00000200; @@ -896,10 +896,10 @@ public final class ClientMailOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.expireTime, expireTime); + output.writeInt64(FieldNames.time, time); } if ((bitField0_ & 0x00000002) != 0) { - output.writeInt64(FieldNames.time, time); + output.writeInt64(FieldNames.expireTime, expireTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.id, id); @@ -914,13 +914,13 @@ public final class ClientMailOuterClass { output.writeMessage(FieldNames.attachment, attachment); } if ((bitField0_ & 0x00000040) != 0) { - output.writeString(FieldNames.sender, sender); + output.writeString(FieldNames.title, title); } if ((bitField0_ & 0x00000080) != 0) { - output.writeString(FieldNames.content, content); + output.writeString(FieldNames.sender, sender); } if ((bitField0_ & 0x00000100) != 0) { - output.writeString(FieldNames.title, title); + output.writeString(FieldNames.content, content); } if ((bitField0_ & 0x00000200) != 0) { output.writeRepeatedString(FieldNames.paraList, paraList); @@ -935,11 +935,10 @@ public final class ClientMailOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -834724724: - case -96179731: { - if (input.isAtField(FieldNames.expireTime)) { + case 3560141: { + if (input.isAtField(FieldNames.time)) { if (!input.trySkipNullValue()) { - expireTime = input.readInt64(); + time = input.readInt64(); bitField0_ |= 0x00000001; } } else { @@ -947,10 +946,11 @@ public final class ClientMailOuterClass { } break; } - case 3560141: { - if (input.isAtField(FieldNames.time)) { + case -834724724: + case -96179731: { + if (input.isAtField(FieldNames.expireTime)) { if (!input.trySkipNullValue()) { - time = input.readInt64(); + expireTime = input.readInt64(); bitField0_ |= 0x00000002; } } else { @@ -1004,11 +1004,22 @@ public final class ClientMailOuterClass { } break; } + case 110371416: { + if (input.isAtField(FieldNames.title)) { + if (!input.trySkipNullValue()) { + input.readString(title); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } case -905962955: { if (input.isAtField(FieldNames.sender)) { if (!input.trySkipNullValue()) { input.readString(sender); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1019,17 +1030,6 @@ public final class ClientMailOuterClass { if (input.isAtField(FieldNames.content)) { if (!input.trySkipNullValue()) { input.readString(content); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } - case 110371416: { - if (input.isAtField(FieldNames.title)) { - if (!input.trySkipNullValue()) { - input.readString(title); bitField0_ |= 0x00000100; } } else { @@ -1101,10 +1101,10 @@ public final class ClientMailOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName expireTime = FieldName.forField("expireTime", "expire_time"); - static final FieldName time = FieldName.forField("time"); + static final FieldName expireTime = FieldName.forField("expireTime", "expire_time"); + static final FieldName id = FieldName.forField("id"); static final FieldName templateId = FieldName.forField("templateId", "template_id"); @@ -1113,12 +1113,12 @@ public final class ClientMailOuterClass { static final FieldName attachment = FieldName.forField("attachment"); + static final FieldName title = FieldName.forField("title"); + static final FieldName sender = FieldName.forField("sender"); static final FieldName content = FieldName.forField("content"); - static final FieldName title = FieldName.forField("title"); - static final FieldName paraList = FieldName.forField("paraList", "para_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java index d198ca6..cba9dc2 100644 --- a/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java @@ -19,17 +19,17 @@ public final class ComposeItemCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 compose_id = 8; - */ - private int composeId; - - /** - * optional uint32 count = 9; + * optional uint32 count = 1; */ private int count; /** - * optional .ItemCostList compose_item_list = 3; + * optional uint32 compose_id = 6; + */ + private int composeId; + + /** + * optional .ItemCostList compose_item_list = 14; */ private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -44,62 +44,25 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional uint32 compose_id = 8; - * @return whether the composeId field is set + * optional uint32 count = 1; + * @return whether the count field is set */ - public boolean hasComposeId() { + public boolean hasCount() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 compose_id = 8; - * @return this - */ - public ComposeItemCsReq clearComposeId() { - bitField0_ &= ~0x00000001; - composeId = 0; - return this; - } - - /** - * optional uint32 compose_id = 8; - * @return the composeId - */ - public int getComposeId() { - return composeId; - } - - /** - * optional uint32 compose_id = 8; - * @param value the composeId to set - * @return this - */ - public ComposeItemCsReq setComposeId(final int value) { - bitField0_ |= 0x00000001; - composeId = value; - return this; - } - - /** - * optional uint32 count = 9; - * @return whether the count field is set - */ - public boolean hasCount() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 count = 9; + * optional uint32 count = 1; * @return this */ public ComposeItemCsReq clearCount() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; count = 0; return this; } /** - * optional uint32 count = 9; + * optional uint32 count = 1; * @return the count */ public int getCount() { @@ -107,18 +70,55 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional uint32 count = 9; + * optional uint32 count = 1; * @param value the count to set * @return this */ public ComposeItemCsReq setCount(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; count = value; return this; } /** - * optional .ItemCostList compose_item_list = 3; + * optional uint32 compose_id = 6; + * @return whether the composeId field is set + */ + public boolean hasComposeId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 compose_id = 6; + * @return this + */ + public ComposeItemCsReq clearComposeId() { + bitField0_ &= ~0x00000002; + composeId = 0; + return this; + } + + /** + * optional uint32 compose_id = 6; + * @return the composeId + */ + public int getComposeId() { + return composeId; + } + + /** + * optional uint32 compose_id = 6; + * @param value the composeId to set + * @return this + */ + public ComposeItemCsReq setComposeId(final int value) { + bitField0_ |= 0x00000002; + composeId = value; + return this; + } + + /** + * optional .ItemCostList compose_item_list = 14; * @return whether the composeItemList field is set */ public boolean hasComposeItemList() { @@ -126,7 +126,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 3; + * optional .ItemCostList compose_item_list = 14; * @return this */ public ComposeItemCsReq clearComposeItemList() { @@ -136,7 +136,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 3; + * optional .ItemCostList compose_item_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 3; + * optional .ItemCostList compose_item_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 3; + * optional .ItemCostList compose_item_list = 14; * @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_; - composeId = other.composeId; count = other.count; + composeId = other.composeId; composeItemList.copyFrom(other.composeItemList); } return this; @@ -192,12 +192,12 @@ public final class ComposeItemCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasComposeId()) { - setComposeId(other.composeId); - } if (other.hasCount()) { setCount(other.count); } + if (other.hasComposeId()) { + setComposeId(other.composeId); + } if (other.hasComposeItemList()) { getMutableComposeItemList().mergeFrom(other.composeItemList); } @@ -211,8 +211,8 @@ public final class ComposeItemCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - composeId = 0; count = 0; + composeId = 0; composeItemList.clear(); return this; } @@ -238,23 +238,23 @@ public final class ComposeItemCsReqOuterClass { } ComposeItemCsReq other = (ComposeItemCsReq) o; return bitField0_ == other.bitField0_ - && (!hasComposeId() || composeId == other.composeId) && (!hasCount() || count == other.count) + && (!hasComposeId() || composeId == other.composeId) && (!hasComposeItemList() || composeItemList.equals(other.composeItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(composeId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(count); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(composeId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 114); 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(composeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(count); + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(composeItemList); @@ -281,25 +281,25 @@ public final class ComposeItemCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // composeId - composeId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 8: { // count count = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 48) { break; } } - case 26: { + case 48: { + // composeId + composeId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { // 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.composeId, composeId); + output.writeUInt32(FieldNames.count, count); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.count, count); + output.writeUInt32(FieldNames.composeId, composeId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.composeItemList, composeItemList); @@ -344,11 +344,10 @@ public final class ComposeItemCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1399759283: - case -442843416: { - if (input.isAtField(FieldNames.composeId)) { + case 94851343: { + if (input.isAtField(FieldNames.count)) { if (!input.trySkipNullValue()) { - composeId = input.readUInt32(); + count = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -356,10 +355,11 @@ public final class ComposeItemCsReqOuterClass { } break; } - case 94851343: { - if (input.isAtField(FieldNames.count)) { + case -1399759283: + case -442843416: { + if (input.isAtField(FieldNames.composeId)) { if (!input.trySkipNullValue()) { - count = input.readUInt32(); + composeId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -432,10 +432,10 @@ public final class ComposeItemCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName composeId = FieldName.forField("composeId", "compose_id"); - static final FieldName count = FieldName.forField("count"); + static final FieldName composeId = FieldName.forField("composeId", "compose_id"); + static final FieldName composeItemList = FieldName.forField("composeItemList", "compose_item_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java index 0d6a4c3..8340572 100644 --- a/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java @@ -19,22 +19,22 @@ public final class ComposeItemScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; - */ - private int retcode; - - /** - * optional uint32 compose_id = 7; - */ - private int composeId; - - /** - * optional uint32 count = 14; + * optional uint32 count = 4; */ private int count; /** - * optional .ItemList return_item_list = 9; + * optional uint32 retcode = 7; + */ + private int retcode; + + /** + * optional uint32 compose_id = 11; + */ + private int composeId; + + /** + * optional .ItemList return_item_list = 13; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -49,99 +49,25 @@ public final class ComposeItemScRspOuterClass { } /** - * optional uint32 retcode = 2; - * @return whether the retcode field is set + * optional uint32 count = 4; + * @return whether the count field is set */ - public boolean hasRetcode() { + public boolean hasCount() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 2; - * @return this - */ - public ComposeItemScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 2; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 2; - * @param value the retcode to set - * @return this - */ - public ComposeItemScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 compose_id = 7; - * @return whether the composeId field is set - */ - public boolean hasComposeId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 compose_id = 7; - * @return this - */ - public ComposeItemScRsp clearComposeId() { - bitField0_ &= ~0x00000002; - composeId = 0; - return this; - } - - /** - * optional uint32 compose_id = 7; - * @return the composeId - */ - public int getComposeId() { - return composeId; - } - - /** - * optional uint32 compose_id = 7; - * @param value the composeId to set - * @return this - */ - public ComposeItemScRsp setComposeId(final int value) { - bitField0_ |= 0x00000002; - composeId = value; - return this; - } - - /** - * optional uint32 count = 14; - * @return whether the count field is set - */ - public boolean hasCount() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 count = 14; + * optional uint32 count = 4; * @return this */ public ComposeItemScRsp clearCount() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; count = 0; return this; } /** - * optional uint32 count = 14; + * optional uint32 count = 4; * @return the count */ public int getCount() { @@ -149,18 +75,92 @@ public final class ComposeItemScRspOuterClass { } /** - * optional uint32 count = 14; + * optional uint32 count = 4; * @param value the count to set * @return this */ public ComposeItemScRsp setCount(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; count = value; return this; } /** - * optional .ItemList return_item_list = 9; + * 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 ComposeItemScRsp 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 ComposeItemScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional uint32 compose_id = 11; + * @return whether the composeId field is set + */ + public boolean hasComposeId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 compose_id = 11; + * @return this + */ + public ComposeItemScRsp clearComposeId() { + bitField0_ &= ~0x00000004; + composeId = 0; + return this; + } + + /** + * optional uint32 compose_id = 11; + * @return the composeId + */ + public int getComposeId() { + return composeId; + } + + /** + * optional uint32 compose_id = 11; + * @param value the composeId to set + * @return this + */ + public ComposeItemScRsp setComposeId(final int value) { + bitField0_ |= 0x00000004; + composeId = value; + return this; + } + + /** + * optional .ItemList return_item_list = 13; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -168,7 +168,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 9; + * optional .ItemList return_item_list = 13; * @return this */ public ComposeItemScRsp clearReturnItemList() { @@ -178,7 +178,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 9; + * optional .ItemList return_item_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -192,7 +192,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 9; + * optional .ItemList return_item_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -206,7 +206,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 9; + * optional .ItemList return_item_list = 13; * @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_; + count = other.count; retcode = other.retcode; composeId = other.composeId; - count = other.count; returnItemList.copyFrom(other.returnItemList); } return this; @@ -235,15 +235,15 @@ public final class ComposeItemScRspOuterClass { return this; } cachedSize = -1; + if (other.hasCount()) { + setCount(other.count); + } if (other.hasRetcode()) { setRetcode(other.retcode); } if (other.hasComposeId()) { setComposeId(other.composeId); } - if (other.hasCount()) { - setCount(other.count); - } if (other.hasReturnItemList()) { getMutableReturnItemList().mergeFrom(other.returnItemList); } @@ -257,9 +257,9 @@ public final class ComposeItemScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + count = 0; retcode = 0; composeId = 0; - count = 0; returnItemList.clear(); return this; } @@ -285,28 +285,28 @@ public final class ComposeItemScRspOuterClass { } ComposeItemScRsp other = (ComposeItemScRsp) o; return bitField0_ == other.bitField0_ + && (!hasCount() || count == other.count) && (!hasRetcode() || retcode == other.retcode) && (!hasComposeId() || composeId == other.composeId) - && (!hasCount() || count == other.count) && (!hasReturnItemList() || returnItemList.equals(other.returnItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(count); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 56); - output.writeUInt32NoTag(composeId); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(count); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(composeId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 106); 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(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(count); + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(returnItemList); @@ -336,9 +336,9 @@ public final class ComposeItemScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // retcode - retcode = input.readUInt32(); + case 32: { + // count + count = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 56) { @@ -346,24 +346,24 @@ public final class ComposeItemScRspOuterClass { } } case 56: { - // composeId - composeId = input.readUInt32(); + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { - // count - count = input.readUInt32(); + case 88: { + // composeId + composeId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 74) { + if (tag != 106) { break; } } - case 74: { + case 106: { // 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.retcode, retcode); + output.writeUInt32(FieldNames.count, count); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.composeId, composeId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.count, count); + output.writeUInt32(FieldNames.composeId, composeId); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.returnItemList, returnItemList); @@ -411,11 +411,22 @@ public final class ComposeItemScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 94851343: { + if (input.isAtField(FieldNames.count)) { + if (!input.trySkipNullValue()) { + count = 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(); @@ -427,17 +438,6 @@ public final class ComposeItemScRspOuterClass { if (input.isAtField(FieldNames.composeId)) { if (!input.trySkipNullValue()) { composeId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 94851343: { - if (input.isAtField(FieldNames.count)) { - if (!input.trySkipNullValue()) { - count = 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 count = FieldName.forField("count"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName composeId = FieldName.forField("composeId", "compose_id"); - static final FieldName count = FieldName.forField("count"); - 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 e4f21fa..ee7a5bb 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 count = 9; + * optional uint32 compose_relic_id = 6; */ - private int count; + private int composeRelicId; /** - * optional uint32 compose_id = 10; + * optional uint32 compose_id = 8; */ private int composeId; + /** + * optional uint32 count = 12; + */ + private int count; + /** * optional uint32 main_affix_id = 13; */ private int mainAffixId; /** - * optional uint32 compose_relic_id = 14; - */ - private int composeRelicId; - - /** - * optional .ItemCostList compose_item_list = 6; + * optional .ItemCostList compose_item_list = 11; */ private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -54,44 +54,44 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 count = 9; - * @return whether the count field is set + * optional uint32 compose_relic_id = 6; + * @return whether the composeRelicId field is set */ - public boolean hasCount() { + public boolean hasComposeRelicId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 count = 9; + * optional uint32 compose_relic_id = 6; * @return this */ - public ComposeSelectedRelicCsReq clearCount() { + public ComposeSelectedRelicCsReq clearComposeRelicId() { bitField0_ &= ~0x00000001; - count = 0; + composeRelicId = 0; return this; } /** - * optional uint32 count = 9; - * @return the count + * optional uint32 compose_relic_id = 6; + * @return the composeRelicId */ - public int getCount() { - return count; + public int getComposeRelicId() { + return composeRelicId; } /** - * optional uint32 count = 9; - * @param value the count to set + * optional uint32 compose_relic_id = 6; + * @param value the composeRelicId to set * @return this */ - public ComposeSelectedRelicCsReq setCount(final int value) { + public ComposeSelectedRelicCsReq setComposeRelicId(final int value) { bitField0_ |= 0x00000001; - count = value; + composeRelicId = value; return this; } /** - * optional uint32 compose_id = 10; + * optional uint32 compose_id = 8; * @return whether the composeId field is set */ public boolean hasComposeId() { @@ -99,7 +99,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 compose_id = 10; + * optional uint32 compose_id = 8; * @return this */ public ComposeSelectedRelicCsReq clearComposeId() { @@ -109,7 +109,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 compose_id = 10; + * optional uint32 compose_id = 8; * @return the composeId */ public int getComposeId() { @@ -117,7 +117,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 compose_id = 10; + * optional uint32 compose_id = 8; * @param value the composeId to set * @return this */ @@ -127,12 +127,49 @@ public final class ComposeSelectedRelicCsReqOuterClass { return this; } + /** + * optional uint32 count = 12; + * @return whether the count field is set + */ + public boolean hasCount() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 count = 12; + * @return this + */ + public ComposeSelectedRelicCsReq clearCount() { + bitField0_ &= ~0x00000004; + count = 0; + return this; + } + + /** + * optional uint32 count = 12; + * @return the count + */ + public int getCount() { + return count; + } + + /** + * optional uint32 count = 12; + * @param value the count to set + * @return this + */ + public ComposeSelectedRelicCsReq setCount(final int value) { + bitField0_ |= 0x00000004; + count = value; + return this; + } + /** * optional uint32 main_affix_id = 13; * @return whether the mainAffixId field is set */ public boolean hasMainAffixId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -140,7 +177,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { * @return this */ public ComposeSelectedRelicCsReq clearMainAffixId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; mainAffixId = 0; return this; } @@ -159,50 +196,13 @@ public final class ComposeSelectedRelicCsReqOuterClass { * @return this */ public ComposeSelectedRelicCsReq setMainAffixId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; mainAffixId = value; return this; } /** - * optional uint32 compose_relic_id = 14; - * @return whether the composeRelicId field is set - */ - public boolean hasComposeRelicId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 compose_relic_id = 14; - * @return this - */ - public ComposeSelectedRelicCsReq clearComposeRelicId() { - bitField0_ &= ~0x00000008; - composeRelicId = 0; - return this; - } - - /** - * optional uint32 compose_relic_id = 14; - * @return the composeRelicId - */ - public int getComposeRelicId() { - return composeRelicId; - } - - /** - * optional uint32 compose_relic_id = 14; - * @param value the composeRelicId to set - * @return this - */ - public ComposeSelectedRelicCsReq setComposeRelicId(final int value) { - bitField0_ |= 0x00000008; - composeRelicId = value; - return this; - } - - /** - * optional .ItemCostList compose_item_list = 6; + * optional .ItemCostList compose_item_list = 11; * @return whether the composeItemList field is set */ public boolean hasComposeItemList() { @@ -210,7 +210,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 6; + * optional .ItemCostList compose_item_list = 11; * @return this */ public ComposeSelectedRelicCsReq clearComposeItemList() { @@ -220,7 +220,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 6; + * optional .ItemCostList compose_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. @@ -234,7 +234,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 6; + * optional .ItemCostList compose_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 @@ -248,7 +248,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 6; + * optional .ItemCostList compose_item_list = 11; * @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_; - count = other.count; - composeId = other.composeId; - mainAffixId = other.mainAffixId; composeRelicId = other.composeRelicId; + composeId = other.composeId; + count = other.count; + mainAffixId = other.mainAffixId; composeItemList.copyFrom(other.composeItemList); } return this; @@ -279,18 +279,18 @@ public final class ComposeSelectedRelicCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasCount()) { - setCount(other.count); + if (other.hasComposeRelicId()) { + setComposeRelicId(other.composeRelicId); } if (other.hasComposeId()) { setComposeId(other.composeId); } + if (other.hasCount()) { + setCount(other.count); + } if (other.hasMainAffixId()) { setMainAffixId(other.mainAffixId); } - if (other.hasComposeRelicId()) { - setComposeRelicId(other.composeRelicId); - } if (other.hasComposeItemList()) { getMutableComposeItemList().mergeFrom(other.composeItemList); } @@ -304,10 +304,10 @@ public final class ComposeSelectedRelicCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - count = 0; - composeId = 0; - mainAffixId = 0; composeRelicId = 0; + composeId = 0; + count = 0; + mainAffixId = 0; composeItemList.clear(); return this; } @@ -333,33 +333,33 @@ public final class ComposeSelectedRelicCsReqOuterClass { } ComposeSelectedRelicCsReq other = (ComposeSelectedRelicCsReq) o; return bitField0_ == other.bitField0_ - && (!hasCount() || count == other.count) - && (!hasComposeId() || composeId == other.composeId) - && (!hasMainAffixId() || mainAffixId == other.mainAffixId) && (!hasComposeRelicId() || composeRelicId == other.composeRelicId) + && (!hasComposeId() || composeId == other.composeId) + && (!hasCount() || count == other.count) + && (!hasMainAffixId() || mainAffixId == other.mainAffixId) && (!hasComposeItemList() || composeItemList.equals(other.composeItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(count); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(composeRelicId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(composeId); } if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(count); + } + if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 104); output.writeUInt32NoTag(mainAffixId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(composeRelicId); - } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 90); output.writeMessageNoTag(composeItemList); } } @@ -368,16 +368,16 @@ public final class ComposeSelectedRelicCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(count); + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeRelicId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(composeRelicId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(composeItemList); @@ -392,20 +392,29 @@ public final class ComposeSelectedRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // count - count = input.readUInt32(); + case 48: { + // composeRelicId + composeRelicId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 64) { break; } } - case 80: { + case 64: { // composeId composeId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // count + count = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 104) { break; } @@ -413,22 +422,13 @@ public final class ComposeSelectedRelicCsReqOuterClass { case 104: { // mainAffixId mainAffixId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // composeRelicId - composeRelicId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 50) { + if (tag != 90) { break; } } - case 50: { + case 90: { // composeItemList input.readMessage(composeItemList); bitField0_ |= 0x00000010; @@ -455,16 +455,16 @@ public final class ComposeSelectedRelicCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.count, count); + output.writeUInt32(FieldNames.composeRelicId, composeRelicId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.composeId, composeId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.mainAffixId, mainAffixId); + output.writeUInt32(FieldNames.count, count); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.composeRelicId, composeRelicId); + output.writeUInt32(FieldNames.mainAffixId, mainAffixId); } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.composeItemList, composeItemList); @@ -479,10 +479,11 @@ public final class ComposeSelectedRelicCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 94851343: { - if (input.isAtField(FieldNames.count)) { + case 1424923132: + case 885799284: { + if (input.isAtField(FieldNames.composeRelicId)) { if (!input.trySkipNullValue()) { - count = input.readUInt32(); + composeRelicId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -502,11 +503,10 @@ public final class ComposeSelectedRelicCsReqOuterClass { } break; } - case -1973876974: - case -1426712144: { - if (input.isAtField(FieldNames.mainAffixId)) { + case 94851343: { + if (input.isAtField(FieldNames.count)) { if (!input.trySkipNullValue()) { - mainAffixId = input.readUInt32(); + count = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -514,11 +514,11 @@ public final class ComposeSelectedRelicCsReqOuterClass { } break; } - case 1424923132: - case 885799284: { - if (input.isAtField(FieldNames.composeRelicId)) { + case -1973876974: + case -1426712144: { + if (input.isAtField(FieldNames.mainAffixId)) { if (!input.trySkipNullValue()) { - composeRelicId = input.readUInt32(); + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -591,13 +591,13 @@ public final class ComposeSelectedRelicCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName count = FieldName.forField("count"); + static final FieldName composeRelicId = FieldName.forField("composeRelicId", "compose_relic_id"); static final FieldName composeId = FieldName.forField("composeId", "compose_id"); - static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); + static final FieldName count = FieldName.forField("count"); - static final FieldName composeRelicId = FieldName.forField("composeRelicId", "compose_relic_id"); + static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_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 b01995b..cfe7ef1 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 = 5; - */ - private int composeId; - - /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional .ItemList return_item_list = 14; + * optional uint32 compose_id = 4; + */ + private int composeId; + + /** + * optional .ItemList return_item_list = 13; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -44,62 +44,25 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional uint32 compose_id = 5; - * @return whether the composeId field is set + * optional uint32 retcode = 1; + * @return whether the retcode field is set */ - public boolean hasComposeId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 compose_id = 5; - * @return this - */ - public ComposeSelectedRelicScRsp clearComposeId() { - bitField0_ &= ~0x00000001; - composeId = 0; - return this; - } - - /** - * optional uint32 compose_id = 5; - * @return the composeId - */ - public int getComposeId() { - return composeId; - } - - /** - * optional uint32 compose_id = 5; - * @param value the composeId to set - * @return this - */ - public ComposeSelectedRelicScRsp setComposeId(final int value) { - bitField0_ |= 0x00000001; - composeId = 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 = 1; * @return this */ public ComposeSelectedRelicScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -107,18 +70,55 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; * @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 = 14; + * optional uint32 compose_id = 4; + * @return whether the composeId field is set + */ + public boolean hasComposeId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 compose_id = 4; + * @return this + */ + public ComposeSelectedRelicScRsp clearComposeId() { + bitField0_ &= ~0x00000002; + 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_ |= 0x00000002; + composeId = value; + return this; + } + + /** + * optional .ItemList return_item_list = 13; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -126,7 +126,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 14; + * optional .ItemList return_item_list = 13; * @return this */ public ComposeSelectedRelicScRsp clearReturnItemList() { @@ -136,7 +136,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 14; + * optional .ItemList return_item_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 14; + * optional .ItemList return_item_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 14; + * optional .ItemList return_item_list = 13; * @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) 40); - output.writeUInt32NoTag(composeId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(composeId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 106); 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 40: { - // composeId - composeId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 8: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 32) { break; } } - case 114: { + case 32: { + // composeId + composeId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { // 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/DMBBFODODOFOuterClass.java b/src/generated/main/emu/lunarcore/proto/DMBBFODODOFOuterClass.java deleted file mode 100644 index c374308..0000000 --- a/src/generated/main/emu/lunarcore/proto/DMBBFODODOFOuterClass.java +++ /dev/null @@ -1,358 +0,0 @@ -// 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 DMBBFODODOFOuterClass { - /** - * Protobuf type {@code DMBBFODODOF} - */ - public static final class DMBBFODODOF extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * 
-     *  4
-     *
- * - * optional uint32 BLPICCBCKPK = 2; - */ - private int bLPICCBCKPK; - - /** - * optional uint32 BCKPHBOPCCN = 6; - */ - private int bCKPHBOPCCN; - - private DMBBFODODOF() { - } - - /** - * @return a new empty instance of {@code DMBBFODODOF} - */ - public static DMBBFODODOF newInstance() { - return new DMBBFODODOF(); - } - - /** - * 
-     *  4
-     *
- * - * optional uint32 BLPICCBCKPK = 2; - * @return whether the bLPICCBCKPK field is set - */ - public boolean hasBLPICCBCKPK() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * 
-     *  4
-     *
- * - * optional uint32 BLPICCBCKPK = 2; - * @return this - */ - public DMBBFODODOF clearBLPICCBCKPK() { - bitField0_ &= ~0x00000001; - bLPICCBCKPK = 0; - return this; - } - - /** - * 
-     *  4
-     *
- * - * optional uint32 BLPICCBCKPK = 2; - * @return the bLPICCBCKPK - */ - public int getBLPICCBCKPK() { - return bLPICCBCKPK; - } - - /** - * 
-     *  4
-     *
- * - * optional uint32 BLPICCBCKPK = 2; - * @param value the bLPICCBCKPK to set - * @return this - */ - public DMBBFODODOF setBLPICCBCKPK(final int value) { - bitField0_ |= 0x00000001; - bLPICCBCKPK = value; - return this; - } - - /** - * optional uint32 BCKPHBOPCCN = 6; - * @return whether the bCKPHBOPCCN field is set - */ - public boolean hasBCKPHBOPCCN() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 BCKPHBOPCCN = 6; - * @return this - */ - public DMBBFODODOF clearBCKPHBOPCCN() { - bitField0_ &= ~0x00000002; - bCKPHBOPCCN = 0; - return this; - } - - /** - * optional uint32 BCKPHBOPCCN = 6; - * @return the bCKPHBOPCCN - */ - public int getBCKPHBOPCCN() { - return bCKPHBOPCCN; - } - - /** - * optional uint32 BCKPHBOPCCN = 6; - * @param value the bCKPHBOPCCN to set - * @return this - */ - public DMBBFODODOF setBCKPHBOPCCN(final int value) { - bitField0_ |= 0x00000002; - bCKPHBOPCCN = value; - return this; - } - - @Override - public DMBBFODODOF copyFrom(final DMBBFODODOF other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - bLPICCBCKPK = other.bLPICCBCKPK; - bCKPHBOPCCN = other.bCKPHBOPCCN; - } - return this; - } - - @Override - public DMBBFODODOF mergeFrom(final DMBBFODODOF other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasBLPICCBCKPK()) { - setBLPICCBCKPK(other.bLPICCBCKPK); - } - if (other.hasBCKPHBOPCCN()) { - setBCKPHBOPCCN(other.bCKPHBOPCCN); - } - return this; - } - - @Override - public DMBBFODODOF clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - bLPICCBCKPK = 0; - bCKPHBOPCCN = 0; - return this; - } - - @Override - public DMBBFODODOF 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 DMBBFODODOF)) { - return false; - } - DMBBFODODOF other = (DMBBFODODOF) o; - return bitField0_ == other.bitField0_ - && (!hasBLPICCBCKPK() || bLPICCBCKPK == other.bLPICCBCKPK) - && (!hasBCKPHBOPCCN() || bCKPHBOPCCN == other.bCKPHBOPCCN); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(bLPICCBCKPK); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(bCKPHBOPCCN); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bLPICCBCKPK); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bCKPHBOPCCN); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public DMBBFODODOF mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 16: { - // bLPICCBCKPK - bLPICCBCKPK = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // bCKPHBOPCCN - bCKPHBOPCCN = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.bLPICCBCKPK, bLPICCBCKPK); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.bCKPHBOPCCN, bCKPHBOPCCN); - } - output.endObject(); - } - - @Override - public DMBBFODODOF mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case 733217314: { - if (input.isAtField(FieldNames.bLPICCBCKPK)) { - if (!input.trySkipNullValue()) { - bLPICCBCKPK = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1904713331: { - if (input.isAtField(FieldNames.bCKPHBOPCCN)) { - if (!input.trySkipNullValue()) { - bCKPHBOPCCN = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public DMBBFODODOF clone() { - return new DMBBFODODOF().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static DMBBFODODOF parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new DMBBFODODOF(), data).checkInitialized(); - } - - public static DMBBFODODOF parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new DMBBFODODOF(), input).checkInitialized(); - } - - public static DMBBFODODOF parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new DMBBFODODOF(), input).checkInitialized(); - } - - /** - * @return factory for creating DMBBFODODOF messages - */ - public static MessageFactory getFactory() { - return DMBBFODODOFFactory.INSTANCE; - } - - private enum DMBBFODODOFFactory implements MessageFactory { - INSTANCE; - - @Override - public DMBBFODODOF create() { - return DMBBFODODOF.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName bLPICCBCKPK = FieldName.forField("BLPICCBCKPK"); - - static final FieldName bCKPHBOPCCN = FieldName.forField("BCKPHBOPCCN"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java index 54c33a5..4508bc0 100644 --- a/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java @@ -26,12 +26,12 @@ public final class DailyActiveInfoNotifyOuterClass { private int dailyActivePoint; /** - * repeated uint32 daily_active_quest_id_list = 12; + * repeated uint32 daily_active_quest_id_list = 15; */ private final RepeatedInt dailyActiveQuestIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .DailyActivityInfo daily_active_level_list = 15; + * repeated .DailyActivityInfo daily_active_level_list = 4; */ private final RepeatedMessage dailyActiveLevelList = RepeatedMessage.newEmptyInstance(DailyActivityInfoOuterClass.DailyActivityInfo.getFactory()); @@ -83,7 +83,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 12; + * repeated uint32 daily_active_quest_id_list = 15; * @return whether the dailyActiveQuestIdList field is set */ public boolean hasDailyActiveQuestIdList() { @@ -91,7 +91,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 12; + * repeated uint32 daily_active_quest_id_list = 15; * @return this */ public DailyActiveInfoNotify clearDailyActiveQuestIdList() { @@ -101,7 +101,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 12; + * repeated uint32 daily_active_quest_id_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -115,7 +115,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 12; + * repeated uint32 daily_active_quest_id_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -129,7 +129,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 12; + * repeated uint32 daily_active_quest_id_list = 15; * @param value the dailyActiveQuestIdList to add * @return this */ @@ -140,7 +140,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 12; + * repeated uint32 daily_active_quest_id_list = 15; * @param values the dailyActiveQuestIdList to add * @return this */ @@ -151,7 +151,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 15; + * repeated .DailyActivityInfo daily_active_level_list = 4; * @return whether the dailyActiveLevelList field is set */ public boolean hasDailyActiveLevelList() { @@ -159,7 +159,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 15; + * repeated .DailyActivityInfo daily_active_level_list = 4; * @return this */ public DailyActiveInfoNotify clearDailyActiveLevelList() { @@ -169,7 +169,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 15; + * repeated .DailyActivityInfo daily_active_level_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. @@ -184,7 +184,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 15; + * repeated .DailyActivityInfo daily_active_level_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 @@ -199,7 +199,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 15; + * repeated .DailyActivityInfo daily_active_level_list = 4; * @param value the dailyActiveLevelList to add * @return this */ @@ -211,7 +211,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 15; + * repeated .DailyActivityInfo daily_active_level_list = 4; * @param values the dailyActiveLevelList to add * @return this */ @@ -300,13 +300,13 @@ public final class DailyActiveInfoNotifyOuterClass { } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < dailyActiveQuestIdList.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(dailyActiveQuestIdList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < dailyActiveLevelList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 34); output.writeMessageNoTag(dailyActiveLevelList.get(i)); } } @@ -339,20 +339,20 @@ public final class DailyActiveInfoNotifyOuterClass { dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { - // dailyActiveQuestIdList [packed=true] - input.readPackedUInt32(dailyActiveQuestIdList, tag); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 122) { break; } } case 122: { + // dailyActiveQuestIdList [packed=true] + input.readPackedUInt32(dailyActiveQuestIdList, tag); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 34) { + break; + } + } + case 34: { // dailyActiveLevelList tag = input.readRepeatedMessage(dailyActiveLevelList, tag); bitField0_ |= 0x00000004; @@ -370,7 +370,7 @@ public final class DailyActiveInfoNotifyOuterClass { tag = input.readTag(); break; } - case 96: { + case 120: { // dailyActiveQuestIdList [packed=false] tag = input.readRepeatedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java index ffdf03e..1ce47d6 100644 --- a/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java @@ -19,22 +19,22 @@ public final class DailyActivityInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 daily_active_point = 6; - */ - private int dailyActivePoint; - - /** - * optional uint32 level = 8; - */ - private int level; - - /** - * optional uint32 world_level = 15; + * optional uint32 world_level = 4; */ private int worldLevel; /** - * optional bool is_has_taken = 11; + * optional uint32 daily_active_point = 5; + */ + private int dailyActivePoint; + + /** + * optional uint32 level = 10; + */ + private int level; + + /** + * optional bool is_has_taken = 2; */ private boolean isHasTaken; @@ -49,99 +49,25 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 daily_active_point = 6; - * @return whether the dailyActivePoint field is set + * optional uint32 world_level = 4; + * @return whether the worldLevel field is set */ - public boolean hasDailyActivePoint() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 daily_active_point = 6; - * @return this - */ - public DailyActivityInfo clearDailyActivePoint() { - bitField0_ &= ~0x00000001; - dailyActivePoint = 0; - return this; - } - - /** - * optional uint32 daily_active_point = 6; - * @return the dailyActivePoint - */ - public int getDailyActivePoint() { - return dailyActivePoint; - } - - /** - * optional uint32 daily_active_point = 6; - * @param value the dailyActivePoint to set - * @return this - */ - public DailyActivityInfo setDailyActivePoint(final int value) { - bitField0_ |= 0x00000001; - dailyActivePoint = value; - return this; - } - - /** - * optional uint32 level = 8; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 level = 8; - * @return this - */ - public DailyActivityInfo clearLevel() { - bitField0_ &= ~0x00000002; - level = 0; - return this; - } - - /** - * optional uint32 level = 8; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 8; - * @param value the level to set - * @return this - */ - public DailyActivityInfo setLevel(final int value) { - bitField0_ |= 0x00000002; - level = value; - return this; - } - - /** - * optional uint32 world_level = 15; - * @return whether the worldLevel field is set - */ - public boolean hasWorldLevel() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 world_level = 15; + * optional uint32 world_level = 4; * @return this */ public DailyActivityInfo clearWorldLevel() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; worldLevel = 0; return this; } /** - * optional uint32 world_level = 15; + * optional uint32 world_level = 4; * @return the worldLevel */ public int getWorldLevel() { @@ -149,18 +75,92 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 world_level = 15; + * optional uint32 world_level = 4; * @param value the worldLevel to set * @return this */ public DailyActivityInfo setWorldLevel(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; worldLevel = value; return this; } /** - * optional bool is_has_taken = 11; + * optional uint32 daily_active_point = 5; + * @return whether the dailyActivePoint field is set + */ + public boolean hasDailyActivePoint() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 daily_active_point = 5; + * @return this + */ + public DailyActivityInfo clearDailyActivePoint() { + bitField0_ &= ~0x00000002; + dailyActivePoint = 0; + return this; + } + + /** + * optional uint32 daily_active_point = 5; + * @return the dailyActivePoint + */ + public int getDailyActivePoint() { + return dailyActivePoint; + } + + /** + * optional uint32 daily_active_point = 5; + * @param value the dailyActivePoint to set + * @return this + */ + public DailyActivityInfo setDailyActivePoint(final int value) { + bitField0_ |= 0x00000002; + dailyActivePoint = value; + return this; + } + + /** + * optional uint32 level = 10; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 level = 10; + * @return this + */ + public DailyActivityInfo clearLevel() { + bitField0_ &= ~0x00000004; + 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 DailyActivityInfo setLevel(final int value) { + bitField0_ |= 0x00000004; + level = 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 = 11; + * optional bool is_has_taken = 2; * @return this */ public DailyActivityInfo clearIsHasTaken() { @@ -178,7 +178,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional bool is_has_taken = 11; + * 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 = 11; + * optional bool is_has_taken = 2; * @param value the isHasTaken to set * @return this */ @@ -201,9 +201,9 @@ public final class DailyActivityInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + worldLevel = other.worldLevel; dailyActivePoint = other.dailyActivePoint; level = other.level; - worldLevel = other.worldLevel; isHasTaken = other.isHasTaken; } return this; @@ -215,15 +215,15 @@ public final class DailyActivityInfoOuterClass { return this; } cachedSize = -1; + if (other.hasWorldLevel()) { + setWorldLevel(other.worldLevel); + } if (other.hasDailyActivePoint()) { setDailyActivePoint(other.dailyActivePoint); } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasWorldLevel()) { - setWorldLevel(other.worldLevel); - } if (other.hasIsHasTaken()) { setIsHasTaken(other.isHasTaken); } @@ -237,9 +237,9 @@ public final class DailyActivityInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + worldLevel = 0; dailyActivePoint = 0; level = 0; - worldLevel = 0; isHasTaken = false; return this; } @@ -264,28 +264,28 @@ public final class DailyActivityInfoOuterClass { } DailyActivityInfo other = (DailyActivityInfo) o; return bitField0_ == other.bitField0_ + && (!hasWorldLevel() || worldLevel == other.worldLevel) && (!hasDailyActivePoint() || dailyActivePoint == other.dailyActivePoint) && (!hasLevel() || level == other.level) - && (!hasWorldLevel() || worldLevel == other.worldLevel) && (!hasIsHasTaken() || isHasTaken == other.isHasTaken); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(dailyActivePoint); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(worldLevel); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(dailyActivePoint); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(level); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 16); output.writeBoolNoTag(isHasTaken); } } @@ -294,13 +294,13 @@ public final class DailyActivityInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dailyActivePoint); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dailyActivePoint); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000008) != 0) { size += 2; @@ -315,34 +315,34 @@ public final class DailyActivityInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // dailyActivePoint - dailyActivePoint = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 32: { // worldLevel worldLevel = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 40) { break; } } - case 88: { + case 40: { + // dailyActivePoint + dailyActivePoint = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { // isHasTaken isHasTaken = input.readBool(); bitField0_ |= 0x00000008; @@ -369,13 +369,13 @@ public final class DailyActivityInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.dailyActivePoint, dailyActivePoint); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.dailyActivePoint, dailyActivePoint); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000008) != 0) { output.writeBool(FieldNames.isHasTaken, isHasTaken); @@ -390,12 +390,24 @@ public final class DailyActivityInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { + if (!input.trySkipNullValue()) { + worldLevel = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 859671121: case 1952864125: { if (input.isAtField(FieldNames.dailyActivePoint)) { if (!input.trySkipNullValue()) { dailyActivePoint = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -406,18 +418,6 @@ public final class DailyActivityInfoOuterClass { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { - if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -490,12 +490,12 @@ public final class DailyActivityInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); + static final FieldName dailyActivePoint = FieldName.forField("dailyActivePoint", "daily_active_point"); static final FieldName level = FieldName.forField("level"); - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - static final FieldName isHasTaken = FieldName.forField("isHasTaken", "is_has_taken"); } } diff --git a/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java index 17bb3a9..fe622de 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 = 8; + * repeated uint32 id_list = 13; */ private final RepeatedInt idList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 13; * @return whether the idList field is set */ public boolean hasIdList() { @@ -43,7 +43,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 13; * @return this */ public DelMailCsReq clearIdList() { @@ -53,7 +53,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 13; * @param value the idList to add * @return this */ @@ -92,7 +92,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 13; * @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) 64); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(idList.array()[i]); } } @@ -185,7 +185,7 @@ public final class DelMailCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 106: { // idList [packed=true] input.readPackedUInt32(idList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class DelMailCsReqOuterClass { tag = input.readTag(); break; } - case 64: { + case 104: { // 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 736301e..5b3d398 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 = 4; + * optional uint32 retcode = 3; */ private int retcode; /** - * repeated uint32 id_list = 7; + * repeated uint32 id_list = 6; */ private final RepeatedInt idList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 3; * @return this */ public DelMailScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 7; + * repeated uint32 id_list = 6; * @return whether the idList field is set */ public boolean hasIdList() { @@ -85,7 +85,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 7; + * repeated uint32 id_list = 6; * @return this */ public DelMailScRsp clearIdList() { @@ -95,7 +95,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 7; + * repeated uint32 id_list = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 7; + * repeated uint32 id_list = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 7; + * repeated uint32 id_list = 6; * @param value the idList to add * @return this */ @@ -134,7 +134,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 7; + * repeated uint32 id_list = 6; * @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) 32); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < idList.length(); i++) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(idList.array()[i]); } } @@ -240,16 +240,16 @@ public final class DelMailScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 50) { break; } } - case 58: { + case 50: { // idList [packed=true] input.readPackedUInt32(idList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class DelMailScRspOuterClass { tag = input.readTag(); break; } - case 56: { + case 48: { // idList [packed=false] tag = input.readRepeatedUInt32(idList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java index cb981b9..1550ccf 100644 --- a/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class DeleteFriendCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 3; + * optional uint32 uid = 5; */ private int uid; @@ -34,7 +34,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 3; + * optional uint32 uid = 5; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 3; + * optional uint32 uid = 5; * @return this */ public DeleteFriendCsReq clearUid() { @@ -52,7 +52,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 3; + * optional uint32 uid = 5; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 3; + * optional uint32 uid = 5; * @param value the uid to set * @return this */ @@ -129,7 +129,7 @@ public final class DeleteFriendCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public final class DeleteFriendCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 40: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java index 7223406..1d28ed3 100644 --- a/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class DeployRotaterCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RotaterData rotater_data = 4; + * optional .RotaterData rotater_data = 2; */ private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance(); @@ -34,7 +34,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 4; + * optional .RotaterData rotater_data = 2; * @return whether the rotaterData field is set */ public boolean hasRotaterData() { @@ -42,7 +42,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 4; + * optional .RotaterData rotater_data = 2; * @return this */ public DeployRotaterCsReq clearRotaterData() { @@ -52,7 +52,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 4; + * optional .RotaterData rotater_data = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 4; + * optional .RotaterData rotater_data = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 4; + * optional .RotaterData rotater_data = 2; * @param value the rotaterData to set * @return this */ @@ -150,7 +150,7 @@ public final class DeployRotaterCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 18); output.writeMessageNoTag(rotaterData); } } @@ -171,7 +171,7 @@ public final class DeployRotaterCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { + case 18: { // rotaterData input.readMessage(rotaterData); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java index 6cd4a9e..029a49d 100644 --- a/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java @@ -19,12 +19,12 @@ public final class DeployRotaterScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 11; */ private int retcode; /** - * optional .RotatorEnergyInfo energy_info = 7; + * optional .RotatorEnergyInfo energy_info = 5; */ private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance(); @@ -44,7 +44,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +52,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 11; * @return this */ public DeployRotaterScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -81,7 +81,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 7; + * optional .RotatorEnergyInfo energy_info = 5; * @return whether the energyInfo field is set */ public boolean hasEnergyInfo() { @@ -89,7 +89,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 7; + * optional .RotatorEnergyInfo energy_info = 5; * @return this */ public DeployRotaterScRsp clearEnergyInfo() { @@ -99,7 +99,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 7; + * optional .RotatorEnergyInfo energy_info = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -113,7 +113,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 7; + * optional .RotatorEnergyInfo energy_info = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -127,7 +127,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 7; + * optional .RotatorEnergyInfo energy_info = 5; * @param value the energyInfo to set * @return this */ @@ -268,11 +268,11 @@ public final class DeployRotaterScRspOuterClass { @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) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 42); output.writeMessageNoTag(energyInfo); } if ((bitField0_ & 0x00000004) != 0) { @@ -303,16 +303,16 @@ public final class DeployRotaterScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 42) { break; } } - case 58: { + case 42: { // energyInfo input.readMessage(energyInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DialogueResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/DialogueResultOuterClass.java index 8fbfabf..cdb8021 100644 --- a/src/generated/main/emu/lunarcore/proto/DialogueResultOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DialogueResultOuterClass.java @@ -20,19 +20,19 @@ public final class DialogueResultOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 HFHKBMGBJAN = 15; + * optional uint32 HFHKBMGBJAN = 2; */ private int hFHKBMGBJAN; /** - * optional .ItemList item_result = 6; + * optional .ItemList item_result = 5; */ private final ItemListOuterClass.ItemList itemResult = ItemListOuterClass.ItemList.newInstance(); /** - * repeated uint32 BLGIMDCNDHJ = 5; + * repeated uint32 event_ids = 15; */ - private final RepeatedInt bLGIMDCNDHJ = RepeatedInt.newEmptyInstance(); + private final RepeatedInt eventIds = RepeatedInt.newEmptyInstance(); private DialogueResult() { } @@ -45,7 +45,7 @@ public final class DialogueResultOuterClass { } /** - * optional uint32 HFHKBMGBJAN = 15; + * optional uint32 HFHKBMGBJAN = 2; * @return whether the hFHKBMGBJAN field is set */ public boolean hasHFHKBMGBJAN() { @@ -53,7 +53,7 @@ public final class DialogueResultOuterClass { } /** - * optional uint32 HFHKBMGBJAN = 15; + * optional uint32 HFHKBMGBJAN = 2; * @return this */ public DialogueResult clearHFHKBMGBJAN() { @@ -63,7 +63,7 @@ public final class DialogueResultOuterClass { } /** - * optional uint32 HFHKBMGBJAN = 15; + * optional uint32 HFHKBMGBJAN = 2; * @return the hFHKBMGBJAN */ public int getHFHKBMGBJAN() { @@ -71,7 +71,7 @@ public final class DialogueResultOuterClass { } /** - * optional uint32 HFHKBMGBJAN = 15; + * optional uint32 HFHKBMGBJAN = 2; * @param value the hFHKBMGBJAN to set * @return this */ @@ -82,7 +82,7 @@ public final class DialogueResultOuterClass { } /** - * optional .ItemList item_result = 6; + * optional .ItemList item_result = 5; * @return whether the itemResult field is set */ public boolean hasItemResult() { @@ -90,7 +90,7 @@ public final class DialogueResultOuterClass { } /** - * optional .ItemList item_result = 6; + * optional .ItemList item_result = 5; * @return this */ public DialogueResult clearItemResult() { @@ -100,7 +100,7 @@ public final class DialogueResultOuterClass { } /** - * optional .ItemList item_result = 6; + * optional .ItemList item_result = 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. @@ -114,7 +114,7 @@ public final class DialogueResultOuterClass { } /** - * optional .ItemList item_result = 6; + * optional .ItemList item_result = 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 @@ -128,7 +128,7 @@ public final class DialogueResultOuterClass { } /** - * optional .ItemList item_result = 6; + * optional .ItemList item_result = 5; * @param value the itemResult to set * @return this */ @@ -139,39 +139,39 @@ public final class DialogueResultOuterClass { } /** - * repeated uint32 BLGIMDCNDHJ = 5; - * @return whether the bLGIMDCNDHJ field is set + * repeated uint32 event_ids = 15; + * @return whether the eventIds field is set */ - public boolean hasBLGIMDCNDHJ() { + public boolean hasEventIds() { return (bitField0_ & 0x00000004) != 0; } /** - * repeated uint32 BLGIMDCNDHJ = 5; + * repeated uint32 event_ids = 15; * @return this */ - public DialogueResult clearBLGIMDCNDHJ() { + public DialogueResult clearEventIds() { bitField0_ &= ~0x00000004; - bLGIMDCNDHJ.clear(); + eventIds.clear(); return this; } /** - * repeated uint32 BLGIMDCNDHJ = 5; + * repeated uint32 event_ids = 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 #getMutableBLGIMDCNDHJ()} if you want to modify it. + * Use {@link #getMutableEventIds()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getBLGIMDCNDHJ() { - return bLGIMDCNDHJ; + public RepeatedInt getEventIds() { + return eventIds; } /** - * repeated uint32 BLGIMDCNDHJ = 5; + * repeated uint32 event_ids = 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 @@ -179,30 +179,30 @@ public final class DialogueResultOuterClass { * * @return internal storage object for modifications */ - public RepeatedInt getMutableBLGIMDCNDHJ() { + public RepeatedInt getMutableEventIds() { bitField0_ |= 0x00000004; - return bLGIMDCNDHJ; + return eventIds; } /** - * repeated uint32 BLGIMDCNDHJ = 5; - * @param value the bLGIMDCNDHJ to add + * repeated uint32 event_ids = 15; + * @param value the eventIds to add * @return this */ - public DialogueResult addBLGIMDCNDHJ(final int value) { + public DialogueResult addEventIds(final int value) { bitField0_ |= 0x00000004; - bLGIMDCNDHJ.add(value); + eventIds.add(value); return this; } /** - * repeated uint32 BLGIMDCNDHJ = 5; - * @param values the bLGIMDCNDHJ to add + * repeated uint32 event_ids = 15; + * @param values the eventIds to add * @return this */ - public DialogueResult addAllBLGIMDCNDHJ(final int... values) { + public DialogueResult addAllEventIds(final int... values) { bitField0_ |= 0x00000004; - bLGIMDCNDHJ.addAll(values); + eventIds.addAll(values); return this; } @@ -213,7 +213,7 @@ public final class DialogueResultOuterClass { bitField0_ = other.bitField0_; hFHKBMGBJAN = other.hFHKBMGBJAN; itemResult.copyFrom(other.itemResult); - bLGIMDCNDHJ.copyFrom(other.bLGIMDCNDHJ); + eventIds.copyFrom(other.eventIds); } return this; } @@ -230,8 +230,8 @@ public final class DialogueResultOuterClass { if (other.hasItemResult()) { getMutableItemResult().mergeFrom(other.itemResult); } - if (other.hasBLGIMDCNDHJ()) { - getMutableBLGIMDCNDHJ().addAll(other.bLGIMDCNDHJ); + if (other.hasEventIds()) { + getMutableEventIds().addAll(other.eventIds); } return this; } @@ -245,7 +245,7 @@ public final class DialogueResultOuterClass { bitField0_ = 0; hFHKBMGBJAN = 0; itemResult.clear(); - bLGIMDCNDHJ.clear(); + eventIds.clear(); return this; } @@ -257,7 +257,7 @@ public final class DialogueResultOuterClass { cachedSize = -1; bitField0_ = 0; itemResult.clearQuick(); - bLGIMDCNDHJ.clear(); + eventIds.clear(); return this; } @@ -273,23 +273,23 @@ public final class DialogueResultOuterClass { return bitField0_ == other.bitField0_ && (!hasHFHKBMGBJAN() || hFHKBMGBJAN == other.hFHKBMGBJAN) && (!hasItemResult() || itemResult.equals(other.itemResult)) - && (!hasBLGIMDCNDHJ() || bLGIMDCNDHJ.equals(other.bLGIMDCNDHJ)); + && (!hasEventIds() || eventIds.equals(other.eventIds)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(hFHKBMGBJAN); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 42); output.writeMessageNoTag(itemResult); } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < bLGIMDCNDHJ.length(); i++) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(bLGIMDCNDHJ.array()[i]); + for (int i = 0; i < eventIds.length(); i++) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(eventIds.array()[i]); } } } @@ -304,7 +304,7 @@ public final class DialogueResultOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(itemResult); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * bLGIMDCNDHJ.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(bLGIMDCNDHJ); + size += (1 * eventIds.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(eventIds); } return size; } @@ -316,27 +316,27 @@ public final class DialogueResultOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 16: { // hFHKBMGBJAN hFHKBMGBJAN = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { - // itemResult - input.readMessage(itemResult); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 42) { break; } } case 42: { - // bLGIMDCNDHJ [packed=true] - input.readPackedUInt32(bLGIMDCNDHJ, tag); + // itemResult + input.readMessage(itemResult); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // eventIds [packed=true] + input.readPackedUInt32(eventIds, tag); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -353,9 +353,9 @@ public final class DialogueResultOuterClass { tag = input.readTag(); break; } - case 40: { - // bLGIMDCNDHJ [packed=false] - tag = input.readRepeatedUInt32(bLGIMDCNDHJ, tag); + case 120: { + // eventIds [packed=false] + tag = input.readRepeatedUInt32(eventIds, tag); bitField0_ |= 0x00000004; break; } @@ -373,7 +373,7 @@ public final class DialogueResultOuterClass { output.writeMessage(FieldNames.itemResult, itemResult); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.bLGIMDCNDHJ, bLGIMDCNDHJ); + output.writeRepeatedUInt32(FieldNames.eventIds, eventIds); } output.endObject(); } @@ -408,10 +408,11 @@ public final class DialogueResultOuterClass { } break; } - case 135413912: { - if (input.isAtField(FieldNames.bLGIMDCNDHJ)) { + case 278097342: + case 31742867: { + if (input.isAtField(FieldNames.eventIds)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(bLGIMDCNDHJ); + input.readRepeatedUInt32(eventIds); bitField0_ |= 0x00000004; } } else { @@ -476,7 +477,7 @@ public final class DialogueResultOuterClass { static final FieldName itemResult = FieldName.forField("itemResult", "item_result"); - static final FieldName bLGIMDCNDHJ = FieldName.forField("BLGIMDCNDHJ"); + static final FieldName eventIds = FieldName.forField("eventIds", "event_ids"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java index 7067200..67c4fca 100644 --- a/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class DiscardRelicCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 relic_unique_id = 13; + * optional uint32 relic_unique_id = 14; */ private int relicUniqueId; /** - * optional bool is_discard = 1; + * optional bool is_discard = 3; */ private boolean isDiscard; @@ -39,7 +39,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 13; + * optional uint32 relic_unique_id = 14; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -47,7 +47,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 13; + * optional uint32 relic_unique_id = 14; * @return this */ public DiscardRelicCsReq clearRelicUniqueId() { @@ -57,7 +57,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 13; + * optional uint32 relic_unique_id = 14; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -65,7 +65,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 13; + * optional uint32 relic_unique_id = 14; * @param value the relicUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional bool is_discard = 1; + * optional bool is_discard = 3; * @return whether the isDiscard field is set */ public boolean hasIsDiscard() { @@ -84,7 +84,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional bool is_discard = 1; + * optional bool is_discard = 3; * @return this */ public DiscardRelicCsReq clearIsDiscard() { @@ -94,7 +94,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional bool is_discard = 1; + * optional bool is_discard = 3; * @return the isDiscard */ public boolean getIsDiscard() { @@ -102,7 +102,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional bool is_discard = 1; + * optional bool is_discard = 3; * @param value the isDiscard to set * @return this */ @@ -177,11 +177,11 @@ public final class DiscardRelicCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 24); output.writeBoolNoTag(isDiscard); } } @@ -205,16 +205,16 @@ public final class DiscardRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 112: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 24) { break; } } - case 8: { + case 24: { // isDiscard isDiscard = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java index 2d58382..f7f0a80 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java @@ -19,12 +19,12 @@ public final class DisplayAvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 pos = 10; + * optional uint32 pos = 2; */ private int pos; /** - * optional uint32 avatar_id = 14; + * optional uint32 avatar_id = 13; */ private int avatarId; @@ -39,7 +39,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 pos = 10; + * optional uint32 pos = 2; * @return whether the pos field is set */ public boolean hasPos() { @@ -47,7 +47,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 pos = 10; + * optional uint32 pos = 2; * @return this */ public DisplayAvatar clearPos() { @@ -57,7 +57,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 pos = 10; + * optional uint32 pos = 2; * @return the pos */ public int getPos() { @@ -65,7 +65,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 pos = 10; + * optional uint32 pos = 2; * @param value the pos to set * @return this */ @@ -76,7 +76,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 avatar_id = 14; + * optional uint32 avatar_id = 13; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -84,7 +84,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 avatar_id = 14; + * optional uint32 avatar_id = 13; * @return this */ public DisplayAvatar clearAvatarId() { @@ -94,7 +94,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 avatar_id = 14; + * optional uint32 avatar_id = 13; * @return the avatarId */ public int getAvatarId() { @@ -102,7 +102,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 avatar_id = 14; + * optional uint32 avatar_id = 13; * @param value the avatarId to set * @return this */ @@ -177,11 +177,11 @@ public final class DisplayAvatarOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(pos); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(avatarId); } } @@ -205,16 +205,16 @@ public final class DisplayAvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 16: { // pos pos = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { + case 104: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java index 10ab331..fad5bc0 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java @@ -20,7 +20,7 @@ public final class DisplayAvatarVecOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool is_display = 3; + * optional bool is_display = 2; */ private boolean isDisplay; @@ -40,7 +40,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 3; + * optional bool is_display = 2; * @return whether the isDisplay field is set */ public boolean hasIsDisplay() { @@ -48,7 +48,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 3; + * optional bool is_display = 2; * @return this */ public DisplayAvatarVec clearIsDisplay() { @@ -58,7 +58,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 3; + * optional bool is_display = 2; * @return the isDisplay */ public boolean getIsDisplay() { @@ -66,7 +66,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 3; + * optional bool is_display = 2; * @param value the isDisplay to set * @return this */ @@ -212,7 +212,7 @@ public final class DisplayAvatarVecOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeBoolNoTag(isDisplay); } if ((bitField0_ & 0x00000002) != 0) { @@ -242,7 +242,7 @@ public final class DisplayAvatarVecOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 16: { // isDisplay isDisplay = input.readBool(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java index f7f9456..3531850 100644 --- a/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java @@ -19,25 +19,25 @@ public final class DoGachaCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 gacha_random = 3; - */ - private int gachaRandom; - - /** - * optional uint32 gacha_id = 5; + * optional uint32 gacha_id = 4; */ private int gachaId; /** - * optional uint32 gacha_num = 6; - */ - private int gachaNum; - - /** - * optional uint32 simulate_magic = 15; + * optional uint32 simulate_magic = 7; */ private int simulateMagic; + /** + * optional uint32 gacha_random = 11; + */ + private int gachaRandom; + + /** + * optional uint32 gacha_num = 12; + */ + private int gachaNum; + private DoGachaCsReq() { } @@ -49,62 +49,25 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 gacha_random = 3; - * @return whether the gachaRandom field is set + * optional uint32 gacha_id = 4; + * @return whether the gachaId field is set */ - public boolean hasGachaRandom() { + public boolean hasGachaId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 gacha_random = 3; - * @return this - */ - public DoGachaCsReq clearGachaRandom() { - bitField0_ &= ~0x00000001; - gachaRandom = 0; - return this; - } - - /** - * optional uint32 gacha_random = 3; - * @return the gachaRandom - */ - public int getGachaRandom() { - return gachaRandom; - } - - /** - * optional uint32 gacha_random = 3; - * @param value the gachaRandom to set - * @return this - */ - public DoGachaCsReq setGachaRandom(final int value) { - bitField0_ |= 0x00000001; - gachaRandom = value; - return this; - } - - /** - * optional uint32 gacha_id = 5; - * @return whether the gachaId field is set - */ - public boolean hasGachaId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 gacha_id = 5; + * optional uint32 gacha_id = 4; * @return this */ public DoGachaCsReq clearGachaId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; gachaId = 0; return this; } /** - * optional uint32 gacha_id = 5; + * optional uint32 gacha_id = 4; * @return the gachaId */ public int getGachaId() { @@ -112,73 +75,36 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 gacha_id = 5; + * optional uint32 gacha_id = 4; * @param value the gachaId to set * @return this */ public DoGachaCsReq setGachaId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; gachaId = value; return this; } /** - * optional uint32 gacha_num = 6; - * @return whether the gachaNum field is set - */ - public boolean hasGachaNum() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 gacha_num = 6; - * @return this - */ - public DoGachaCsReq clearGachaNum() { - bitField0_ &= ~0x00000004; - 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_ |= 0x00000004; - gachaNum = value; - return this; - } - - /** - * optional uint32 simulate_magic = 15; + * optional uint32 simulate_magic = 7; * @return whether the simulateMagic field is set */ public boolean hasSimulateMagic() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 simulate_magic = 15; + * optional uint32 simulate_magic = 7; * @return this */ public DoGachaCsReq clearSimulateMagic() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; simulateMagic = 0; return this; } /** - * optional uint32 simulate_magic = 15; + * optional uint32 simulate_magic = 7; * @return the simulateMagic */ public int getSimulateMagic() { @@ -186,25 +112,99 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 simulate_magic = 15; + * optional uint32 simulate_magic = 7; * @param value the simulateMagic to set * @return this */ public DoGachaCsReq setSimulateMagic(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; simulateMagic = value; return this; } + /** + * optional uint32 gacha_random = 11; + * @return whether the gachaRandom field is set + */ + public boolean hasGachaRandom() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 gacha_random = 11; + * @return this + */ + public DoGachaCsReq clearGachaRandom() { + bitField0_ &= ~0x00000004; + gachaRandom = 0; + return this; + } + + /** + * optional uint32 gacha_random = 11; + * @return the gachaRandom + */ + public int getGachaRandom() { + return gachaRandom; + } + + /** + * optional uint32 gacha_random = 11; + * @param value the gachaRandom to set + * @return this + */ + public DoGachaCsReq setGachaRandom(final int value) { + bitField0_ |= 0x00000004; + gachaRandom = value; + return this; + } + + /** + * optional uint32 gacha_num = 12; + * @return whether the gachaNum field is set + */ + public boolean hasGachaNum() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 gacha_num = 12; + * @return this + */ + public DoGachaCsReq clearGachaNum() { + bitField0_ &= ~0x00000008; + gachaNum = 0; + return this; + } + + /** + * optional uint32 gacha_num = 12; + * @return the gachaNum + */ + public int getGachaNum() { + return gachaNum; + } + + /** + * optional uint32 gacha_num = 12; + * @param value the gachaNum to set + * @return this + */ + public DoGachaCsReq setGachaNum(final int value) { + bitField0_ |= 0x00000008; + gachaNum = value; + return this; + } + @Override public DoGachaCsReq copyFrom(final DoGachaCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - gachaRandom = other.gachaRandom; gachaId = other.gachaId; - gachaNum = other.gachaNum; simulateMagic = other.simulateMagic; + gachaRandom = other.gachaRandom; + gachaNum = other.gachaNum; } return this; } @@ -215,18 +215,18 @@ public final class DoGachaCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasGachaRandom()) { - setGachaRandom(other.gachaRandom); - } if (other.hasGachaId()) { setGachaId(other.gachaId); } - if (other.hasGachaNum()) { - setGachaNum(other.gachaNum); - } if (other.hasSimulateMagic()) { setSimulateMagic(other.simulateMagic); } + if (other.hasGachaRandom()) { + setGachaRandom(other.gachaRandom); + } + if (other.hasGachaNum()) { + setGachaNum(other.gachaNum); + } return this; } @@ -237,10 +237,10 @@ public final class DoGachaCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - gachaRandom = 0; gachaId = 0; - gachaNum = 0; simulateMagic = 0; + gachaRandom = 0; + gachaNum = 0; return this; } @@ -264,29 +264,29 @@ public final class DoGachaCsReqOuterClass { } DoGachaCsReq other = (DoGachaCsReq) o; return bitField0_ == other.bitField0_ - && (!hasGachaRandom() || gachaRandom == other.gachaRandom) && (!hasGachaId() || gachaId == other.gachaId) - && (!hasGachaNum() || gachaNum == other.gachaNum) - && (!hasSimulateMagic() || simulateMagic == other.simulateMagic); + && (!hasSimulateMagic() || simulateMagic == other.simulateMagic) + && (!hasGachaRandom() || gachaRandom == other.gachaRandom) + && (!hasGachaNum() || gachaNum == other.gachaNum); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(gachaRandom); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(gachaId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(simulateMagic); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(gachaNum); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(gachaRandom); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(simulateMagic); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(gachaNum); } } @@ -294,16 +294,16 @@ public final class DoGachaCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(simulateMagic); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(simulateMagic); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); } return size; } @@ -315,36 +315,36 @@ public final class DoGachaCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // gachaRandom - gachaRandom = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { + case 32: { // gachaId gachaId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 56) { break; } } - case 48: { - // gachaNum - gachaNum = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 56: { // simulateMagic simulateMagic = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // gachaRandom + gachaRandom = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // gachaNum + gachaNum = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public final class DoGachaCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.gachaRandom, gachaRandom); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.gachaId, gachaId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.simulateMagic, simulateMagic); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.gachaNum, gachaNum); + output.writeUInt32(FieldNames.gachaRandom, gachaRandom); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.simulateMagic, simulateMagic); + output.writeUInt32(FieldNames.gachaNum, gachaNum); } output.endObject(); } @@ -390,36 +390,12 @@ public final class DoGachaCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1635961627: - case -47579616: { - if (input.isAtField(FieldNames.gachaRandom)) { - if (!input.trySkipNullValue()) { - gachaRandom = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } 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 -2052317532: - case 803166025: { - if (input.isAtField(FieldNames.gachaNum)) { - if (!input.trySkipNullValue()) { - gachaNum = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -431,6 +407,30 @@ public final class DoGachaCsReqOuterClass { if (input.isAtField(FieldNames.simulateMagic)) { if (!input.trySkipNullValue()) { simulateMagic = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1635961627: + case -47579616: { + if (input.isAtField(FieldNames.gachaRandom)) { + if (!input.trySkipNullValue()) { + gachaRandom = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -2052317532: + case 803166025: { + if (input.isAtField(FieldNames.gachaNum)) { + if (!input.trySkipNullValue()) { + gachaNum = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -490,13 +490,13 @@ public final class DoGachaCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); - static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); - static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num"); - static final FieldName simulateMagic = FieldName.forField("simulateMagic", "simulate_magic"); + + static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); + + static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java index 82fd922..0873abd 100644 --- a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java @@ -20,27 +20,27 @@ public final class DoGachaScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 gacha_num = 2; - */ - private int gachaNum; - - /** - * optional uint32 ceiling_num = 9; - */ - private int ceilingNum; - - /** - * optional uint32 retcode = 12; - */ - private int retcode; - - /** - * optional uint32 gacha_id = 13; + * optional uint32 gacha_id = 3; */ private int gachaId; /** - * repeated .GachaItem gacha_item_list = 3; + * optional uint32 retcode = 4; + */ + private int retcode; + + /** + * optional uint32 gacha_num = 12; + */ + private int gachaNum; + + /** + * optional uint32 ceiling_num = 15; + */ + private int ceilingNum; + + /** + * repeated .GachaItem gacha_item_list = 5; */ private final RepeatedMessage gachaItemList = RepeatedMessage.newEmptyInstance(GachaItemOuterClass.GachaItem.getFactory()); @@ -55,136 +55,25 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 gacha_num = 2; - * @return whether the gachaNum field is set + * optional uint32 gacha_id = 3; + * @return whether the gachaId field is set */ - public boolean hasGachaNum() { + public boolean hasGachaId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 gacha_num = 2; - * @return this - */ - public DoGachaScRsp clearGachaNum() { - bitField0_ &= ~0x00000001; - gachaNum = 0; - return this; - } - - /** - * optional uint32 gacha_num = 2; - * @return the gachaNum - */ - public int getGachaNum() { - return gachaNum; - } - - /** - * optional uint32 gacha_num = 2; - * @param value the gachaNum to set - * @return this - */ - public DoGachaScRsp setGachaNum(final int value) { - bitField0_ |= 0x00000001; - gachaNum = value; - return this; - } - - /** - * optional uint32 ceiling_num = 9; - * @return whether the ceilingNum field is set - */ - public boolean hasCeilingNum() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 ceiling_num = 9; - * @return this - */ - public DoGachaScRsp clearCeilingNum() { - bitField0_ &= ~0x00000002; - ceilingNum = 0; - return this; - } - - /** - * optional uint32 ceiling_num = 9; - * @return the ceilingNum - */ - public int getCeilingNum() { - return ceilingNum; - } - - /** - * optional uint32 ceiling_num = 9; - * @param value the ceilingNum to set - * @return this - */ - public DoGachaScRsp setCeilingNum(final int value) { - bitField0_ |= 0x00000002; - ceilingNum = value; - return this; - } - - /** - * optional uint32 retcode = 12; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 retcode = 12; - * @return this - */ - public DoGachaScRsp clearRetcode() { - bitField0_ &= ~0x00000004; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 12; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 12; - * @param value the retcode to set - * @return this - */ - public DoGachaScRsp setRetcode(final int value) { - bitField0_ |= 0x00000004; - retcode = value; - return this; - } - - /** - * optional uint32 gacha_id = 13; - * @return whether the gachaId field is set - */ - public boolean hasGachaId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 gacha_id = 13; + * optional uint32 gacha_id = 3; * @return this */ public DoGachaScRsp clearGachaId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; gachaId = 0; return this; } /** - * optional uint32 gacha_id = 13; + * optional uint32 gacha_id = 3; * @return the gachaId */ public int getGachaId() { @@ -192,18 +81,129 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 gacha_id = 13; + * optional uint32 gacha_id = 3; * @param value the gachaId to set * @return this */ public DoGachaScRsp setGachaId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; gachaId = value; return this; } /** - * repeated .GachaItem gacha_item_list = 3; + * optional uint32 retcode = 4; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 4; + * @return this + */ + public DoGachaScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + 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_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional uint32 gacha_num = 12; + * @return whether the gachaNum field is set + */ + public boolean hasGachaNum() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 gacha_num = 12; + * @return this + */ + public DoGachaScRsp clearGachaNum() { + bitField0_ &= ~0x00000004; + gachaNum = 0; + return this; + } + + /** + * optional uint32 gacha_num = 12; + * @return the gachaNum + */ + public int getGachaNum() { + return gachaNum; + } + + /** + * optional uint32 gacha_num = 12; + * @param value the gachaNum to set + * @return this + */ + public DoGachaScRsp setGachaNum(final int value) { + bitField0_ |= 0x00000004; + gachaNum = value; + return this; + } + + /** + * optional uint32 ceiling_num = 15; + * @return whether the ceilingNum field is set + */ + public boolean hasCeilingNum() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 ceiling_num = 15; + * @return this + */ + public DoGachaScRsp clearCeilingNum() { + bitField0_ &= ~0x00000008; + ceilingNum = 0; + return this; + } + + /** + * optional uint32 ceiling_num = 15; + * @return the ceilingNum + */ + public int getCeilingNum() { + return ceilingNum; + } + + /** + * optional uint32 ceiling_num = 15; + * @param value the ceilingNum to set + * @return this + */ + public DoGachaScRsp setCeilingNum(final int value) { + bitField0_ |= 0x00000008; + ceilingNum = value; + return this; + } + + /** + * repeated .GachaItem gacha_item_list = 5; * @return whether the gachaItemList field is set */ public boolean hasGachaItemList() { @@ -211,7 +211,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 3; + * repeated .GachaItem gacha_item_list = 5; * @return this */ public DoGachaScRsp clearGachaItemList() { @@ -221,7 +221,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 3; + * repeated .GachaItem gacha_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. @@ -235,7 +235,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 3; + * repeated .GachaItem gacha_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 @@ -249,7 +249,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 3; + * repeated .GachaItem gacha_item_list = 5; * @param value the gachaItemList to add * @return this */ @@ -260,7 +260,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 3; + * repeated .GachaItem gacha_item_list = 5; * @param values the gachaItemList to add * @return this */ @@ -275,10 +275,10 @@ public final class DoGachaScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + gachaId = other.gachaId; + retcode = other.retcode; gachaNum = other.gachaNum; ceilingNum = other.ceilingNum; - retcode = other.retcode; - gachaId = other.gachaId; gachaItemList.copyFrom(other.gachaItemList); } return this; @@ -290,18 +290,18 @@ public final class DoGachaScRspOuterClass { return this; } cachedSize = -1; + if (other.hasGachaId()) { + setGachaId(other.gachaId); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasGachaNum()) { setGachaNum(other.gachaNum); } if (other.hasCeilingNum()) { setCeilingNum(other.ceilingNum); } - if (other.hasRetcode()) { - setRetcode(other.retcode); - } - if (other.hasGachaId()) { - setGachaId(other.gachaId); - } if (other.hasGachaItemList()) { getMutableGachaItemList().addAll(other.gachaItemList); } @@ -315,10 +315,10 @@ public final class DoGachaScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + gachaId = 0; + retcode = 0; gachaNum = 0; ceilingNum = 0; - retcode = 0; - gachaId = 0; gachaItemList.clear(); return this; } @@ -344,34 +344,34 @@ public final class DoGachaScRspOuterClass { } DoGachaScRsp other = (DoGachaScRsp) o; return bitField0_ == other.bitField0_ + && (!hasGachaId() || gachaId == other.gachaId) + && (!hasRetcode() || retcode == other.retcode) && (!hasGachaNum() || gachaNum == other.gachaNum) && (!hasCeilingNum() || ceilingNum == other.ceilingNum) - && (!hasRetcode() || retcode == other.retcode) - && (!hasGachaId() || gachaId == other.gachaId) && (!hasGachaItemList() || gachaItemList.equals(other.gachaItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(gachaNum); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(gachaId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(ceilingNum); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(retcode); + output.writeUInt32NoTag(gachaNum); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(gachaId); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(ceilingNum); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < gachaItemList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 42); output.writeMessageNoTag(gachaItemList.get(i)); } } @@ -381,16 +381,16 @@ public final class DoGachaScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(ceilingNum); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); + } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(ceilingNum); } if ((bitField0_ & 0x00000010) != 0) { size += (1 * gachaItemList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(gachaItemList); @@ -405,18 +405,18 @@ public final class DoGachaScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // gachaNum - gachaNum = input.readUInt32(); + case 24: { + // gachaId + gachaId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 32) { break; } } - case 72: { - // ceilingNum - ceilingNum = input.readUInt32(); + case 32: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 96) { @@ -424,24 +424,24 @@ public final class DoGachaScRspOuterClass { } } case 96: { - // retcode - retcode = input.readUInt32(); + // gachaNum + gachaNum = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 120) { break; } } - case 104: { - // gachaId - gachaId = input.readUInt32(); + case 120: { + // ceilingNum + ceilingNum = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 26) { + if (tag != 42) { break; } } - case 26: { + case 42: { // gachaItemList tag = input.readRepeatedMessage(gachaItemList, tag); bitField0_ |= 0x00000010; @@ -467,16 +467,16 @@ public final class DoGachaScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.gachaNum, gachaNum); + output.writeUInt32(FieldNames.gachaId, gachaId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.ceilingNum, ceilingNum); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.gachaNum, gachaNum); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.gachaId, gachaId); + output.writeUInt32(FieldNames.ceilingNum, ceilingNum); } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedMessage(FieldNames.gachaItemList, gachaItemList); @@ -491,12 +491,35 @@ public final class DoGachaScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -204751299: + case -2052301576: { + if (input.isAtField(FieldNames.gachaId)) { + if (!input.trySkipNullValue()) { + gachaId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case -2052317532: case 803166025: { if (input.isAtField(FieldNames.gachaNum)) { if (!input.trySkipNullValue()) { gachaNum = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -508,29 +531,6 @@ public final class DoGachaScRspOuterClass { if (input.isAtField(FieldNames.ceilingNum)) { if (!input.trySkipNullValue()) { ceilingNum = 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; - } - case -204751299: - case -2052301576: { - if (input.isAtField(FieldNames.gachaId)) { - if (!input.trySkipNullValue()) { - gachaId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -602,13 +602,13 @@ public final class DoGachaScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num"); - - static final FieldName ceilingNum = FieldName.forField("ceilingNum", "ceiling_num"); + static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); + static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num"); + + static final FieldName ceilingNum = FieldName.forField("ceilingNum", "ceiling_num"); static final FieldName gachaItemList = FieldName.forField("gachaItemList", "gacha_item_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java index 5033518..2012854 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 equipment_unique_id = 1; + * optional uint32 equipment_unique_id = 6; */ private int equipmentUniqueId; /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 9; */ private int baseAvatarId; @@ -39,7 +39,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 1; + * optional uint32 equipment_unique_id = 6; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 1; + * optional uint32 equipment_unique_id = 6; * @return this */ public DressAvatarCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 1; + * optional uint32 equipment_unique_id = 6; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 1; + * optional uint32 equipment_unique_id = 6; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 9; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -84,7 +84,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 9; * @return this */ public DressAvatarCsReq clearBaseAvatarId() { @@ -94,7 +94,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 9; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -102,7 +102,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 9; * @param value the baseAvatarId 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) 8); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(baseAvatarId); } } @@ -205,16 +205,16 @@ public final class DressAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 48: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 72) { break; } } - case 80: { + case 72: { // baseAvatarId baseAvatarId = 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 2bbe589..fc2fa47 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 base_avatar_id = 3; + * optional uint32 base_avatar_id = 12; */ private int baseAvatarId; /** - * repeated .RelicParam param_list = 10; + * repeated .RelicParam param_list = 11; */ private final RepeatedMessage paramList = RepeatedMessage.newEmptyInstance(RelicParamOuterClass.RelicParam.getFactory()); @@ -40,7 +40,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 3; + * optional uint32 base_avatar_id = 12; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -48,7 +48,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 3; + * optional uint32 base_avatar_id = 12; * @return this */ public DressRelicAvatarCsReq clearBaseAvatarId() { @@ -58,7 +58,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 3; + * optional uint32 base_avatar_id = 12; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -66,7 +66,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 3; + * optional uint32 base_avatar_id = 12; * @param value the baseAvatarId to set * @return this */ @@ -77,7 +77,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 10; + * repeated .RelicParam param_list = 11; * @return whether the paramList field is set */ public boolean hasParamList() { @@ -85,7 +85,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 10; + * repeated .RelicParam param_list = 11; * @return this */ public DressRelicAvatarCsReq clearParamList() { @@ -95,7 +95,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 10; + * repeated .RelicParam param_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 DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 10; + * repeated .RelicParam param_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 DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 10; + * repeated .RelicParam param_list = 11; * @param value the paramList to add * @return this */ @@ -134,7 +134,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 10; + * repeated .RelicParam param_list = 11; * @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) 24); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < paramList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 90); output.writeMessageNoTag(paramList.get(i)); } } @@ -240,16 +240,16 @@ public final class DressRelicAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 96: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 90) { break; } } - case 82: { + case 90: { // 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 d130314..911d797 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 = 3; + * optional uint32 talent_id = 7; */ private int talentId; @@ -34,7 +34,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 3; + * optional uint32 talent_id = 7; * @return whether the talentId field is set */ public boolean hasTalentId() { @@ -42,7 +42,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 3; + * optional uint32 talent_id = 7; * @return this */ public EnableRogueTalentCsReq clearTalentId() { @@ -52,7 +52,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 3; + * optional uint32 talent_id = 7; * @return the talentId */ public int getTalentId() { @@ -60,7 +60,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 3; + * optional uint32 talent_id = 7; * @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) 24); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(talentId); } } @@ -150,7 +150,7 @@ public final class EnableRogueTalentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 56: { // 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 f311b8f..b4466ff 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 = 14; + * optional uint32 retcode = 15; */ private int retcode; /** - * optional .RogueTalentInfo talent_info = 6; + * optional .RogueTalentInfo talent_info = 11; */ private final RogueTalentInfoOuterClass.RogueTalentInfo talentInfo = RogueTalentInfoOuterClass.RogueTalentInfo.newInstance(); @@ -39,7 +39,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @return this */ public EnableRogueTalentScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 6; + * optional .RogueTalentInfo talent_info = 11; * @return whether the talentInfo field is set */ public boolean hasTalentInfo() { @@ -84,7 +84,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 6; + * optional .RogueTalentInfo talent_info = 11; * @return this */ public EnableRogueTalentScRsp clearTalentInfo() { @@ -94,7 +94,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 6; + * optional .RogueTalentInfo talent_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 EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 6; + * optional .RogueTalentInfo talent_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 EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 6; + * optional .RogueTalentInfo talent_info = 11; * @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) 112); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 90); output.writeMessageNoTag(talentInfo); } } @@ -227,16 +227,16 @@ public final class EnableRogueTalentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 90) { break; } } - case 50: { + case 90: { // talentInfo input.readMessage(talentInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java index 0cdb40b..3dd92be 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 = 12; + * optional .MotionInfo motion = 4; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -34,7 +34,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 4; * @return whether the motion field is set */ public boolean hasMotion() { @@ -42,7 +42,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 4; * @return this */ public EnterMapRotationRegionCsReq clearMotion() { @@ -52,7 +52,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 4; * @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) 98); + output.writeRawByte((byte) 34); output.writeMessageNoTag(motion); } } @@ -171,7 +171,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 98: { + case 34: { // 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 e1df4ed..92b2ea2 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java @@ -19,17 +19,17 @@ public final class EnterMapRotationRegionScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 client_pos_version = 1; - */ - private int clientPosVersion; - - /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional .MotionInfo motion = 10; + * optional uint32 client_pos_version = 15; + */ + private int clientPosVersion; + + /** + * optional .MotionInfo motion = 4; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -44,62 +44,25 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 client_pos_version = 1; - * @return whether the clientPosVersion field is set + * optional uint32 retcode = 2; + * @return whether the retcode field is set */ - public boolean hasClientPosVersion() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 client_pos_version = 1; - * @return this - */ - public EnterMapRotationRegionScRsp clearClientPosVersion() { - bitField0_ &= ~0x00000001; - clientPosVersion = 0; - return this; - } - - /** - * optional uint32 client_pos_version = 1; - * @return the clientPosVersion - */ - public int getClientPosVersion() { - return clientPosVersion; - } - - /** - * optional uint32 client_pos_version = 1; - * @param value the clientPosVersion to set - * @return this - */ - public EnterMapRotationRegionScRsp setClientPosVersion(final int value) { - bitField0_ |= 0x00000001; - clientPosVersion = value; - return this; - } - - /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 2; * @return this */ public EnterMapRotationRegionScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -107,18 +70,55 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ public EnterMapRotationRegionScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional .MotionInfo motion = 10; + * optional uint32 client_pos_version = 15; + * @return whether the clientPosVersion field is set + */ + public boolean hasClientPosVersion() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 client_pos_version = 15; + * @return this + */ + public EnterMapRotationRegionScRsp clearClientPosVersion() { + bitField0_ &= ~0x00000002; + clientPosVersion = 0; + return this; + } + + /** + * optional uint32 client_pos_version = 15; + * @return the clientPosVersion + */ + public int getClientPosVersion() { + return clientPosVersion; + } + + /** + * optional uint32 client_pos_version = 15; + * @param value the clientPosVersion to set + * @return this + */ + public EnterMapRotationRegionScRsp setClientPosVersion(final int value) { + bitField0_ |= 0x00000002; + clientPosVersion = value; + return this; + } + + /** + * optional .MotionInfo motion = 4; * @return whether the motion field is set */ public boolean hasMotion() { @@ -126,7 +126,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional .MotionInfo motion = 10; + * optional .MotionInfo motion = 4; * @return this */ public EnterMapRotationRegionScRsp clearMotion() { @@ -136,7 +136,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional .MotionInfo motion = 10; + * 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 EnterMapRotationRegionScRspOuterClass { } /** - * optional .MotionInfo motion = 10; + * 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 EnterMapRotationRegionScRspOuterClass { } /** - * optional .MotionInfo motion = 10; + * optional .MotionInfo motion = 4; * @param value the motion to set * @return this */ @@ -179,8 +179,8 @@ public final class EnterMapRotationRegionScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - clientPosVersion = other.clientPosVersion; retcode = other.retcode; + clientPosVersion = other.clientPosVersion; motion.copyFrom(other.motion); } return this; @@ -192,12 +192,12 @@ public final class EnterMapRotationRegionScRspOuterClass { return this; } cachedSize = -1; - if (other.hasClientPosVersion()) { - setClientPosVersion(other.clientPosVersion); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasClientPosVersion()) { + setClientPosVersion(other.clientPosVersion); + } if (other.hasMotion()) { getMutableMotion().mergeFrom(other.motion); } @@ -211,8 +211,8 @@ public final class EnterMapRotationRegionScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - clientPosVersion = 0; retcode = 0; + clientPosVersion = 0; motion.clear(); return this; } @@ -238,23 +238,23 @@ public final class EnterMapRotationRegionScRspOuterClass { } EnterMapRotationRegionScRsp other = (EnterMapRotationRegionScRsp) o; return bitField0_ == other.bitField0_ - && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) && (!hasRetcode() || retcode == other.retcode) + && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) && (!hasMotion() || motion.equals(other.motion)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(clientPosVersion); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(clientPosVersion); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 34); output.writeMessageNoTag(motion); } } @@ -263,10 +263,10 @@ public final class EnterMapRotationRegionScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(motion); @@ -281,25 +281,25 @@ public final class EnterMapRotationRegionScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // clientPosVersion - clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { + case 16: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 120) { break; } } - case 82: { + case 120: { + // clientPosVersion + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 34) { + break; + } + } + case 34: { // motion input.readMessage(motion); bitField0_ |= 0x00000004; @@ -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.clientPosVersion, clientPosVersion); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.motion, motion); @@ -344,11 +344,10 @@ public final class EnterMapRotationRegionScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1787644431: - case 1278860153: { - if (input.isAtField(FieldNames.clientPosVersion)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - clientPosVersion = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -356,10 +355,11 @@ public final class EnterMapRotationRegionScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -432,10 +432,10 @@ public final class EnterMapRotationRegionScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + static final FieldName 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 9e281bc..56267a2 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class EnterRogueMapRoomCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 room_id = 2; + * optional uint32 room_id = 4; */ private int roomId; /** - * optional uint32 site_id = 5; + * optional uint32 site_id = 12; */ private int siteId; @@ -39,7 +39,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 room_id = 2; + * optional uint32 room_id = 4; * @return whether the roomId field is set */ public boolean hasRoomId() { @@ -47,7 +47,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 room_id = 2; + * optional uint32 room_id = 4; * @return this */ public EnterRogueMapRoomCsReq clearRoomId() { @@ -57,7 +57,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 room_id = 2; + * optional uint32 room_id = 4; * @return the roomId */ public int getRoomId() { @@ -65,7 +65,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 room_id = 2; + * optional uint32 room_id = 4; * @param value the roomId to set * @return this */ @@ -76,7 +76,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 site_id = 5; + * optional uint32 site_id = 12; * @return whether the siteId field is set */ public boolean hasSiteId() { @@ -84,7 +84,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 site_id = 5; + * optional uint32 site_id = 12; * @return this */ public EnterRogueMapRoomCsReq clearSiteId() { @@ -94,7 +94,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 site_id = 5; + * optional uint32 site_id = 12; * @return the siteId */ public int getSiteId() { @@ -102,7 +102,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 site_id = 5; + * optional uint32 site_id = 12; * @param value the siteId to set * @return this */ @@ -177,11 +177,11 @@ public final class EnterRogueMapRoomCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(roomId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(siteId); } } @@ -205,16 +205,16 @@ public final class EnterRogueMapRoomCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 32: { // roomId roomId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 96) { break; } } - case 40: { + case 96: { // siteId siteId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java index 35f4d35..34e5f66 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 cur_site_id = 2; + * optional uint32 cur_site_id = 1; */ private int curSiteId; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 5; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 10; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); @@ -49,7 +49,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional uint32 cur_site_id = 2; + * optional uint32 cur_site_id = 1; * @return whether the curSiteId field is set */ public boolean hasCurSiteId() { @@ -57,7 +57,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional uint32 cur_site_id = 2; + * optional uint32 cur_site_id = 1; * @return this */ public EnterRogueMapRoomScRsp clearCurSiteId() { @@ -67,7 +67,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional uint32 cur_site_id = 2; + * optional uint32 cur_site_id = 1; * @return the curSiteId */ public int getCurSiteId() { @@ -75,7 +75,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional uint32 cur_site_id = 2; + * optional uint32 cur_site_id = 1; * @param value the curSiteId to set * @return this */ @@ -86,7 +86,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -94,7 +94,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 6; * @return this */ public EnterRogueMapRoomScRsp clearRetcode() { @@ -104,7 +104,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -112,7 +112,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -123,7 +123,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 5; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -131,7 +131,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 5; * @return this */ public EnterRogueMapRoomScRsp clearLineup() { @@ -141,7 +141,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .LineupInfo lineup = 4; + * 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. @@ -155,7 +155,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .LineupInfo lineup = 4; + * 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 @@ -169,7 +169,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 5; * @param value the lineup to set * @return this */ @@ -180,7 +180,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 10; * @return whether the scene field is set */ public boolean hasScene() { @@ -188,7 +188,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 10; * @return this */ public EnterRogueMapRoomScRsp clearScene() { @@ -198,7 +198,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -212,7 +212,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -226,7 +226,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 10; * @param value the scene to set * @return this */ @@ -315,19 +315,19 @@ public final class EnterRogueMapRoomScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(curSiteId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 42); output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 82); output.writeMessageNoTag(scene); } } @@ -357,34 +357,34 @@ public final class EnterRogueMapRoomScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 8: { // curSiteId curSiteId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 48) { break; } } - case 40: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 34) { + if (tag != 42) { break; } } - case 34: { + case 42: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 58) { + if (tag != 82) { break; } } - case 58: { + case 82: { // scene input.readMessage(scene); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java index c0ce18f..5f5e3ed 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java @@ -24,12 +24,12 @@ public final class EnterSceneByServerScNotifyOuterClass { private int reason; /** - * optional .SceneInfo scene = 5; + * optional .SceneInfo scene = 4; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); /** - * optional .LineupInfo lineup = 6; + * optional .LineupInfo lineup = 11; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); @@ -107,7 +107,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 5; + * optional .SceneInfo scene = 4; * @return whether the scene field is set */ public boolean hasScene() { @@ -115,7 +115,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 5; + * optional .SceneInfo scene = 4; * @return this */ public EnterSceneByServerScNotify clearScene() { @@ -125,7 +125,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 5; + * optional .SceneInfo scene = 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. @@ -139,7 +139,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 5; + * optional .SceneInfo scene = 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 @@ -153,7 +153,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 5; + * optional .SceneInfo scene = 4; * @param value the scene to set * @return this */ @@ -164,7 +164,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 6; + * optional .LineupInfo lineup = 11; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -172,7 +172,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 6; + * optional .LineupInfo lineup = 11; * @return this */ public EnterSceneByServerScNotify clearLineup() { @@ -182,7 +182,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 6; + * optional .LineupInfo lineup = 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. @@ -196,7 +196,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 6; + * optional .LineupInfo lineup = 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 @@ -210,7 +210,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 6; + * optional .LineupInfo lineup = 11; * @param value the lineup to set * @return this */ @@ -297,11 +297,11 @@ public final class EnterSceneByServerScNotifyOuterClass { output.writeEnumNoTag(reason); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 34); output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 90); output.writeMessageNoTag(lineup); } } @@ -336,20 +336,20 @@ public final class EnterSceneByServerScNotifyOuterClass { bitField0_ |= 0x00000001; } tag = input.readTag(); - if (tag != 42) { + if (tag != 34) { break; } } - case 42: { + case 34: { // scene input.readMessage(scene); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 50) { + if (tag != 90) { break; } } - case 50: { + case 90: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java index f8111fa..a57eca9 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 = 1; + * optional uint32 entry_id = 2; */ private int entryId; /** - * optional uint32 teleport_id = 14; + * optional uint32 teleport_id = 8; */ private int teleportId; @@ -39,7 +39,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 entry_id = 1; + * optional uint32 entry_id = 2; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -47,7 +47,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 entry_id = 1; + * optional uint32 entry_id = 2; * @return this */ public EnterSceneCsReq clearEntryId() { @@ -57,7 +57,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 entry_id = 1; + * optional uint32 entry_id = 2; * @return the entryId */ public int getEntryId() { @@ -65,7 +65,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 entry_id = 1; + * optional uint32 entry_id = 2; * @param value the entryId to set * @return this */ @@ -76,7 +76,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 teleport_id = 14; + * optional uint32 teleport_id = 8; * @return whether the teleportId field is set */ public boolean hasTeleportId() { @@ -84,7 +84,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 teleport_id = 14; + * optional uint32 teleport_id = 8; * @return this */ public EnterSceneCsReq clearTeleportId() { @@ -94,7 +94,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 teleport_id = 14; + * optional uint32 teleport_id = 8; * @return the teleportId */ public int getTeleportId() { @@ -102,7 +102,7 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 teleport_id = 14; + * optional uint32 teleport_id = 8; * @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) 8); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(teleportId); } } @@ -205,16 +205,16 @@ public final class EnterSceneCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 16: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 64) { break; } } - case 112: { + case 64: { // teleportId teleportId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java index 8cb5f80..c0dd88f 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 floor_id = 4; - */ - private int floorId; - - /** - * optional uint32 plane_id = 12; + * optional uint32 plane_id = 9; */ private int planeId; + /** + * optional uint32 floor_id = 12; + */ + private int floorId; + private EnteredSceneInfo() { } @@ -39,62 +39,25 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 floor_id = 4; - * @return whether the floorId field is set + * optional uint32 plane_id = 9; + * @return whether the planeId field is set */ - public boolean hasFloorId() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 floor_id = 4; - * @return this - */ - public EnteredSceneInfo clearFloorId() { - bitField0_ &= ~0x00000001; - floorId = 0; - return this; - } - - /** - * optional uint32 floor_id = 4; - * @return the floorId - */ - public int getFloorId() { - return floorId; - } - - /** - * optional uint32 floor_id = 4; - * @param value the floorId to set - * @return this - */ - public EnteredSceneInfo setFloorId(final int value) { - 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; + * optional uint32 plane_id = 9; * @return this */ public EnteredSceneInfo clearPlaneId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; planeId = 0; return this; } /** - * optional uint32 plane_id = 12; + * optional uint32 plane_id = 9; * @return the planeId */ public int getPlaneId() { @@ -102,23 +65,60 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 plane_id = 12; + * optional uint32 plane_id = 9; * @param value the planeId to set * @return this */ public EnteredSceneInfo setPlaneId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; planeId = value; return this; } + /** + * optional uint32 floor_id = 12; + * @return whether the floorId field is set + */ + public boolean hasFloorId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 floor_id = 12; + * @return this + */ + public EnteredSceneInfo clearFloorId() { + bitField0_ &= ~0x00000002; + floorId = 0; + return this; + } + + /** + * optional uint32 floor_id = 12; + * @return the floorId + */ + public int getFloorId() { + return floorId; + } + + /** + * optional uint32 floor_id = 12; + * @param value the floorId to set + * @return this + */ + public EnteredSceneInfo setFloorId(final int value) { + bitField0_ |= 0x00000002; + floorId = value; + return this; + } + @Override public EnteredSceneInfo copyFrom(final EnteredSceneInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - floorId = other.floorId; planeId = other.planeId; + floorId = other.floorId; } return this; } @@ -129,12 +129,12 @@ public final class EnteredSceneInfoOuterClass { return this; } cachedSize = -1; - if (other.hasFloorId()) { - setFloorId(other.floorId); - } if (other.hasPlaneId()) { setPlaneId(other.planeId); } + if (other.hasFloorId()) { + setFloorId(other.floorId); + } return this; } @@ -145,8 +145,8 @@ public final class EnteredSceneInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - floorId = 0; planeId = 0; + floorId = 0; return this; } @@ -170,19 +170,19 @@ public final class EnteredSceneInfoOuterClass { } EnteredSceneInfo other = (EnteredSceneInfo) o; return bitField0_ == other.bitField0_ - && (!hasFloorId() || floorId == other.floorId) - && (!hasPlaneId() || planeId == other.planeId); + && (!hasPlaneId() || planeId == other.planeId) + && (!hasFloorId() || floorId == other.floorId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(floorId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(planeId); + output.writeUInt32NoTag(floorId); } } @@ -190,10 +190,10 @@ public final class EnteredSceneInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); } return size; } @@ -205,9 +205,9 @@ public final class EnteredSceneInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // floorId - floorId = input.readUInt32(); + case 72: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 96) { @@ -215,8 +215,8 @@ public final class EnteredSceneInfoOuterClass { } } case 96: { - // planeId - planeId = input.readUInt32(); + // floorId + floorId = 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.floorId, floorId); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.floorId, floorId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class EnteredSceneInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class EnteredSceneInfoOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class EnteredSceneInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName floorId = FieldName.forField("floorId", "floor_id"); - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); + + static final FieldName floorId = FieldName.forField("floorId", "floor_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java index 5a9a4d1..c2dad54 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 = 7; - */ - private int entityId; - - /** - * optional uint32 remove_buff_id = 12; + * optional uint32 remove_buff_id = 8; */ private int removeBuffId; /** - * optional .BuffInfo add_buff_info = 5; + * optional uint32 entity_id = 15; + */ + private int entityId; + + /** + * optional .BuffInfo add_buff_info = 2; */ private final BuffInfoOuterClass.BuffInfo addBuffInfo = BuffInfoOuterClass.BuffInfo.newInstance(); @@ -44,62 +44,25 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional uint32 entity_id = 7; - * @return whether the entityId field is set + * optional uint32 remove_buff_id = 8; + * @return whether the removeBuffId field is set */ - public boolean hasEntityId() { + public boolean hasRemoveBuffId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entity_id = 7; - * @return this - */ - public EntityBuffChangeInfo clearEntityId() { - bitField0_ &= ~0x00000001; - entityId = 0; - return this; - } - - /** - * optional uint32 entity_id = 7; - * @return the entityId - */ - public int getEntityId() { - return entityId; - } - - /** - * optional uint32 entity_id = 7; - * @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 = 12; - * @return whether the removeBuffId field is set - */ - public boolean hasRemoveBuffId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 remove_buff_id = 12; + * optional uint32 remove_buff_id = 8; * @return this */ public EntityBuffChangeInfo clearRemoveBuffId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; removeBuffId = 0; return this; } /** - * optional uint32 remove_buff_id = 12; + * optional uint32 remove_buff_id = 8; * @return the removeBuffId */ public int getRemoveBuffId() { @@ -107,18 +70,55 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional uint32 remove_buff_id = 12; + * optional uint32 remove_buff_id = 8; * @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 = 15; + * @return whether the entityId field is set + */ + public boolean hasEntityId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 entity_id = 15; + * @return this + */ + public EntityBuffChangeInfo 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 EntityBuffChangeInfo setEntityId(final int value) { + bitField0_ |= 0x00000002; + entityId = value; + return this; + } + + /** + * optional .BuffInfo add_buff_info = 2; * @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 = 2; * @return this */ public EntityBuffChangeInfo clearAddBuffInfo() { @@ -136,7 +136,7 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 5; + * optional .BuffInfo add_buff_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. @@ -150,7 +150,7 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 5; + * optional .BuffInfo add_buff_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 @@ -164,7 +164,7 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 5; + * optional .BuffInfo add_buff_info = 2; * @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) 56); - output.writeUInt32NoTag(entityId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(removeBuffId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(entityId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 18); 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 56: { - // entityId - entityId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 64: { // removeBuffId removeBuffId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 120) { break; } } - case 42: { + case 120: { + // entityId + entityId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { // 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/EntityBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java index 0e88c5d..b153d23 100644 --- a/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java @@ -20,12 +20,12 @@ public final class EntityBuffInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entity_id = 11; + * optional uint32 entity_id = 6; */ private int entityId; /** - * repeated .BuffInfo buff_list = 8; + * repeated .BuffInfo buff_list = 11; */ private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(BuffInfoOuterClass.BuffInfo.getFactory()); @@ -40,7 +40,7 @@ public final class EntityBuffInfoOuterClass { } /** - * optional uint32 entity_id = 11; + * optional uint32 entity_id = 6; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -48,7 +48,7 @@ public final class EntityBuffInfoOuterClass { } /** - * optional uint32 entity_id = 11; + * optional uint32 entity_id = 6; * @return this */ public EntityBuffInfo clearEntityId() { @@ -58,7 +58,7 @@ public final class EntityBuffInfoOuterClass { } /** - * optional uint32 entity_id = 11; + * optional uint32 entity_id = 6; * @return the entityId */ public int getEntityId() { @@ -66,7 +66,7 @@ public final class EntityBuffInfoOuterClass { } /** - * optional uint32 entity_id = 11; + * optional uint32 entity_id = 6; * @param value the entityId to set * @return this */ @@ -77,7 +77,7 @@ public final class EntityBuffInfoOuterClass { } /** - * repeated .BuffInfo buff_list = 8; + * repeated .BuffInfo buff_list = 11; * @return whether the buffList field is set */ public boolean hasBuffList() { @@ -85,7 +85,7 @@ public final class EntityBuffInfoOuterClass { } /** - * repeated .BuffInfo buff_list = 8; + * repeated .BuffInfo buff_list = 11; * @return this */ public EntityBuffInfo clearBuffList() { @@ -95,7 +95,7 @@ public final class EntityBuffInfoOuterClass { } /** - * repeated .BuffInfo buff_list = 8; + * repeated .BuffInfo buff_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 EntityBuffInfoOuterClass { } /** - * repeated .BuffInfo buff_list = 8; + * repeated .BuffInfo buff_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 EntityBuffInfoOuterClass { } /** - * repeated .BuffInfo buff_list = 8; + * repeated .BuffInfo buff_list = 11; * @param value the buffList to add * @return this */ @@ -134,7 +134,7 @@ public final class EntityBuffInfoOuterClass { } /** - * repeated .BuffInfo buff_list = 8; + * repeated .BuffInfo buff_list = 11; * @param values the buffList to add * @return this */ @@ -210,12 +210,12 @@ public final class EntityBuffInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 90); output.writeMessageNoTag(buffList.get(i)); } } @@ -240,16 +240,16 @@ public final class EntityBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 48: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 90) { break; } } - case 66: { + case 90: { // buffList tag = input.readRepeatedMessage(buffList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java index 6f62a97..6416d46 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 = 11; - */ - private int entityId; - - /** - * optional uint32 map_layer = 13; + * optional uint32 map_layer = 1; */ private int mapLayer; /** - * optional .MotionInfo motion = 3; + * optional uint32 entity_id = 2; + */ + private int entityId; + + /** + * optional .MotionInfo motion = 6; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -44,62 +44,25 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 entity_id = 11; - * @return whether the entityId field is set + * optional uint32 map_layer = 1; + * @return whether the mapLayer field is set */ - public boolean hasEntityId() { + public boolean hasMapLayer() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entity_id = 11; - * @return this - */ - public EntityMotion clearEntityId() { - bitField0_ &= ~0x00000001; - 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 EntityMotion setEntityId(final int value) { - bitField0_ |= 0x00000001; - entityId = value; - return this; - } - - /** - * optional uint32 map_layer = 13; - * @return whether the mapLayer field is set - */ - public boolean hasMapLayer() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 map_layer = 13; + * optional uint32 map_layer = 1; * @return this */ public EntityMotion clearMapLayer() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; mapLayer = 0; return this; } /** - * optional uint32 map_layer = 13; + * optional uint32 map_layer = 1; * @return the mapLayer */ public int getMapLayer() { @@ -107,18 +70,55 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 map_layer = 13; + * optional uint32 map_layer = 1; * @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 = 3; + * optional uint32 entity_id = 2; + * @return whether the entityId field is set + */ + public boolean hasEntityId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 entity_id = 2; + * @return this + */ + public EntityMotion clearEntityId() { + bitField0_ &= ~0x00000002; + entityId = 0; + return this; + } + + /** + * optional uint32 entity_id = 2; + * @return the entityId + */ + public int getEntityId() { + return entityId; + } + + /** + * optional uint32 entity_id = 2; + * @param value the entityId to set + * @return this + */ + public EntityMotion setEntityId(final int value) { + bitField0_ |= 0x00000002; + entityId = value; + return this; + } + + /** + * optional .MotionInfo motion = 6; * @return whether the motion field is set */ public boolean hasMotion() { @@ -126,7 +126,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 3; + * optional .MotionInfo motion = 6; * @return this */ public EntityMotion clearMotion() { @@ -136,7 +136,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 3; + * optional .MotionInfo motion = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 3; + * optional .MotionInfo motion = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 3; + * optional .MotionInfo motion = 6; * @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) 88); - output.writeUInt32NoTag(entityId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(mapLayer); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(entityId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 50); 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 88: { - // entityId - entityId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 8: { // mapLayer mapLayer = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 16) { break; } } - case 26: { + case 16: { + // entityId + entityId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 50) { + break; + } + } + case 50: { // 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 fd4005b..bd06fa2 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 = 3; + * optional uint32 slot = 8; */ private int slot; /** - * optional uint32 relic_unique_id = 4; + * optional uint32 relic_unique_id = 15; */ private int relicUniqueId; @@ -39,7 +39,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 slot = 3; + * optional uint32 slot = 8; * @return whether the slot field is set */ public boolean hasSlot() { @@ -47,7 +47,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 slot = 3; + * optional uint32 slot = 8; * @return this */ public EquipRelic clearSlot() { @@ -57,7 +57,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 slot = 3; + * optional uint32 slot = 8; * @return the slot */ public int getSlot() { @@ -65,7 +65,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 slot = 3; + * optional uint32 slot = 8; * @param value the slot to set * @return this */ @@ -76,7 +76,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 relic_unique_id = 4; + * optional uint32 relic_unique_id = 15; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -84,7 +84,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 relic_unique_id = 4; + * optional uint32 relic_unique_id = 15; * @return this */ public EquipRelic clearRelicUniqueId() { @@ -94,7 +94,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 relic_unique_id = 4; + * optional uint32 relic_unique_id = 15; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -102,7 +102,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 relic_unique_id = 4; + * optional uint32 relic_unique_id = 15; * @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) 24); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(relicUniqueId); } } @@ -205,16 +205,16 @@ public final class EquipRelicOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 64: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 120) { break; } } - case 32: { + case 120: { // 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 d1ed594..b714b52 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 tid = 3; - */ - private int tid; - - /** - * optional uint32 rank = 4; + * optional uint32 rank = 2; */ private int rank; /** - * optional uint32 exp = 6; - */ - private int exp; - - /** - * optional uint32 unique_id = 11; - */ - private int uniqueId; - - /** - * optional uint32 promotion = 12; - */ - private int promotion; - - /** - * optional uint32 level = 14; - */ - private int level; - - /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 4; */ private int baseAvatarId; /** - * optional bool is_protected = 5; + * optional uint32 unique_id = 5; + */ + private int uniqueId; + + /** + * optional uint32 tid = 8; + */ + private int tid; + + /** + * optional uint32 level = 12; + */ + private int level; + + /** + * optional uint32 exp = 14; + */ + private int exp; + + /** + * optional uint32 promotion = 15; + */ + private int promotion; + + /** + * optional bool is_protected = 1; */ private boolean isProtected; @@ -69,62 +69,25 @@ public final class EquipmentOuterClass { } /** - * optional uint32 tid = 3; - * @return whether the tid field is set + * optional uint32 rank = 2; + * @return whether the rank field is set */ - public boolean hasTid() { + public boolean hasRank() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 tid = 3; - * @return this - */ - public Equipment clearTid() { - bitField0_ &= ~0x00000001; - tid = 0; - return this; - } - - /** - * optional uint32 tid = 3; - * @return the tid - */ - public int getTid() { - return tid; - } - - /** - * optional uint32 tid = 3; - * @param value the tid to set - * @return this - */ - public Equipment setTid(final int value) { - bitField0_ |= 0x00000001; - tid = value; - return this; - } - - /** - * optional uint32 rank = 4; - * @return whether the rank field is set - */ - public boolean hasRank() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 rank = 4; + * optional uint32 rank = 2; * @return this */ public Equipment clearRank() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; rank = 0; return this; } /** - * optional uint32 rank = 4; + * optional uint32 rank = 2; * @return the rank */ public int getRank() { @@ -132,184 +95,36 @@ public final class EquipmentOuterClass { } /** - * optional uint32 rank = 4; + * optional uint32 rank = 2; * @param value the rank to set * @return this */ public Equipment setRank(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; rank = 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 Equipment 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 Equipment setExp(final int value) { - bitField0_ |= 0x00000004; - exp = value; - return this; - } - - /** - * optional uint32 unique_id = 11; - * @return whether the uniqueId field is set - */ - public boolean hasUniqueId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 unique_id = 11; - * @return this - */ - public Equipment clearUniqueId() { - bitField0_ &= ~0x00000008; - uniqueId = 0; - return this; - } - - /** - * optional uint32 unique_id = 11; - * @return the uniqueId - */ - public int getUniqueId() { - return uniqueId; - } - - /** - * optional uint32 unique_id = 11; - * @param value the uniqueId to set - * @return this - */ - public Equipment setUniqueId(final int value) { - bitField0_ |= 0x00000008; - uniqueId = value; - return this; - } - - /** - * optional uint32 promotion = 12; - * @return whether the promotion field is set - */ - public boolean hasPromotion() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 promotion = 12; - * @return this - */ - public Equipment clearPromotion() { - bitField0_ &= ~0x00000010; - promotion = 0; - return this; - } - - /** - * optional uint32 promotion = 12; - * @return the promotion - */ - public int getPromotion() { - return promotion; - } - - /** - * optional uint32 promotion = 12; - * @param value the promotion to set - * @return this - */ - public Equipment setPromotion(final int value) { - bitField0_ |= 0x00000010; - promotion = value; - return this; - } - - /** - * optional uint32 level = 14; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 level = 14; - * @return this - */ - public Equipment clearLevel() { - bitField0_ &= ~0x00000020; - 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 Equipment setLevel(final int value) { - bitField0_ |= 0x00000020; - level = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 4; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 4; * @return this */ public Equipment clearBaseAvatarId() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000002; baseAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 4; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -317,18 +132,203 @@ public final class EquipmentOuterClass { } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 4; * @param value the baseAvatarId to set * @return this */ public Equipment setBaseAvatarId(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000002; baseAvatarId = value; return this; } /** - * optional bool is_protected = 5; + * optional uint32 unique_id = 5; + * @return whether the uniqueId field is set + */ + public boolean hasUniqueId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 unique_id = 5; + * @return this + */ + public Equipment clearUniqueId() { + bitField0_ &= ~0x00000004; + uniqueId = 0; + return this; + } + + /** + * optional uint32 unique_id = 5; + * @return the uniqueId + */ + public int getUniqueId() { + return uniqueId; + } + + /** + * optional uint32 unique_id = 5; + * @param value the uniqueId to set + * @return this + */ + public Equipment setUniqueId(final int value) { + bitField0_ |= 0x00000004; + uniqueId = value; + return this; + } + + /** + * optional uint32 tid = 8; + * @return whether the tid field is set + */ + public boolean hasTid() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 tid = 8; + * @return this + */ + public Equipment clearTid() { + bitField0_ &= ~0x00000008; + 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 Equipment setTid(final int value) { + bitField0_ |= 0x00000008; + tid = value; + return this; + } + + /** + * optional uint32 level = 12; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 level = 12; + * @return this + */ + public Equipment clearLevel() { + bitField0_ &= ~0x00000010; + 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 Equipment setLevel(final int value) { + bitField0_ |= 0x00000010; + level = value; + return this; + } + + /** + * optional uint32 exp = 14; + * @return whether the exp field is set + */ + public boolean hasExp() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 exp = 14; + * @return this + */ + public Equipment clearExp() { + bitField0_ &= ~0x00000020; + exp = 0; + return this; + } + + /** + * optional uint32 exp = 14; + * @return the exp + */ + public int getExp() { + return exp; + } + + /** + * optional uint32 exp = 14; + * @param value the exp to set + * @return this + */ + public Equipment setExp(final int value) { + bitField0_ |= 0x00000020; + exp = value; + return this; + } + + /** + * optional uint32 promotion = 15; + * @return whether the promotion field is set + */ + public boolean hasPromotion() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional uint32 promotion = 15; + * @return this + */ + public Equipment clearPromotion() { + bitField0_ &= ~0x00000040; + 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 Equipment setPromotion(final int value) { + bitField0_ |= 0x00000040; + promotion = value; + return this; + } + + /** + * optional bool is_protected = 1; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -336,7 +336,7 @@ public final class EquipmentOuterClass { } /** - * optional bool is_protected = 5; + * optional bool is_protected = 1; * @return this */ public Equipment clearIsProtected() { @@ -346,7 +346,7 @@ public final class EquipmentOuterClass { } /** - * optional bool is_protected = 5; + * optional bool is_protected = 1; * @return the isProtected */ public boolean getIsProtected() { @@ -354,7 +354,7 @@ public final class EquipmentOuterClass { } /** - * optional bool is_protected = 5; + * optional bool is_protected = 1; * @param value the isProtected to set * @return this */ @@ -369,13 +369,13 @@ public final class EquipmentOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - tid = other.tid; rank = other.rank; - exp = other.exp; - uniqueId = other.uniqueId; - promotion = other.promotion; - level = other.level; baseAvatarId = other.baseAvatarId; + uniqueId = other.uniqueId; + tid = other.tid; + level = other.level; + exp = other.exp; + promotion = other.promotion; isProtected = other.isProtected; } return this; @@ -387,26 +387,26 @@ public final class EquipmentOuterClass { return this; } cachedSize = -1; - if (other.hasTid()) { - setTid(other.tid); - } if (other.hasRank()) { setRank(other.rank); } - if (other.hasExp()) { - setExp(other.exp); + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); } if (other.hasUniqueId()) { setUniqueId(other.uniqueId); } - if (other.hasPromotion()) { - setPromotion(other.promotion); + if (other.hasTid()) { + setTid(other.tid); } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); + if (other.hasExp()) { + setExp(other.exp); + } + if (other.hasPromotion()) { + setPromotion(other.promotion); } if (other.hasIsProtected()) { setIsProtected(other.isProtected); @@ -421,13 +421,13 @@ public final class EquipmentOuterClass { } cachedSize = -1; bitField0_ = 0; - tid = 0; rank = 0; - exp = 0; - uniqueId = 0; - promotion = 0; - level = 0; baseAvatarId = 0; + uniqueId = 0; + tid = 0; + level = 0; + exp = 0; + promotion = 0; isProtected = false; return this; } @@ -452,48 +452,48 @@ public final class EquipmentOuterClass { } Equipment other = (Equipment) o; return bitField0_ == other.bitField0_ - && (!hasTid() || tid == other.tid) && (!hasRank() || rank == other.rank) - && (!hasExp() || exp == other.exp) - && (!hasUniqueId() || uniqueId == other.uniqueId) - && (!hasPromotion() || promotion == other.promotion) - && (!hasLevel() || level == other.level) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasUniqueId() || uniqueId == other.uniqueId) + && (!hasTid() || tid == other.tid) + && (!hasLevel() || level == other.level) + && (!hasExp() || exp == other.exp) + && (!hasPromotion() || promotion == other.promotion) && (!hasIsProtected() || isProtected == other.isProtected); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(tid); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(rank); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(exp); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(uniqueId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(uniqueId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(tid); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(promotion); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(level); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(baseAvatarId); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeBoolNoTag(isProtected); } } @@ -502,25 +502,25 @@ public final class EquipmentOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } if ((bitField0_ & 0x00000080) != 0) { size += 2; @@ -535,9 +535,9 @@ public final class EquipmentOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // tid - tid = input.readUInt32(); + case 16: { + // rank + rank = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 32) { @@ -545,26 +545,26 @@ public final class EquipmentOuterClass { } } case 32: { - // rank - rank = input.readUInt32(); + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 40) { break; } } - case 48: { - // exp - exp = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 40: { // uniqueId uniqueId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // tid + tid = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 96) { @@ -572,8 +572,8 @@ public final class EquipmentOuterClass { } } case 96: { - // promotion - promotion = input.readUInt32(); + // level + level = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 112) { @@ -581,8 +581,8 @@ public final class EquipmentOuterClass { } } case 112: { - // level - level = input.readUInt32(); + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 120) { @@ -590,15 +590,15 @@ public final class EquipmentOuterClass { } } case 120: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 40) { + if (tag != 8) { break; } } - case 40: { + case 8: { // isProtected isProtected = input.readBool(); bitField0_ |= 0x00000080; @@ -625,25 +625,25 @@ public final class EquipmentOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.tid, tid); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.rank, rank); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.exp, exp); + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.uniqueId, uniqueId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.tid, tid); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.level, level); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.exp, exp); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.promotion, promotion); } if ((bitField0_ & 0x00000080) != 0) { output.writeBool(FieldNames.isProtected, isProtected); @@ -658,67 +658,11 @@ public final class EquipmentOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 114831: { - if (input.isAtField(FieldNames.tid)) { - if (!input.trySkipNullValue()) { - tid = 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 -294460212: - case -538310583: { - if (input.isAtField(FieldNames.uniqueId)) { - if (!input.trySkipNullValue()) { - uniqueId = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { - if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -730,6 +674,62 @@ public final class EquipmentOuterClass { if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { baseAvatarId = 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 { + input.skipUnknownField(); + } + break; + } + case 114831: { + if (input.isAtField(FieldNames.tid)) { + if (!input.trySkipNullValue()) { + tid = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case 100893: { + if (input.isAtField(FieldNames.exp)) { + if (!input.trySkipNullValue()) { + exp = input.readUInt32(); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { + if (!input.trySkipNullValue()) { + promotion = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -801,19 +801,19 @@ public final class EquipmentOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName tid = FieldName.forField("tid"); - static final FieldName rank = FieldName.forField("rank"); - static final FieldName exp = FieldName.forField("exp"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); - static final FieldName promotion = FieldName.forField("promotion"); + static final FieldName tid = FieldName.forField("tid"); static final FieldName level = FieldName.forField("level"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName exp = FieldName.forField("exp"); + + static final FieldName promotion = FieldName.forField("promotion"); static final FieldName isProtected = FieldName.forField("isProtected", "is_protected"); } diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java index 09cc04d..fd9342a 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 = 1; - */ - private int avatarId; - - /** - * optional uint32 gacha_type = 5; + * optional uint32 gacha_type = 9; */ private int gachaType; + /** + * optional uint32 avatar_id = 12; + */ + private int avatarId; + private ExchangeGachaCeilingCsReq() { } @@ -39,62 +39,25 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 avatar_id = 1; - * @return whether the avatarId field is set + * optional uint32 gacha_type = 9; + * @return whether the gachaType field is set */ - public boolean hasAvatarId() { + public boolean hasGachaType() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 avatar_id = 1; - * @return this - */ - public ExchangeGachaCeilingCsReq clearAvatarId() { - bitField0_ &= ~0x00000001; - avatarId = 0; - return this; - } - - /** - * optional uint32 avatar_id = 1; - * @return the avatarId - */ - public int getAvatarId() { - return avatarId; - } - - /** - * optional uint32 avatar_id = 1; - * @param value the avatarId to set - * @return this - */ - public ExchangeGachaCeilingCsReq setAvatarId(final int value) { - bitField0_ |= 0x00000001; - avatarId = value; - return this; - } - - /** - * optional uint32 gacha_type = 5; - * @return whether the gachaType field is set - */ - public boolean hasGachaType() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 gacha_type = 5; + * optional uint32 gacha_type = 9; * @return this */ public ExchangeGachaCeilingCsReq clearGachaType() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; gachaType = 0; return this; } /** - * optional uint32 gacha_type = 5; + * optional uint32 gacha_type = 9; * @return the gachaType */ public int getGachaType() { @@ -102,23 +65,60 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 5; + * optional uint32 gacha_type = 9; * @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 = 12; + * @return whether the avatarId field is set + */ + public boolean hasAvatarId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 avatar_id = 12; + * @return this + */ + public ExchangeGachaCeilingCsReq clearAvatarId() { + bitField0_ &= ~0x00000002; + avatarId = 0; + return this; + } + + /** + * optional uint32 avatar_id = 12; + * @return the avatarId + */ + public int getAvatarId() { + return avatarId; + } + + /** + * optional uint32 avatar_id = 12; + * @param value the avatarId to set + * @return this + */ + public 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) 8); - output.writeUInt32NoTag(avatarId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(gachaType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(gachaType); + output.writeRawByte((byte) 96); + 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 8: { - // avatarId - avatarId = input.readUInt32(); + case 72: { + // gachaType + gachaType = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 96) { break; } } - case 40: { - // gachaType - gachaType = input.readUInt32(); + case 96: { + // 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/ExchangeHcoinCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java index 328c2db..172d131 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 = 10; + * optional uint32 num = 3; */ private int num; @@ -34,7 +34,7 @@ public final class ExchangeHcoinCsReqOuterClass { } /** - * optional uint32 num = 10; + * optional uint32 num = 3; * @return whether the num field is set */ public boolean hasNum() { @@ -42,7 +42,7 @@ public final class ExchangeHcoinCsReqOuterClass { } /** - * optional uint32 num = 10; + * optional uint32 num = 3; * @return this */ public ExchangeHcoinCsReq clearNum() { @@ -52,7 +52,7 @@ public final class ExchangeHcoinCsReqOuterClass { } /** - * optional uint32 num = 10; + * optional uint32 num = 3; * @return the num */ public int getNum() { @@ -60,7 +60,7 @@ public final class ExchangeHcoinCsReqOuterClass { } /** - * optional uint32 num = 10; + * optional uint32 num = 3; * @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) 80); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(num); } } @@ -150,7 +150,7 @@ public final class ExchangeHcoinCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 24: { // 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 2d00911..8e522be 100644 --- a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java @@ -19,15 +19,15 @@ public final class ExchangeHcoinScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 num = 1; - */ - private int num; - - /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 1; */ private int retcode; + /** + * optional uint32 num = 13; + */ + private int num; + private ExchangeHcoinScRsp() { } @@ -39,62 +39,25 @@ public final class ExchangeHcoinScRspOuterClass { } /** - * optional uint32 num = 1; - * @return whether the num field is set + * optional uint32 retcode = 1; + * @return whether the retcode field is set */ - public boolean hasNum() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 num = 1; - * @return this - */ - public ExchangeHcoinScRsp clearNum() { - bitField0_ &= ~0x00000001; - num = 0; - return this; - } - - /** - * optional uint32 num = 1; - * @return the num - */ - public int getNum() { - return num; - } - - /** - * optional uint32 num = 1; - * @param value the num to set - * @return this - */ - public ExchangeHcoinScRsp setNum(final int value) { - 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; + * optional uint32 retcode = 1; * @return this */ public ExchangeHcoinScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -102,23 +65,60 @@ public final class ExchangeHcoinScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ public ExchangeHcoinScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + 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; + * @return this + */ + public ExchangeHcoinScRsp clearNum() { + bitField0_ &= ~0x00000002; + num = 0; + return this; + } + + /** + * optional uint32 num = 13; + * @return the num + */ + public int getNum() { + return num; + } + + /** + * optional uint32 num = 13; + * @param value the num to set + * @return this + */ + public ExchangeHcoinScRsp setNum(final int value) { + bitField0_ |= 0x00000002; + num = value; + return this; + } + @Override public ExchangeHcoinScRsp copyFrom(final ExchangeHcoinScRsp other) { 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) 8); - output.writeUInt32NoTag(num); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 104); + 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; } @@ -206,17 +206,17 @@ public final class ExchangeHcoinScRspOuterClass { while (true) { switch (tag) { case 8: { - // num - num = input.readUInt32(); + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { - // retcode - retcode = input.readUInt32(); + case 104: { + // 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 df1d0d1..bdfbe84 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 = 2; + * optional uint32 equipment_unique_id = 3; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 5; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 2; + * optional uint32 equipment_unique_id = 3; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 2; + * optional uint32 equipment_unique_id = 3; * @return this */ public ExpUpEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 2; + * optional uint32 equipment_unique_id = 3; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 2; + * optional uint32 equipment_unique_id = 3; * @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 = 5; * @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 = 5; * @return this */ public ExpUpEquipmentCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * 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 ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * 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 ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 5; * @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) 16); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 42); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class ExpUpEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 24: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 42) { break; } } - case 10: { + case 42: { // 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 667f9d9..a292eb6 100644 --- a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java @@ -25,7 +25,7 @@ public final class ExpUpEquipmentScRspOuterClass { private int retcode; /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 4; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -77,7 +77,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 4; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 4; * @return this */ public ExpUpEquipmentScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 4; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 4; * @param values the returnItemList to add * @return this */ @@ -215,7 +215,7 @@ public final class ExpUpEquipmentScRspOuterClass { } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 34); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -245,11 +245,11 @@ public final class ExpUpEquipmentScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 34) { break; } } - case 98: { + case 34: { // 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 1297d1e..63b6ffc 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 = 7; + * optional uint32 relic_unique_id = 11; */ private int relicUniqueId; /** - * optional .ItemCostList item_cost_list = 11; + * optional .ItemCostList item_cost_list = 3; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 7; + * 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 = 7; + * optional uint32 relic_unique_id = 11; * @return this */ public ExpUpRelicCsReq clearRelicUniqueId() { @@ -57,7 +57,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 7; + * 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 = 7; + * 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 = 11; + * optional .ItemCostList item_cost_list = 3; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 11; + * optional .ItemCostList item_cost_list = 3; * @return this */ public ExpUpRelicCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 11; + * optional .ItemCostList item_cost_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. @@ -108,7 +108,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 11; + * optional .ItemCostList item_cost_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 @@ -122,7 +122,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 11; + * optional .ItemCostList item_cost_list = 3; * @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) 56); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 26); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class ExpUpRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 88: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 26) { break; } } - case 90: { + case 26: { // 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 a7c7e45..1e127bd 100644 --- a/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java @@ -25,7 +25,7 @@ public final class ExpUpRelicScRspOuterClass { private int retcode; /** - * repeated .PileItem return_item_list = 14; + * repeated .PileItem return_item_list = 11; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -77,7 +77,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 14; + * repeated .PileItem return_item_list = 11; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 14; + * repeated .PileItem return_item_list = 11; * @return this */ public ExpUpRelicScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 14; + * 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 ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 14; + * 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 ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 14; + * repeated .PileItem return_item_list = 11; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 14; + * repeated .PileItem return_item_list = 11; * @param values the returnItemList to add * @return this */ @@ -215,7 +215,7 @@ public final class ExpUpRelicScRspOuterClass { } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 90); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -245,11 +245,11 @@ public final class ExpUpRelicScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 90) { break; } } - case 114: { + case 90: { // returnItemList tag = input.readRepeatedMessage(returnItemList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java index d58fed7..538693f 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 = 13; - */ - private long beginTime; - - /** - * optional int64 end_time = 14; + * optional int64 end_time = 3; */ private long endTime; /** - * optional uint32 gacha_id = 12; + * optional int64 begin_time = 7; + */ + private long beginTime; + + /** + * optional uint32 gacha_id = 15; */ private int gachaId; @@ -44,62 +44,25 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 begin_time = 13; - * @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 = 13; - * @return this - */ - public FarmStageGachaInfo clearBeginTime() { - bitField0_ &= ~0x00000001; - beginTime = 0L; - return this; - } - - /** - * optional int64 begin_time = 13; - * @return the beginTime - */ - public long getBeginTime() { - return beginTime; - } - - /** - * optional int64 begin_time = 13; - * @param value the beginTime to set - * @return this - */ - public FarmStageGachaInfo 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 FarmStageGachaInfo 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() { @@ -107,18 +70,55 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 end_time = 14; + * optional int64 end_time = 3; * @param value the endTime to set * @return this */ public FarmStageGachaInfo setEndTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; endTime = value; return this; } /** - * optional uint32 gacha_id = 12; + * optional int64 begin_time = 7; + * @return whether the beginTime field is set + */ + public boolean hasBeginTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 begin_time = 7; + * @return this + */ + public FarmStageGachaInfo clearBeginTime() { + bitField0_ &= ~0x00000002; + beginTime = 0L; + return this; + } + + /** + * optional int64 begin_time = 7; + * @return the beginTime + */ + public long getBeginTime() { + return beginTime; + } + + /** + * optional int64 begin_time = 7; + * @param value the beginTime to set + * @return this + */ + public FarmStageGachaInfo setBeginTime(final long value) { + bitField0_ |= 0x00000002; + beginTime = value; + return this; + } + + /** + * optional uint32 gacha_id = 15; * @return whether the gachaId field is set */ public boolean hasGachaId() { @@ -126,7 +126,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 12; + * optional uint32 gacha_id = 15; * @return this */ public FarmStageGachaInfo clearGachaId() { @@ -136,7 +136,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 12; + * optional uint32 gacha_id = 15; * @return the gachaId */ public int getGachaId() { @@ -144,7 +144,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 12; + * optional uint32 gacha_id = 15; * @param value the gachaId to set * @return this */ @@ -159,8 +159,8 @@ public final class FarmStageGachaInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - beginTime = other.beginTime; endTime = other.endTime; + beginTime = other.beginTime; gachaId = other.gachaId; } return this; @@ -172,12 +172,12 @@ public final class FarmStageGachaInfoOuterClass { return this; } cachedSize = -1; - if (other.hasBeginTime()) { - setBeginTime(other.beginTime); - } if (other.hasEndTime()) { setEndTime(other.endTime); } + if (other.hasBeginTime()) { + setBeginTime(other.beginTime); + } if (other.hasGachaId()) { setGachaId(other.gachaId); } @@ -191,8 +191,8 @@ public final class FarmStageGachaInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - beginTime = 0L; endTime = 0L; + beginTime = 0L; gachaId = 0; return this; } @@ -217,23 +217,23 @@ public final class FarmStageGachaInfoOuterClass { } FarmStageGachaInfo other = (FarmStageGachaInfo) o; return bitField0_ == other.bitField0_ - && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) + && (!hasBeginTime() || beginTime == other.beginTime) && (!hasGachaId() || gachaId == other.gachaId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); - output.writeInt64NoTag(beginTime); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 24); output.writeInt64NoTag(endTime); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); + output.writeInt64NoTag(beginTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(gachaId); } } @@ -242,10 +242,10 @@ public final class FarmStageGachaInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); @@ -260,25 +260,25 @@ public final class FarmStageGachaInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { - // beginTime - beginTime = input.readInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 24: { // endTime endTime = input.readInt64(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 56) { break; } } - case 96: { + case 56: { + // beginTime + beginTime = input.readInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { // gachaId gachaId = input.readUInt32(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class FarmStageGachaInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.beginTime, beginTime); + output.writeInt64(FieldNames.endTime, endTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeInt64(FieldNames.endTime, endTime); + output.writeInt64(FieldNames.beginTime, beginTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.gachaId, gachaId); @@ -323,11 +323,11 @@ public final class FarmStageGachaInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1072839914: - case 1112183971: { - if (input.isAtField(FieldNames.beginTime)) { + case -1607243192: + case 1725551537: { + if (input.isAtField(FieldNames.endTime)) { if (!input.trySkipNullValue()) { - beginTime = input.readInt64(); + endTime = input.readInt64(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +335,11 @@ public final class FarmStageGachaInfoOuterClass { } break; } - case -1607243192: - case 1725551537: { - if (input.isAtField(FieldNames.endTime)) { + case -1072839914: + case 1112183971: { + if (input.isAtField(FieldNames.beginTime)) { if (!input.trySkipNullValue()) { - endTime = input.readInt64(); + beginTime = input.readInt64(); bitField0_ |= 0x00000002; } } else { @@ -412,10 +412,10 @@ public final class FarmStageGachaInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); - static final FieldName endTime = FieldName.forField("endTime", "end_time"); + static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); + static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); } } diff --git a/src/generated/main/emu/lunarcore/proto/FinishRogueDialogueGroupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/FinishRogueDialogueGroupCsReqOuterClass.java index 5f65713..4c1a4ed 100644 --- a/src/generated/main/emu/lunarcore/proto/FinishRogueDialogueGroupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FinishRogueDialogueGroupCsReqOuterClass.java @@ -19,7 +19,12 @@ public final class FinishRogueDialogueGroupCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entity_id = 5; + * optional uint32 dialogue_group_id = 1; + */ + private int dialogueGroupId; + + /** + * optional uint32 entity_id = 15; */ private int entityId; @@ -34,25 +39,62 @@ public final class FinishRogueDialogueGroupCsReqOuterClass { } /** - * optional uint32 entity_id = 5; - * @return whether the entityId field is set + * optional uint32 dialogue_group_id = 1; + * @return whether the dialogueGroupId field is set */ - public boolean hasEntityId() { + public boolean hasDialogueGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entity_id = 5; + * optional uint32 dialogue_group_id = 1; + * @return this + */ + public FinishRogueDialogueGroupCsReq clearDialogueGroupId() { + bitField0_ &= ~0x00000001; + dialogueGroupId = 0; + return this; + } + + /** + * optional uint32 dialogue_group_id = 1; + * @return the dialogueGroupId + */ + public int getDialogueGroupId() { + return dialogueGroupId; + } + + /** + * optional uint32 dialogue_group_id = 1; + * @param value the dialogueGroupId to set + * @return this + */ + public FinishRogueDialogueGroupCsReq setDialogueGroupId(final int value) { + bitField0_ |= 0x00000001; + dialogueGroupId = value; + return this; + } + + /** + * optional uint32 entity_id = 15; + * @return whether the entityId field is set + */ + public boolean hasEntityId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 entity_id = 15; * @return this */ public FinishRogueDialogueGroupCsReq clearEntityId() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; entityId = 0; return this; } /** - * optional uint32 entity_id = 5; + * optional uint32 entity_id = 15; * @return the entityId */ public int getEntityId() { @@ -60,12 +102,12 @@ public final class FinishRogueDialogueGroupCsReqOuterClass { } /** - * optional uint32 entity_id = 5; + * optional uint32 entity_id = 15; * @param value the entityId to set * @return this */ public FinishRogueDialogueGroupCsReq setEntityId(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; entityId = value; return this; } @@ -75,6 +117,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + dialogueGroupId = other.dialogueGroupId; entityId = other.entityId; } return this; @@ -86,6 +129,9 @@ public final class FinishRogueDialogueGroupCsReqOuterClass { return this; } cachedSize = -1; + if (other.hasDialogueGroupId()) { + setDialogueGroupId(other.dialogueGroupId); + } if (other.hasEntityId()) { setEntityId(other.entityId); } @@ -99,6 +145,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; + dialogueGroupId = 0; entityId = 0; return this; } @@ -123,13 +170,18 @@ public final class FinishRogueDialogueGroupCsReqOuterClass { } FinishRogueDialogueGroupCsReq other = (FinishRogueDialogueGroupCsReq) o; return bitField0_ == other.bitField0_ + && (!hasDialogueGroupId() || dialogueGroupId == other.dialogueGroupId) && (!hasEntityId() || entityId == other.entityId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(dialogueGroupId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); output.writeUInt32NoTag(entityId); } } @@ -138,6 +190,9 @@ public final class FinishRogueDialogueGroupCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueGroupId); + } + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } return size; @@ -150,10 +205,19 @@ public final class FinishRogueDialogueGroupCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 8: { + // dialogueGroupId + dialogueGroupId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { // entityId entityId = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { break; @@ -177,6 +241,9 @@ public final class FinishRogueDialogueGroupCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.dialogueGroupId, dialogueGroupId); + } + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.entityId, entityId); } output.endObject(); @@ -189,12 +256,24 @@ public final class FinishRogueDialogueGroupCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 1758320386: + case 1899979106: { + if (input.isAtField(FieldNames.dialogueGroupId)) { + if (!input.trySkipNullValue()) { + dialogueGroupId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case -2102099874: case -740565257: { if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { entityId = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -256,6 +335,8 @@ public final class FinishRogueDialogueGroupCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName dialogueGroupId = FieldName.forField("dialogueGroupId", "dialogue_group_id"); + static final FieldName entityId = FieldName.forField("entityId", "entity_id"); } } diff --git a/src/generated/main/emu/lunarcore/proto/FirstNpcTalkInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FirstNpcTalkInfoOuterClass.java index ec37f4f..da71ff7 100644 --- a/src/generated/main/emu/lunarcore/proto/FirstNpcTalkInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FirstNpcTalkInfoOuterClass.java @@ -19,14 +19,14 @@ public final class FirstNpcTalkInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 npc_id = 3; + * optional uint32 npc_id = 15; */ private int npcId; /** - * optional bool KGCJMBBFBIA = 7; + * optional bool unk_bool = 12; */ - private boolean kGCJMBBFBIA; + private boolean unkBool; private FirstNpcTalkInfo() { } @@ -39,7 +39,7 @@ public final class FirstNpcTalkInfoOuterClass { } /** - * optional uint32 npc_id = 3; + * optional uint32 npc_id = 15; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -47,7 +47,7 @@ public final class FirstNpcTalkInfoOuterClass { } /** - * optional uint32 npc_id = 3; + * optional uint32 npc_id = 15; * @return this */ public FirstNpcTalkInfo clearNpcId() { @@ -57,7 +57,7 @@ public final class FirstNpcTalkInfoOuterClass { } /** - * optional uint32 npc_id = 3; + * optional uint32 npc_id = 15; * @return the npcId */ public int getNpcId() { @@ -65,7 +65,7 @@ public final class FirstNpcTalkInfoOuterClass { } /** - * optional uint32 npc_id = 3; + * optional uint32 npc_id = 15; * @param value the npcId to set * @return this */ @@ -76,39 +76,39 @@ public final class FirstNpcTalkInfoOuterClass { } /** - * optional bool KGCJMBBFBIA = 7; - * @return whether the kGCJMBBFBIA field is set + * optional bool unk_bool = 12; + * @return whether the unkBool field is set */ - public boolean hasKGCJMBBFBIA() { + public boolean hasUnkBool() { return (bitField0_ & 0x00000002) != 0; } /** - * optional bool KGCJMBBFBIA = 7; + * optional bool unk_bool = 12; * @return this */ - public FirstNpcTalkInfo clearKGCJMBBFBIA() { + public FirstNpcTalkInfo clearUnkBool() { bitField0_ &= ~0x00000002; - kGCJMBBFBIA = false; + unkBool = false; return this; } /** - * optional bool KGCJMBBFBIA = 7; - * @return the kGCJMBBFBIA + * optional bool unk_bool = 12; + * @return the unkBool */ - public boolean getKGCJMBBFBIA() { - return kGCJMBBFBIA; + public boolean getUnkBool() { + return unkBool; } /** - * optional bool KGCJMBBFBIA = 7; - * @param value the kGCJMBBFBIA to set + * optional bool unk_bool = 12; + * @param value the unkBool to set * @return this */ - public FirstNpcTalkInfo setKGCJMBBFBIA(final boolean value) { + public FirstNpcTalkInfo setUnkBool(final boolean value) { bitField0_ |= 0x00000002; - kGCJMBBFBIA = value; + unkBool = value; return this; } @@ -118,7 +118,7 @@ public final class FirstNpcTalkInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; npcId = other.npcId; - kGCJMBBFBIA = other.kGCJMBBFBIA; + unkBool = other.unkBool; } return this; } @@ -132,8 +132,8 @@ public final class FirstNpcTalkInfoOuterClass { if (other.hasNpcId()) { setNpcId(other.npcId); } - if (other.hasKGCJMBBFBIA()) { - setKGCJMBBFBIA(other.kGCJMBBFBIA); + if (other.hasUnkBool()) { + setUnkBool(other.unkBool); } return this; } @@ -146,7 +146,7 @@ public final class FirstNpcTalkInfoOuterClass { cachedSize = -1; bitField0_ = 0; npcId = 0; - kGCJMBBFBIA = false; + unkBool = false; return this; } @@ -171,18 +171,18 @@ public final class FirstNpcTalkInfoOuterClass { FirstNpcTalkInfo other = (FirstNpcTalkInfo) o; return bitField0_ == other.bitField0_ && (!hasNpcId() || npcId == other.npcId) - && (!hasKGCJMBBFBIA() || kGCJMBBFBIA == other.kGCJMBBFBIA); + && (!hasUnkBool() || unkBool == other.unkBool); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(npcId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeBoolNoTag(kGCJMBBFBIA); + output.writeRawByte((byte) 96); + output.writeBoolNoTag(unkBool); } } @@ -205,18 +205,18 @@ public final class FirstNpcTalkInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 120: { // npcId npcId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 96) { break; } } - case 56: { - // kGCJMBBFBIA - kGCJMBBFBIA = input.readBool(); + case 96: { + // unkBool + unkBool = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -244,7 +244,7 @@ public final class FirstNpcTalkInfoOuterClass { output.writeUInt32(FieldNames.npcId, npcId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeBool(FieldNames.kGCJMBBFBIA, kGCJMBBFBIA); + output.writeBool(FieldNames.unkBool, unkBool); } output.endObject(); } @@ -268,10 +268,11 @@ public final class FirstNpcTalkInfoOuterClass { } break; } - case -1845407362: { - if (input.isAtField(FieldNames.kGCJMBBFBIA)) { + case -286151940: + case -254380521: { + if (input.isAtField(FieldNames.unkBool)) { if (!input.trySkipNullValue()) { - kGCJMBBFBIA = input.readBool(); + unkBool = input.readBool(); bitField0_ |= 0x00000002; } } else { @@ -334,7 +335,7 @@ public final class FirstNpcTalkInfoOuterClass { static class FieldNames { static final FieldName npcId = FieldName.forField("npcId", "npc_id"); - static final FieldName kGCJMBBFBIA = FieldName.forField("KGCJMBBFBIA"); + static final FieldName unkBool = FieldName.forField("unkBool", "unk_bool"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java index 671f160..6030877 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 = 14; + * optional .SimpleInfo simple_info = 8; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); @@ -34,7 +34,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 14; + * optional .SimpleInfo simple_info = 8; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -42,7 +42,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 14; + * optional .SimpleInfo simple_info = 8; * @return this */ public FriendApplyInfo clearSimpleInfo() { @@ -52,7 +52,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 14; + * optional .SimpleInfo simple_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 FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 14; + * optional .SimpleInfo simple_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 FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 14; + * optional .SimpleInfo simple_info = 8; * @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) 114); + output.writeRawByte((byte) 66); output.writeMessageNoTag(simpleInfo); } } @@ -171,7 +171,7 @@ public final class FriendApplyInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 66: { // simpleInfo input.readMessage(simpleInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java index 688851c..70ddbd8 100644 --- a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java @@ -19,7 +19,7 @@ public final class FriendListInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .SimpleInfo simple_info = 10; + * optional .SimpleInfo simple_info = 2; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); @@ -34,7 +34,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 10; + * optional .SimpleInfo simple_info = 2; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -42,7 +42,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 10; + * optional .SimpleInfo simple_info = 2; * @return this */ public FriendListInfo clearSimpleInfo() { @@ -52,7 +52,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 10; + * 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. @@ -66,7 +66,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 10; + * 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 @@ -80,7 +80,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 10; + * optional .SimpleInfo simple_info = 2; * @param value the simpleInfo to set * @return this */ @@ -150,7 +150,7 @@ public final class FriendListInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 18); output.writeMessageNoTag(simpleInfo); } } @@ -171,7 +171,7 @@ public final class FriendListInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 18: { // simpleInfo input.readMessage(simpleInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java index 4bef5a6..ff69f6d 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 = 15; + * optional .SimpleInfo simple_info = 8; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); @@ -34,7 +34,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 15; + * optional .SimpleInfo simple_info = 8; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -42,7 +42,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 15; + * optional .SimpleInfo simple_info = 8; * @return this */ public FriendRecommendInfo clearSimpleInfo() { @@ -52,7 +52,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 15; + * optional .SimpleInfo simple_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 FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 15; + * optional .SimpleInfo simple_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 FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 15; + * optional .SimpleInfo simple_info = 8; * @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) 122); + output.writeRawByte((byte) 66); output.writeMessageNoTag(simpleInfo); } } @@ -171,7 +171,7 @@ public final class FriendRecommendInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 122: { + case 66: { // 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 2e0f178..01fef0f 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 = 2; - */ - private int avatarId; - - /** - * optional uint32 repeated_cnt = 15; + * optional uint32 repeated_cnt = 14; */ private int repeatedCnt; + /** + * optional uint32 avatar_id = 15; + */ + private int avatarId; + private GachaCeilingAvatar() { } @@ -39,62 +39,25 @@ public final class GachaCeilingAvatarOuterClass { } /** - * optional uint32 avatar_id = 2; - * @return whether the avatarId field is set + * optional uint32 repeated_cnt = 14; + * @return whether the repeatedCnt field is set */ - public boolean hasAvatarId() { + public boolean hasRepeatedCnt() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 avatar_id = 2; - * @return this - */ - public GachaCeilingAvatar clearAvatarId() { - bitField0_ &= ~0x00000001; - avatarId = 0; - return this; - } - - /** - * optional uint32 avatar_id = 2; - * @return the avatarId - */ - public int getAvatarId() { - return avatarId; - } - - /** - * optional uint32 avatar_id = 2; - * @param value the avatarId to set - * @return this - */ - public GachaCeilingAvatar setAvatarId(final int value) { - bitField0_ |= 0x00000001; - avatarId = value; - return this; - } - - /** - * optional uint32 repeated_cnt = 15; - * @return whether the repeatedCnt field is set - */ - public boolean hasRepeatedCnt() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 repeated_cnt = 15; + * optional uint32 repeated_cnt = 14; * @return this */ public GachaCeilingAvatar clearRepeatedCnt() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; repeatedCnt = 0; return this; } /** - * optional uint32 repeated_cnt = 15; + * optional uint32 repeated_cnt = 14; * @return the repeatedCnt */ public int getRepeatedCnt() { @@ -102,23 +65,60 @@ public final class GachaCeilingAvatarOuterClass { } /** - * optional uint32 repeated_cnt = 15; + * optional uint32 repeated_cnt = 14; * @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 = 15; + * @return whether the avatarId field is set + */ + public boolean hasAvatarId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 avatar_id = 15; + * @return this + */ + public GachaCeilingAvatar clearAvatarId() { + bitField0_ &= ~0x00000002; + avatarId = 0; + return this; + } + + /** + * optional uint32 avatar_id = 15; + * @return the avatarId + */ + public int getAvatarId() { + return avatarId; + } + + /** + * optional uint32 avatar_id = 15; + * @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) 16); - output.writeUInt32NoTag(avatarId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(repeatedCnt); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(repeatedCnt); + 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,9 +205,9 @@ public final class GachaCeilingAvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // avatarId - avatarId = input.readUInt32(); + case 112: { + // repeatedCnt + repeatedCnt = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 120) { @@ -215,8 +215,8 @@ public final class GachaCeilingAvatarOuterClass { } } case 120: { - // repeatedCnt - repeatedCnt = input.readUInt32(); + // 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 c0e271a..b58006d 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java @@ -20,17 +20,17 @@ public final class GachaCeilingOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 ceiling_num = 4; + * optional uint32 ceiling_num = 8; */ private int ceilingNum; /** - * optional bool is_claimed = 3; + * optional bool is_claimed = 11; */ private boolean isClaimed; /** - * repeated .GachaCeilingAvatar avatar_list = 1; + * repeated .GachaCeilingAvatar avatar_list = 6; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(GachaCeilingAvatarOuterClass.GachaCeilingAvatar.getFactory()); @@ -45,7 +45,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 4; + * optional uint32 ceiling_num = 8; * @return whether the ceilingNum field is set */ public boolean hasCeilingNum() { @@ -53,7 +53,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 4; + * optional uint32 ceiling_num = 8; * @return this */ public GachaCeiling clearCeilingNum() { @@ -63,7 +63,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 4; + * optional uint32 ceiling_num = 8; * @return the ceilingNum */ public int getCeilingNum() { @@ -71,7 +71,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 4; + * optional uint32 ceiling_num = 8; * @param value the ceilingNum to set * @return this */ @@ -82,7 +82,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 3; + * optional bool is_claimed = 11; * @return whether the isClaimed field is set */ public boolean hasIsClaimed() { @@ -90,7 +90,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 3; + * optional bool is_claimed = 11; * @return this */ public GachaCeiling clearIsClaimed() { @@ -100,7 +100,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 3; + * optional bool is_claimed = 11; * @return the isClaimed */ public boolean getIsClaimed() { @@ -108,7 +108,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 3; + * optional bool is_claimed = 11; * @param value the isClaimed to set * @return this */ @@ -119,7 +119,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 1; + * repeated .GachaCeilingAvatar avatar_list = 6; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -127,7 +127,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 1; + * repeated .GachaCeilingAvatar avatar_list = 6; * @return this */ public GachaCeiling clearAvatarList() { @@ -137,7 +137,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 1; + * repeated .GachaCeilingAvatar avatar_list = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 1; + * repeated .GachaCeilingAvatar avatar_list = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 1; + * repeated .GachaCeilingAvatar avatar_list = 6; * @param value the avatarList to add * @return this */ @@ -176,7 +176,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 1; + * repeated .GachaCeilingAvatar avatar_list = 6; * @param values the avatarList to add * @return this */ @@ -259,16 +259,16 @@ public final class GachaCeilingOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(ceilingNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 88); output.writeBoolNoTag(isClaimed); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 50); output.writeMessageNoTag(avatarList.get(i)); } } @@ -296,25 +296,25 @@ public final class GachaCeilingOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 64: { // ceilingNum ceilingNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 88) { break; } } - case 24: { + case 88: { // isClaimed isClaimed = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 10) { + if (tag != 50) { break; } } - case 10: { + case 50: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java index 3802d17..f5544d2 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java @@ -21,22 +21,22 @@ public final class GachaInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 10; + * optional int64 begin_time = 4; */ private long beginTime; /** - * optional int64 end_time = 12; + * optional int64 end_time = 8; */ private long endTime; /** - * optional uint32 gacha_id = 13; + * optional uint32 gacha_id = 11; */ private int gachaId; /** - * optional .GachaCeiling gacha_ceiling = 9; + * optional .GachaCeiling gacha_ceiling = 6; */ private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); @@ -46,17 +46,17 @@ public final class GachaInfoOuterClass { private final Utf8String detailUrl = Utf8String.newEmptyInstance(); /** - * optional string history_url = 6; + * optional string history_url = 13; */ private final Utf8String historyUrl = Utf8String.newEmptyInstance(); /** - * repeated uint32 featured = 1; + * repeated uint32 featured = 3; */ private final RepeatedInt featured = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 up_info = 5; + * repeated uint32 up_info = 9; */ private final RepeatedInt upInfo = RepeatedInt.newEmptyInstance(); @@ -71,7 +71,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 begin_time = 10; + * optional int64 begin_time = 4; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -79,7 +79,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 begin_time = 10; + * optional int64 begin_time = 4; * @return this */ public GachaInfo clearBeginTime() { @@ -89,7 +89,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 begin_time = 10; + * optional int64 begin_time = 4; * @return the beginTime */ public long getBeginTime() { @@ -97,7 +97,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 begin_time = 10; + * optional int64 begin_time = 4; * @param value the beginTime to set * @return this */ @@ -108,7 +108,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 12; + * optional int64 end_time = 8; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -116,7 +116,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 12; + * optional int64 end_time = 8; * @return this */ public GachaInfo clearEndTime() { @@ -126,7 +126,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 12; + * optional int64 end_time = 8; * @return the endTime */ public long getEndTime() { @@ -134,7 +134,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 12; + * optional int64 end_time = 8; * @param value the endTime to set * @return this */ @@ -145,7 +145,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 13; + * optional uint32 gacha_id = 11; * @return whether the gachaId field is set */ public boolean hasGachaId() { @@ -153,7 +153,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 13; + * optional uint32 gacha_id = 11; * @return this */ public GachaInfo clearGachaId() { @@ -163,7 +163,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 13; + * optional uint32 gacha_id = 11; * @return the gachaId */ public int getGachaId() { @@ -171,7 +171,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 13; + * optional uint32 gacha_id = 11; * @param value the gachaId to set * @return this */ @@ -182,7 +182,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 9; + * optional .GachaCeiling gacha_ceiling = 6; * @return whether the gachaCeiling field is set */ public boolean hasGachaCeiling() { @@ -190,7 +190,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 9; + * optional .GachaCeiling gacha_ceiling = 6; * @return this */ public GachaInfo clearGachaCeiling() { @@ -200,7 +200,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 9; + * optional .GachaCeiling gacha_ceiling = 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. @@ -214,7 +214,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 9; + * optional .GachaCeiling gacha_ceiling = 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 @@ -228,7 +228,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 9; + * optional .GachaCeiling gacha_ceiling = 6; * @param value the gachaCeiling to set * @return this */ @@ -304,7 +304,7 @@ public final class GachaInfoOuterClass { } /** - * optional string history_url = 6; + * optional string history_url = 13; * @return whether the historyUrl field is set */ public boolean hasHistoryUrl() { @@ -312,7 +312,7 @@ public final class GachaInfoOuterClass { } /** - * optional string history_url = 6; + * optional string history_url = 13; * @return this */ public GachaInfo clearHistoryUrl() { @@ -322,7 +322,7 @@ public final class GachaInfoOuterClass { } /** - * optional string history_url = 6; + * optional string history_url = 13; * @return the historyUrl */ public String getHistoryUrl() { @@ -330,7 +330,7 @@ public final class GachaInfoOuterClass { } /** - * optional string history_url = 6; + * optional string history_url = 13; * @return internal {@code Utf8String} representation of historyUrl for reading */ public Utf8String getHistoryUrlBytes() { @@ -338,7 +338,7 @@ public final class GachaInfoOuterClass { } /** - * optional string history_url = 6; + * optional string history_url = 13; * @return internal {@code Utf8String} representation of historyUrl for modifications */ public Utf8String getMutableHistoryUrlBytes() { @@ -347,7 +347,7 @@ public final class GachaInfoOuterClass { } /** - * optional string history_url = 6; + * optional string history_url = 13; * @param value the historyUrl to set * @return this */ @@ -358,7 +358,7 @@ public final class GachaInfoOuterClass { } /** - * optional string history_url = 6; + * optional string history_url = 13; * @param value the historyUrl to set * @return this */ @@ -369,7 +369,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 featured = 1; + * repeated uint32 featured = 3; * @return whether the featured field is set */ public boolean hasFeatured() { @@ -377,7 +377,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 featured = 1; + * repeated uint32 featured = 3; * @return this */ public GachaInfo clearFeatured() { @@ -387,7 +387,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 featured = 1; + * repeated uint32 featured = 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. @@ -401,7 +401,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 featured = 1; + * repeated uint32 featured = 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 @@ -415,7 +415,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 featured = 1; + * repeated uint32 featured = 3; * @param value the featured to add * @return this */ @@ -426,7 +426,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 featured = 1; + * repeated uint32 featured = 3; * @param values the featured to add * @return this */ @@ -437,7 +437,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 up_info = 5; + * repeated uint32 up_info = 9; * @return whether the upInfo field is set */ public boolean hasUpInfo() { @@ -445,7 +445,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 up_info = 5; + * repeated uint32 up_info = 9; * @return this */ public GachaInfo clearUpInfo() { @@ -455,7 +455,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 up_info = 5; + * repeated uint32 up_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. @@ -469,7 +469,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 up_info = 5; + * repeated uint32 up_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 @@ -483,7 +483,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 up_info = 5; + * repeated uint32 up_info = 9; * @param value the upInfo to add * @return this */ @@ -494,7 +494,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 up_info = 5; + * repeated uint32 up_info = 9; * @param values the upInfo to add * @return this */ @@ -610,19 +610,19 @@ public final class GachaInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 32); output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 64); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(gachaId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 50); output.writeMessageNoTag(gachaCeiling); } if ((bitField0_ & 0x00000010) != 0) { @@ -630,18 +630,18 @@ public final class GachaInfoOuterClass { output.writeStringNoTag(detailUrl); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 106); output.writeStringNoTag(historyUrl); } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < featured.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(featured.array()[i]); } } if ((bitField0_ & 0x00000080) != 0) { for (int i = 0; i < upInfo.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(upInfo.array()[i]); } } @@ -684,34 +684,34 @@ public final class GachaInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 32: { // beginTime beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 64) { break; } } - case 96: { + case 64: { // endTime endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 88) { break; } } - case 104: { + case 88: { // gachaId gachaId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 74) { + if (tag != 50) { break; } } - case 74: { + case 50: { // gachaCeiling input.readMessage(gachaCeiling); bitField0_ |= 0x00000008; @@ -725,29 +725,29 @@ public final class GachaInfoOuterClass { input.readString(detailUrl); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 50) { + if (tag != 106) { break; } } - case 50: { + case 106: { // historyUrl input.readString(historyUrl); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 10) { + if (tag != 26) { break; } } - case 10: { + case 26: { // featured [packed=true] input.readPackedUInt32(featured, tag); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 42) { + if (tag != 74) { break; } } - case 42: { + case 74: { // upInfo [packed=true] input.readPackedUInt32(upInfo, tag); bitField0_ |= 0x00000080; @@ -766,13 +766,13 @@ public final class GachaInfoOuterClass { tag = input.readTag(); break; } - case 8: { + case 24: { // featured [packed=false] tag = input.readRepeatedUInt32(featured, tag); bitField0_ |= 0x00000040; break; } - case 40: { + case 72: { // upInfo [packed=false] tag = input.readRepeatedUInt32(upInfo, tag); bitField0_ |= 0x00000080; diff --git a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java index 011bdbd..777dfe9 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java @@ -19,22 +19,22 @@ public final class GachaItemOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool is_new = 4; + * optional bool is_new = 10; */ private boolean isNew; /** - * optional .ItemList token_item = 6; - */ - private final ItemListOuterClass.ItemList tokenItem = ItemListOuterClass.ItemList.newInstance(); - - /** - * optional .Item gacha_item = 7; + * optional .Item gacha_item = 3; */ private final ItemOuterClass.Item gachaItem = ItemOuterClass.Item.newInstance(); /** - * optional .ItemList transfer_item_list = 10; + * optional .ItemList token_item = 4; + */ + private final ItemListOuterClass.ItemList tokenItem = ItemListOuterClass.ItemList.newInstance(); + + /** + * optional .ItemList transfer_item_list = 9; */ private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance(); @@ -49,7 +49,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 4; + * optional bool is_new = 10; * @return whether the isNew field is set */ public boolean hasIsNew() { @@ -57,7 +57,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 4; + * optional bool is_new = 10; * @return this */ public GachaItem clearIsNew() { @@ -67,7 +67,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 4; + * optional bool is_new = 10; * @return the isNew */ public boolean getIsNew() { @@ -75,7 +75,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 4; + * optional bool is_new = 10; * @param value the isNew to set * @return this */ @@ -86,82 +86,25 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList token_item = 6; - * @return whether the tokenItem field is set + * optional .Item gacha_item = 3; + * @return whether the gachaItem field is set */ - public boolean hasTokenItem() { + public boolean hasGachaItem() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .ItemList token_item = 6; - * @return this - */ - public GachaItem clearTokenItem() { - bitField0_ &= ~0x00000002; - tokenItem.clear(); - return this; - } - - /** - * optional .ItemList token_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. - * - * 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 = 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 getMutableTokenItem() { - bitField0_ |= 0x00000002; - return tokenItem; - } - - /** - * optional .ItemList token_item = 6; - * @param value the tokenItem to set - * @return this - */ - public GachaItem setTokenItem(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000002; - tokenItem.copyFrom(value); - return this; - } - - /** - * optional .Item gacha_item = 7; - * @return whether the gachaItem field is set - */ - public boolean hasGachaItem() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .Item gacha_item = 7; + * optional .Item gacha_item = 3; * @return this */ public GachaItem clearGachaItem() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; gachaItem.clear(); return this; } /** - * optional .Item gacha_item = 7; + * optional .Item gacha_item = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -175,7 +118,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 7; + * optional .Item gacha_item = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -184,23 +127,80 @@ public final class GachaItemOuterClass { * @return internal storage object for modifications */ public ItemOuterClass.Item getMutableGachaItem() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return gachaItem; } /** - * optional .Item gacha_item = 7; + * optional .Item gacha_item = 3; * @param value the gachaItem to set * @return this */ public GachaItem setGachaItem(final ItemOuterClass.Item value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; gachaItem.copyFrom(value); return this; } /** - * optional .ItemList transfer_item_list = 10; + * optional .ItemList token_item = 4; + * @return whether the tokenItem field is set + */ + public boolean hasTokenItem() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .ItemList token_item = 4; + * @return this + */ + public GachaItem clearTokenItem() { + bitField0_ &= ~0x00000004; + tokenItem.clear(); + return this; + } + + /** + * optional .ItemList token_item = 4; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * 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 = 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 ItemListOuterClass.ItemList getMutableTokenItem() { + bitField0_ |= 0x00000004; + return tokenItem; + } + + /** + * optional .ItemList token_item = 4; + * @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 = 9; * @return whether the transferItemList field is set */ public boolean hasTransferItemList() { @@ -208,7 +208,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList transfer_item_list = 10; + * optional .ItemList transfer_item_list = 9; * @return this */ public GachaItem clearTransferItemList() { @@ -218,7 +218,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList transfer_item_list = 10; + * optional .ItemList transfer_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. @@ -232,7 +232,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList transfer_item_list = 10; + * optional .ItemList transfer_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 @@ -246,7 +246,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList transfer_item_list = 10; + * optional .ItemList transfer_item_list = 9; * @param value the transferItemList to set * @return this */ @@ -262,8 +262,8 @@ public final class GachaItemOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; isNew = other.isNew; - tokenItem.copyFrom(other.tokenItem); gachaItem.copyFrom(other.gachaItem); + tokenItem.copyFrom(other.tokenItem); transferItemList.copyFrom(other.transferItemList); } return this; @@ -278,12 +278,12 @@ public final class GachaItemOuterClass { if (other.hasIsNew()) { setIsNew(other.isNew); } - if (other.hasTokenItem()) { - getMutableTokenItem().mergeFrom(other.tokenItem); - } if (other.hasGachaItem()) { getMutableGachaItem().mergeFrom(other.gachaItem); } + if (other.hasTokenItem()) { + getMutableTokenItem().mergeFrom(other.tokenItem); + } if (other.hasTransferItemList()) { getMutableTransferItemList().mergeFrom(other.transferItemList); } @@ -298,8 +298,8 @@ public final class GachaItemOuterClass { cachedSize = -1; bitField0_ = 0; isNew = false; - tokenItem.clear(); gachaItem.clear(); + tokenItem.clear(); transferItemList.clear(); return this; } @@ -311,8 +311,8 @@ public final class GachaItemOuterClass { } cachedSize = -1; bitField0_ = 0; - tokenItem.clearQuick(); gachaItem.clearQuick(); + tokenItem.clearQuick(); transferItemList.clearQuick(); return this; } @@ -328,27 +328,27 @@ public final class GachaItemOuterClass { GachaItem other = (GachaItem) o; return bitField0_ == other.bitField0_ && (!hasIsNew() || isNew == other.isNew) - && (!hasTokenItem() || tokenItem.equals(other.tokenItem)) && (!hasGachaItem() || gachaItem.equals(other.gachaItem)) + && (!hasTokenItem() || tokenItem.equals(other.tokenItem)) && (!hasTransferItemList() || transferItemList.equals(other.transferItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 80); output.writeBoolNoTag(isNew); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(tokenItem); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 26); output.writeMessageNoTag(gachaItem); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 34); + output.writeMessageNoTag(tokenItem); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 74); output.writeMessageNoTag(transferItemList); } } @@ -360,10 +360,10 @@ public final class GachaItemOuterClass { size += 2; } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(tokenItem); + size += 1 + ProtoSink.computeMessageSizeNoTag(gachaItem); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(gachaItem); + size += 1 + ProtoSink.computeMessageSizeNoTag(tokenItem); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(transferItemList); @@ -378,34 +378,34 @@ public final class GachaItemOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 80: { // isNew isNew = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 26) { break; } } - case 50: { - // tokenItem - input.readMessage(tokenItem); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { + case 26: { // gachaItem input.readMessage(gachaItem); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { + if (tag != 34) { break; } } - case 82: { + case 34: { + // tokenItem + input.readMessage(tokenItem); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { // transferItemList input.readMessage(transferItemList); bitField0_ |= 0x00000008; @@ -435,10 +435,10 @@ public final class GachaItemOuterClass { output.writeBool(FieldNames.isNew, isNew); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.tokenItem, tokenItem); + output.writeMessage(FieldNames.gachaItem, gachaItem); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.gachaItem, gachaItem); + output.writeMessage(FieldNames.tokenItem, tokenItem); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.transferItemList, transferItemList); @@ -465,11 +465,11 @@ public final class GachaItemOuterClass { } break; } - case 141165740: - case 101174681: { - if (input.isAtField(FieldNames.tokenItem)) { + case 802515893: + case -871807056: { + if (input.isAtField(FieldNames.gachaItem)) { if (!input.trySkipNullValue()) { - input.readMessage(tokenItem); + input.readMessage(gachaItem); bitField0_ |= 0x00000002; } } else { @@ -477,11 +477,11 @@ public final class GachaItemOuterClass { } break; } - case 802515893: - case -871807056: { - if (input.isAtField(FieldNames.gachaItem)) { + case 141165740: + case 101174681: { + if (input.isAtField(FieldNames.tokenItem)) { if (!input.trySkipNullValue()) { - input.readMessage(gachaItem); + input.readMessage(tokenItem); bitField0_ |= 0x00000004; } } else { @@ -555,10 +555,10 @@ public final class GachaItemOuterClass { static class FieldNames { static final FieldName isNew = FieldName.forField("isNew", "is_new"); - static final FieldName tokenItem = FieldName.forField("tokenItem", "token_item"); - static final FieldName gachaItem = FieldName.forField("gachaItem", "gacha_item"); + static final FieldName tokenItem = FieldName.forField("tokenItem", "token_item"); + static final FieldName transferItemList = FieldName.forField("transferItemList", "transfer_item_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java index 56aba70..9d4f635 100644 --- a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java @@ -20,91 +20,87 @@ public final class GateserverOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 port = 7; + * optional uint32 port = 1; */ private int port; /** - * optional bool unk1 = 4; + * optional bool unk1 = 7; */ private boolean unk1; /** - * optional bool unk2 = 8; + * optional bool unk2 = 11; */ private boolean unk2; /** - * optional bool unk3 = 66; + * optional bool unk3 = 960; */ private boolean unk3; /** - * optional bool unk4 = 551; + * optional bool unk4 = 1120; */ private boolean unk4; /** - * 
-     * bool unk5 = 646;
-     *
- * - * optional bool unk5 = 929; + * optional bool unk5 = 1362; */ private boolean unk5; /** - * optional bool unk6 = 979; + * optional bool unk6 = 1906; */ private boolean unk6; /** - * optional string asset_bundle_url = 1; - */ - private final Utf8String assetBundleUrl = Utf8String.newEmptyInstance(); - - /** - * optional string ex_resource_url = 9; - */ - private final Utf8String exResourceUrl = Utf8String.newEmptyInstance(); - - /** - * optional string lua_url = 11; + * optional string lua_url = 3; */ private final Utf8String luaUrl = Utf8String.newEmptyInstance(); /** - * optional string ip = 12; - */ - private final Utf8String ip = Utf8String.newEmptyInstance(); - - /** - * optional string region_name = 13; + * optional string region_name = 5; */ private final Utf8String regionName = Utf8String.newEmptyInstance(); /** - * optional string ifix_url = 140; + * optional string ex_resource_url = 6; + */ + private final Utf8String exResourceUrl = Utf8String.newEmptyInstance(); + + /** + * optional string ip = 10; + */ + private final Utf8String ip = Utf8String.newEmptyInstance(); + + /** + * optional string asset_bundle_url = 12; + */ + private final Utf8String assetBundleUrl = Utf8String.newEmptyInstance(); + + /** + * optional string ifix_url = 150; */ private final Utf8String ifixUrl = Utf8String.newEmptyInstance(); /** - * optional string client_secret_key = 591; + * optional string client_secret_key = 605; */ private final Utf8String clientSecretKey = Utf8String.newEmptyInstance(); /** - * optional string msg = 1076; - */ - private final Utf8String msg = Utf8String.newEmptyInstance(); - - /** - * optional string ifix_version = 1444; + * optional string ifix_version = 687; */ private final Utf8String ifixVersion = Utf8String.newEmptyInstance(); /** - * optional string mdk_res_version = 1456; + * optional string msg = 1836; + */ + private final Utf8String msg = Utf8String.newEmptyInstance(); + + /** + * optional string mdk_res_version = 2010; */ private final Utf8String mdkResVersion = Utf8String.newEmptyInstance(); @@ -119,7 +115,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 7; + * optional uint32 port = 1; * @return whether the port field is set */ public boolean hasPort() { @@ -127,7 +123,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 7; + * optional uint32 port = 1; * @return this */ public Gateserver clearPort() { @@ -137,7 +133,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 7; + * optional uint32 port = 1; * @return the port */ public int getPort() { @@ -145,7 +141,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 7; + * optional uint32 port = 1; * @param value the port to set * @return this */ @@ -156,7 +152,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 4; + * optional bool unk1 = 7; * @return whether the unk1 field is set */ public boolean hasUnk1() { @@ -164,7 +160,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 4; + * optional bool unk1 = 7; * @return this */ public Gateserver clearUnk1() { @@ -174,7 +170,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 4; + * optional bool unk1 = 7; * @return the unk1 */ public boolean getUnk1() { @@ -182,7 +178,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 4; + * optional bool unk1 = 7; * @param value the unk1 to set * @return this */ @@ -193,7 +189,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 8; + * optional bool unk2 = 11; * @return whether the unk2 field is set */ public boolean hasUnk2() { @@ -201,7 +197,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 8; + * optional bool unk2 = 11; * @return this */ public Gateserver clearUnk2() { @@ -211,7 +207,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 8; + * optional bool unk2 = 11; * @return the unk2 */ public boolean getUnk2() { @@ -219,7 +215,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 8; + * optional bool unk2 = 11; * @param value the unk2 to set * @return this */ @@ -230,7 +226,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 66; + * optional bool unk3 = 960; * @return whether the unk3 field is set */ public boolean hasUnk3() { @@ -238,7 +234,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 66; + * optional bool unk3 = 960; * @return this */ public Gateserver clearUnk3() { @@ -248,7 +244,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 66; + * optional bool unk3 = 960; * @return the unk3 */ public boolean getUnk3() { @@ -256,7 +252,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 66; + * optional bool unk3 = 960; * @param value the unk3 to set * @return this */ @@ -267,7 +263,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk4 = 551; + * optional bool unk4 = 1120; * @return whether the unk4 field is set */ public boolean hasUnk4() { @@ -275,7 +271,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk4 = 551; + * optional bool unk4 = 1120; * @return this */ public Gateserver clearUnk4() { @@ -285,7 +281,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk4 = 551; + * optional bool unk4 = 1120; * @return the unk4 */ public boolean getUnk4() { @@ -293,7 +289,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk4 = 551; + * optional bool unk4 = 1120; * @param value the unk4 to set * @return this */ @@ -304,11 +300,7 @@ public final class GateserverOuterClass { } /** - * 
-     * bool unk5 = 646;
-     *
- * - * optional bool unk5 = 929; + * optional bool unk5 = 1362; * @return whether the unk5 field is set */ public boolean hasUnk5() { @@ -316,11 +308,7 @@ public final class GateserverOuterClass { } /** - * 
-     * bool unk5 = 646;
-     *
- * - * optional bool unk5 = 929; + * optional bool unk5 = 1362; * @return this */ public Gateserver clearUnk5() { @@ -330,11 +318,7 @@ public final class GateserverOuterClass { } /** - * 
-     * bool unk5 = 646;
-     *
- * - * optional bool unk5 = 929; + * optional bool unk5 = 1362; * @return the unk5 */ public boolean getUnk5() { @@ -342,11 +326,7 @@ public final class GateserverOuterClass { } /** - * 
-     * bool unk5 = 646;
-     *
- * - * optional bool unk5 = 929; + * optional bool unk5 = 1362; * @param value the unk5 to set * @return this */ @@ -357,7 +337,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk6 = 979; + * optional bool unk6 = 1906; * @return whether the unk6 field is set */ public boolean hasUnk6() { @@ -365,7 +345,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk6 = 979; + * optional bool unk6 = 1906; * @return this */ public Gateserver clearUnk6() { @@ -375,7 +355,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk6 = 979; + * optional bool unk6 = 1906; * @return the unk6 */ public boolean getUnk6() { @@ -383,7 +363,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk6 = 979; + * optional bool unk6 = 1906; * @param value the unk6 to set * @return this */ @@ -394,155 +374,25 @@ public final class GateserverOuterClass { } /** - * optional string asset_bundle_url = 1; - * @return whether the assetBundleUrl field is set + * optional string lua_url = 3; + * @return whether the luaUrl field is set */ - public boolean hasAssetBundleUrl() { + public boolean hasLuaUrl() { return (bitField0_ & 0x00000080) != 0; } /** - * optional string asset_bundle_url = 1; - * @return this - */ - public Gateserver clearAssetBundleUrl() { - bitField0_ &= ~0x00000080; - assetBundleUrl.clear(); - return this; - } - - /** - * optional string asset_bundle_url = 1; - * @return the assetBundleUrl - */ - public String getAssetBundleUrl() { - return assetBundleUrl.getString(); - } - - /** - * optional string asset_bundle_url = 1; - * @return internal {@code Utf8String} representation of assetBundleUrl for reading - */ - public Utf8String getAssetBundleUrlBytes() { - return this.assetBundleUrl; - } - - /** - * optional string asset_bundle_url = 1; - * @return internal {@code Utf8String} representation of assetBundleUrl for modifications - */ - public Utf8String getMutableAssetBundleUrlBytes() { - bitField0_ |= 0x00000080; - return this.assetBundleUrl; - } - - /** - * optional string asset_bundle_url = 1; - * @param value the assetBundleUrl to set - * @return this - */ - public Gateserver setAssetBundleUrl(final CharSequence value) { - bitField0_ |= 0x00000080; - assetBundleUrl.copyFrom(value); - return this; - } - - /** - * optional string asset_bundle_url = 1; - * @param value the assetBundleUrl to set - * @return this - */ - public Gateserver setAssetBundleUrl(final Utf8String value) { - bitField0_ |= 0x00000080; - assetBundleUrl.copyFrom(value); - return this; - } - - /** - * optional string ex_resource_url = 9; - * @return whether the exResourceUrl field is set - */ - public boolean hasExResourceUrl() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * optional string ex_resource_url = 9; - * @return this - */ - public Gateserver clearExResourceUrl() { - bitField0_ &= ~0x00000100; - exResourceUrl.clear(); - return this; - } - - /** - * optional string ex_resource_url = 9; - * @return the exResourceUrl - */ - public String getExResourceUrl() { - return exResourceUrl.getString(); - } - - /** - * optional string ex_resource_url = 9; - * @return internal {@code Utf8String} representation of exResourceUrl for reading - */ - public Utf8String getExResourceUrlBytes() { - return this.exResourceUrl; - } - - /** - * optional string ex_resource_url = 9; - * @return internal {@code Utf8String} representation of exResourceUrl for modifications - */ - public Utf8String getMutableExResourceUrlBytes() { - bitField0_ |= 0x00000100; - return this.exResourceUrl; - } - - /** - * optional string ex_resource_url = 9; - * @param value the exResourceUrl to set - * @return this - */ - public Gateserver setExResourceUrl(final CharSequence value) { - bitField0_ |= 0x00000100; - exResourceUrl.copyFrom(value); - return this; - } - - /** - * optional string ex_resource_url = 9; - * @param value the exResourceUrl to set - * @return this - */ - public Gateserver setExResourceUrl(final Utf8String value) { - bitField0_ |= 0x00000100; - exResourceUrl.copyFrom(value); - return this; - } - - /** - * optional string lua_url = 11; - * @return whether the luaUrl field is set - */ - public boolean hasLuaUrl() { - return (bitField0_ & 0x00000200) != 0; - } - - /** - * optional string lua_url = 11; + * optional string lua_url = 3; * @return this */ public Gateserver clearLuaUrl() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000080; luaUrl.clear(); return this; } /** - * optional string lua_url = 11; + * optional string lua_url = 3; * @return the luaUrl */ public String getLuaUrl() { @@ -550,7 +400,7 @@ public final class GateserverOuterClass { } /** - * optional string lua_url = 11; + * optional string lua_url = 3; * @return internal {@code Utf8String} representation of luaUrl for reading */ public Utf8String getLuaUrlBytes() { @@ -558,38 +408,168 @@ public final class GateserverOuterClass { } /** - * optional string lua_url = 11; + * optional string lua_url = 3; * @return internal {@code Utf8String} representation of luaUrl for modifications */ public Utf8String getMutableLuaUrlBytes() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; return this.luaUrl; } /** - * optional string lua_url = 11; + * optional string lua_url = 3; * @param value the luaUrl to set * @return this */ public Gateserver setLuaUrl(final CharSequence value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; luaUrl.copyFrom(value); return this; } /** - * optional string lua_url = 11; + * optional string lua_url = 3; * @param value the luaUrl to set * @return this */ public Gateserver setLuaUrl(final Utf8String value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; luaUrl.copyFrom(value); return this; } /** - * optional string ip = 12; + * optional string region_name = 5; + * @return whether the regionName field is set + */ + public boolean hasRegionName() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * optional string region_name = 5; + * @return this + */ + public Gateserver clearRegionName() { + bitField0_ &= ~0x00000100; + regionName.clear(); + return this; + } + + /** + * optional string region_name = 5; + * @return the regionName + */ + public String getRegionName() { + return regionName.getString(); + } + + /** + * optional string region_name = 5; + * @return internal {@code Utf8String} representation of regionName for reading + */ + public Utf8String getRegionNameBytes() { + return this.regionName; + } + + /** + * optional string region_name = 5; + * @return internal {@code Utf8String} representation of regionName for modifications + */ + public Utf8String getMutableRegionNameBytes() { + bitField0_ |= 0x00000100; + return this.regionName; + } + + /** + * optional string region_name = 5; + * @param value the regionName to set + * @return this + */ + public Gateserver setRegionName(final CharSequence value) { + bitField0_ |= 0x00000100; + regionName.copyFrom(value); + return this; + } + + /** + * optional string region_name = 5; + * @param value the regionName to set + * @return this + */ + public Gateserver setRegionName(final Utf8String value) { + bitField0_ |= 0x00000100; + regionName.copyFrom(value); + return this; + } + + /** + * optional string ex_resource_url = 6; + * @return whether the exResourceUrl field is set + */ + public boolean hasExResourceUrl() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * optional string ex_resource_url = 6; + * @return this + */ + public Gateserver clearExResourceUrl() { + bitField0_ &= ~0x00000200; + exResourceUrl.clear(); + return this; + } + + /** + * optional string ex_resource_url = 6; + * @return the exResourceUrl + */ + public String getExResourceUrl() { + return exResourceUrl.getString(); + } + + /** + * optional string ex_resource_url = 6; + * @return internal {@code Utf8String} representation of exResourceUrl for reading + */ + public Utf8String getExResourceUrlBytes() { + return this.exResourceUrl; + } + + /** + * optional string ex_resource_url = 6; + * @return internal {@code Utf8String} representation of exResourceUrl for modifications + */ + public Utf8String getMutableExResourceUrlBytes() { + bitField0_ |= 0x00000200; + return this.exResourceUrl; + } + + /** + * optional string ex_resource_url = 6; + * @param value the exResourceUrl to set + * @return this + */ + public Gateserver setExResourceUrl(final CharSequence value) { + bitField0_ |= 0x00000200; + exResourceUrl.copyFrom(value); + return this; + } + + /** + * optional string ex_resource_url = 6; + * @param value the exResourceUrl to set + * @return this + */ + public Gateserver setExResourceUrl(final Utf8String value) { + bitField0_ |= 0x00000200; + exResourceUrl.copyFrom(value); + return this; + } + + /** + * optional string ip = 10; * @return whether the ip field is set */ public boolean hasIp() { @@ -597,7 +577,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 12; + * optional string ip = 10; * @return this */ public Gateserver clearIp() { @@ -607,7 +587,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 12; + * optional string ip = 10; * @return the ip */ public String getIp() { @@ -615,7 +595,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 12; + * optional string ip = 10; * @return internal {@code Utf8String} representation of ip for reading */ public Utf8String getIpBytes() { @@ -623,7 +603,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 12; + * optional string ip = 10; * @return internal {@code Utf8String} representation of ip for modifications */ public Utf8String getMutableIpBytes() { @@ -632,7 +612,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 12; + * optional string ip = 10; * @param value the ip to set * @return this */ @@ -643,7 +623,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 12; + * optional string ip = 10; * @param value the ip to set * @return this */ @@ -654,72 +634,72 @@ public final class GateserverOuterClass { } /** - * optional string region_name = 13; - * @return whether the regionName field is set + * optional string asset_bundle_url = 12; + * @return whether the assetBundleUrl field is set */ - public boolean hasRegionName() { + public boolean hasAssetBundleUrl() { return (bitField0_ & 0x00000800) != 0; } /** - * optional string region_name = 13; + * optional string asset_bundle_url = 12; * @return this */ - public Gateserver clearRegionName() { + public Gateserver clearAssetBundleUrl() { bitField0_ &= ~0x00000800; - regionName.clear(); + assetBundleUrl.clear(); return this; } /** - * optional string region_name = 13; - * @return the regionName + * optional string asset_bundle_url = 12; + * @return the assetBundleUrl */ - public String getRegionName() { - return regionName.getString(); + public String getAssetBundleUrl() { + return assetBundleUrl.getString(); } /** - * optional string region_name = 13; - * @return internal {@code Utf8String} representation of regionName for reading + * optional string asset_bundle_url = 12; + * @return internal {@code Utf8String} representation of assetBundleUrl for reading */ - public Utf8String getRegionNameBytes() { - return this.regionName; + public Utf8String getAssetBundleUrlBytes() { + return this.assetBundleUrl; } /** - * optional string region_name = 13; - * @return internal {@code Utf8String} representation of regionName for modifications + * optional string asset_bundle_url = 12; + * @return internal {@code Utf8String} representation of assetBundleUrl for modifications */ - public Utf8String getMutableRegionNameBytes() { + public Utf8String getMutableAssetBundleUrlBytes() { bitField0_ |= 0x00000800; - return this.regionName; + return this.assetBundleUrl; } /** - * optional string region_name = 13; - * @param value the regionName to set + * optional string asset_bundle_url = 12; + * @param value the assetBundleUrl to set * @return this */ - public Gateserver setRegionName(final CharSequence value) { + public Gateserver setAssetBundleUrl(final CharSequence value) { bitField0_ |= 0x00000800; - regionName.copyFrom(value); + assetBundleUrl.copyFrom(value); return this; } /** - * optional string region_name = 13; - * @param value the regionName to set + * optional string asset_bundle_url = 12; + * @param value the assetBundleUrl to set * @return this */ - public Gateserver setRegionName(final Utf8String value) { + public Gateserver setAssetBundleUrl(final Utf8String value) { bitField0_ |= 0x00000800; - regionName.copyFrom(value); + assetBundleUrl.copyFrom(value); return this; } /** - * optional string ifix_url = 140; + * optional string ifix_url = 150; * @return whether the ifixUrl field is set */ public boolean hasIfixUrl() { @@ -727,7 +707,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_url = 140; + * optional string ifix_url = 150; * @return this */ public Gateserver clearIfixUrl() { @@ -737,7 +717,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_url = 140; + * optional string ifix_url = 150; * @return the ifixUrl */ public String getIfixUrl() { @@ -745,7 +725,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_url = 140; + * optional string ifix_url = 150; * @return internal {@code Utf8String} representation of ifixUrl for reading */ public Utf8String getIfixUrlBytes() { @@ -753,7 +733,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_url = 140; + * optional string ifix_url = 150; * @return internal {@code Utf8String} representation of ifixUrl for modifications */ public Utf8String getMutableIfixUrlBytes() { @@ -762,7 +742,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_url = 140; + * optional string ifix_url = 150; * @param value the ifixUrl to set * @return this */ @@ -773,7 +753,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_url = 140; + * optional string ifix_url = 150; * @param value the ifixUrl to set * @return this */ @@ -784,7 +764,7 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 591; + * optional string client_secret_key = 605; * @return whether the clientSecretKey field is set */ public boolean hasClientSecretKey() { @@ -792,7 +772,7 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 591; + * optional string client_secret_key = 605; * @return this */ public Gateserver clearClientSecretKey() { @@ -802,7 +782,7 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 591; + * optional string client_secret_key = 605; * @return the clientSecretKey */ public String getClientSecretKey() { @@ -810,7 +790,7 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 591; + * optional string client_secret_key = 605; * @return internal {@code Utf8String} representation of clientSecretKey for reading */ public Utf8String getClientSecretKeyBytes() { @@ -818,7 +798,7 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 591; + * optional string client_secret_key = 605; * @return internal {@code Utf8String} representation of clientSecretKey for modifications */ public Utf8String getMutableClientSecretKeyBytes() { @@ -827,7 +807,7 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 591; + * optional string client_secret_key = 605; * @param value the clientSecretKey to set * @return this */ @@ -838,7 +818,7 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 591; + * optional string client_secret_key = 605; * @param value the clientSecretKey to set * @return this */ @@ -849,90 +829,25 @@ public final class GateserverOuterClass { } /** - * optional string msg = 1076; - * @return whether the msg field is set + * optional string ifix_version = 687; + * @return whether the ifixVersion field is set */ - public boolean hasMsg() { + public boolean hasIfixVersion() { return (bitField0_ & 0x00004000) != 0; } /** - * optional string msg = 1076; - * @return this - */ - public Gateserver clearMsg() { - bitField0_ &= ~0x00004000; - msg.clear(); - return this; - } - - /** - * optional string msg = 1076; - * @return the msg - */ - public String getMsg() { - return msg.getString(); - } - - /** - * optional string msg = 1076; - * @return internal {@code Utf8String} representation of msg for reading - */ - public Utf8String getMsgBytes() { - return this.msg; - } - - /** - * optional string msg = 1076; - * @return internal {@code Utf8String} representation of msg for modifications - */ - public Utf8String getMutableMsgBytes() { - bitField0_ |= 0x00004000; - return this.msg; - } - - /** - * optional string msg = 1076; - * @param value the msg to set - * @return this - */ - public Gateserver setMsg(final CharSequence value) { - bitField0_ |= 0x00004000; - msg.copyFrom(value); - return this; - } - - /** - * optional string msg = 1076; - * @param value the msg to set - * @return this - */ - public Gateserver setMsg(final Utf8String value) { - bitField0_ |= 0x00004000; - msg.copyFrom(value); - return this; - } - - /** - * optional string ifix_version = 1444; - * @return whether the ifixVersion field is set - */ - public boolean hasIfixVersion() { - return (bitField0_ & 0x00008000) != 0; - } - - /** - * optional string ifix_version = 1444; + * optional string ifix_version = 687; * @return this */ public Gateserver clearIfixVersion() { - bitField0_ &= ~0x00008000; + bitField0_ &= ~0x00004000; ifixVersion.clear(); return this; } /** - * optional string ifix_version = 1444; + * optional string ifix_version = 687; * @return the ifixVersion */ public String getIfixVersion() { @@ -940,7 +855,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_version = 1444; + * optional string ifix_version = 687; * @return internal {@code Utf8String} representation of ifixVersion for reading */ public Utf8String getIfixVersionBytes() { @@ -948,38 +863,103 @@ public final class GateserverOuterClass { } /** - * optional string ifix_version = 1444; + * optional string ifix_version = 687; * @return internal {@code Utf8String} representation of ifixVersion for modifications */ public Utf8String getMutableIfixVersionBytes() { - bitField0_ |= 0x00008000; + bitField0_ |= 0x00004000; return this.ifixVersion; } /** - * optional string ifix_version = 1444; + * optional string ifix_version = 687; * @param value the ifixVersion to set * @return this */ public Gateserver setIfixVersion(final CharSequence value) { - bitField0_ |= 0x00008000; + bitField0_ |= 0x00004000; ifixVersion.copyFrom(value); return this; } /** - * optional string ifix_version = 1444; + * optional string ifix_version = 687; * @param value the ifixVersion to set * @return this */ public Gateserver setIfixVersion(final Utf8String value) { - bitField0_ |= 0x00008000; + bitField0_ |= 0x00004000; ifixVersion.copyFrom(value); return this; } /** - * optional string mdk_res_version = 1456; + * optional string msg = 1836; + * @return whether the msg field is set + */ + public boolean hasMsg() { + return (bitField0_ & 0x00008000) != 0; + } + + /** + * optional string msg = 1836; + * @return this + */ + public Gateserver clearMsg() { + bitField0_ &= ~0x00008000; + msg.clear(); + return this; + } + + /** + * optional string msg = 1836; + * @return the msg + */ + public String getMsg() { + return msg.getString(); + } + + /** + * optional string msg = 1836; + * @return internal {@code Utf8String} representation of msg for reading + */ + public Utf8String getMsgBytes() { + return this.msg; + } + + /** + * optional string msg = 1836; + * @return internal {@code Utf8String} representation of msg for modifications + */ + public Utf8String getMutableMsgBytes() { + bitField0_ |= 0x00008000; + return this.msg; + } + + /** + * optional string msg = 1836; + * @param value the msg to set + * @return this + */ + public Gateserver setMsg(final CharSequence value) { + bitField0_ |= 0x00008000; + msg.copyFrom(value); + return this; + } + + /** + * optional string msg = 1836; + * @param value the msg to set + * @return this + */ + public Gateserver setMsg(final Utf8String value) { + bitField0_ |= 0x00008000; + msg.copyFrom(value); + return this; + } + + /** + * optional string mdk_res_version = 2010; * @return whether the mdkResVersion field is set */ public boolean hasMdkResVersion() { @@ -987,7 +967,7 @@ public final class GateserverOuterClass { } /** - * optional string mdk_res_version = 1456; + * optional string mdk_res_version = 2010; * @return this */ public Gateserver clearMdkResVersion() { @@ -997,7 +977,7 @@ public final class GateserverOuterClass { } /** - * optional string mdk_res_version = 1456; + * optional string mdk_res_version = 2010; * @return the mdkResVersion */ public String getMdkResVersion() { @@ -1005,7 +985,7 @@ public final class GateserverOuterClass { } /** - * optional string mdk_res_version = 1456; + * optional string mdk_res_version = 2010; * @return internal {@code Utf8String} representation of mdkResVersion for reading */ public Utf8String getMdkResVersionBytes() { @@ -1013,7 +993,7 @@ public final class GateserverOuterClass { } /** - * optional string mdk_res_version = 1456; + * optional string mdk_res_version = 2010; * @return internal {@code Utf8String} representation of mdkResVersion for modifications */ public Utf8String getMutableMdkResVersionBytes() { @@ -1022,7 +1002,7 @@ public final class GateserverOuterClass { } /** - * optional string mdk_res_version = 1456; + * optional string mdk_res_version = 2010; * @param value the mdkResVersion to set * @return this */ @@ -1033,7 +1013,7 @@ public final class GateserverOuterClass { } /** - * optional string mdk_res_version = 1456; + * optional string mdk_res_version = 2010; * @param value the mdkResVersion to set * @return this */ @@ -1055,15 +1035,15 @@ public final class GateserverOuterClass { unk4 = other.unk4; unk5 = other.unk5; unk6 = other.unk6; - assetBundleUrl.copyFrom(other.assetBundleUrl); - exResourceUrl.copyFrom(other.exResourceUrl); luaUrl.copyFrom(other.luaUrl); - ip.copyFrom(other.ip); regionName.copyFrom(other.regionName); + exResourceUrl.copyFrom(other.exResourceUrl); + ip.copyFrom(other.ip); + assetBundleUrl.copyFrom(other.assetBundleUrl); ifixUrl.copyFrom(other.ifixUrl); clientSecretKey.copyFrom(other.clientSecretKey); - msg.copyFrom(other.msg); ifixVersion.copyFrom(other.ifixVersion); + msg.copyFrom(other.msg); mdkResVersion.copyFrom(other.mdkResVersion); } return this; @@ -1096,20 +1076,20 @@ public final class GateserverOuterClass { if (other.hasUnk6()) { setUnk6(other.unk6); } - if (other.hasAssetBundleUrl()) { - getMutableAssetBundleUrlBytes().copyFrom(other.assetBundleUrl); + if (other.hasLuaUrl()) { + getMutableLuaUrlBytes().copyFrom(other.luaUrl); + } + if (other.hasRegionName()) { + getMutableRegionNameBytes().copyFrom(other.regionName); } if (other.hasExResourceUrl()) { getMutableExResourceUrlBytes().copyFrom(other.exResourceUrl); } - if (other.hasLuaUrl()) { - getMutableLuaUrlBytes().copyFrom(other.luaUrl); - } if (other.hasIp()) { getMutableIpBytes().copyFrom(other.ip); } - if (other.hasRegionName()) { - getMutableRegionNameBytes().copyFrom(other.regionName); + if (other.hasAssetBundleUrl()) { + getMutableAssetBundleUrlBytes().copyFrom(other.assetBundleUrl); } if (other.hasIfixUrl()) { getMutableIfixUrlBytes().copyFrom(other.ifixUrl); @@ -1117,12 +1097,12 @@ public final class GateserverOuterClass { if (other.hasClientSecretKey()) { getMutableClientSecretKeyBytes().copyFrom(other.clientSecretKey); } - if (other.hasMsg()) { - getMutableMsgBytes().copyFrom(other.msg); - } if (other.hasIfixVersion()) { getMutableIfixVersionBytes().copyFrom(other.ifixVersion); } + if (other.hasMsg()) { + getMutableMsgBytes().copyFrom(other.msg); + } if (other.hasMdkResVersion()) { getMutableMdkResVersionBytes().copyFrom(other.mdkResVersion); } @@ -1143,15 +1123,15 @@ public final class GateserverOuterClass { unk4 = false; unk5 = false; unk6 = false; - assetBundleUrl.clear(); - exResourceUrl.clear(); luaUrl.clear(); - ip.clear(); regionName.clear(); + exResourceUrl.clear(); + ip.clear(); + assetBundleUrl.clear(); ifixUrl.clear(); clientSecretKey.clear(); - msg.clear(); ifixVersion.clear(); + msg.clear(); mdkResVersion.clear(); return this; } @@ -1163,15 +1143,15 @@ public final class GateserverOuterClass { } cachedSize = -1; bitField0_ = 0; - assetBundleUrl.clear(); - exResourceUrl.clear(); luaUrl.clear(); - ip.clear(); regionName.clear(); + exResourceUrl.clear(); + ip.clear(); + assetBundleUrl.clear(); ifixUrl.clear(); clientSecretKey.clear(); - msg.clear(); ifixVersion.clear(); + msg.clear(); mdkResVersion.clear(); return this; } @@ -1193,86 +1173,86 @@ public final class GateserverOuterClass { && (!hasUnk4() || unk4 == other.unk4) && (!hasUnk5() || unk5 == other.unk5) && (!hasUnk6() || unk6 == other.unk6) - && (!hasAssetBundleUrl() || assetBundleUrl.equals(other.assetBundleUrl)) - && (!hasExResourceUrl() || exResourceUrl.equals(other.exResourceUrl)) && (!hasLuaUrl() || luaUrl.equals(other.luaUrl)) - && (!hasIp() || ip.equals(other.ip)) && (!hasRegionName() || regionName.equals(other.regionName)) + && (!hasExResourceUrl() || exResourceUrl.equals(other.exResourceUrl)) + && (!hasIp() || ip.equals(other.ip)) + && (!hasAssetBundleUrl() || assetBundleUrl.equals(other.assetBundleUrl)) && (!hasIfixUrl() || ifixUrl.equals(other.ifixUrl)) && (!hasClientSecretKey() || clientSecretKey.equals(other.clientSecretKey)) - && (!hasMsg() || msg.equals(other.msg)) && (!hasIfixVersion() || ifixVersion.equals(other.ifixVersion)) + && (!hasMsg() || msg.equals(other.msg)) && (!hasMdkResVersion() || mdkResVersion.equals(other.mdkResVersion)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(port); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 56); output.writeBoolNoTag(unk1); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeBoolNoTag(unk2); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 1168); + output.writeRawLittleEndian16((short) 15488); output.writeBoolNoTag(unk3); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 8888); + output.writeRawLittleEndian16((short) 18048); output.writeBoolNoTag(unk4); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawLittleEndian16((short) 14984); + output.writeRawLittleEndian16((short) 21904); output.writeBoolNoTag(unk5); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawLittleEndian16((short) 15768); + output.writeRawLittleEndian16((short) 30608); output.writeBoolNoTag(unk6); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 10); - output.writeStringNoTag(assetBundleUrl); - } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 74); - output.writeStringNoTag(exResourceUrl); - } - if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 26); output.writeStringNoTag(luaUrl); } + if ((bitField0_ & 0x00000100) != 0) { + output.writeRawByte((byte) 42); + output.writeStringNoTag(regionName); + } + if ((bitField0_ & 0x00000200) != 0) { + output.writeRawByte((byte) 50); + output.writeStringNoTag(exResourceUrl); + } if ((bitField0_ & 0x00000400) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 82); output.writeStringNoTag(ip); } if ((bitField0_ & 0x00000800) != 0) { - output.writeRawByte((byte) 106); - output.writeStringNoTag(regionName); + output.writeRawByte((byte) 98); + output.writeStringNoTag(assetBundleUrl); } if ((bitField0_ & 0x00001000) != 0) { - output.writeRawLittleEndian16((short) 2274); + output.writeRawLittleEndian16((short) 2482); output.writeStringNoTag(ifixUrl); } if ((bitField0_ & 0x00002000) != 0) { - output.writeRawLittleEndian16((short) 9466); + output.writeRawLittleEndian16((short) 9706); output.writeStringNoTag(clientSecretKey); } if ((bitField0_ & 0x00004000) != 0) { - output.writeRawLittleEndian16((short) 17314); - output.writeStringNoTag(msg); - } - if ((bitField0_ & 0x00008000) != 0) { - output.writeRawLittleEndian16((short) 23202); + output.writeRawLittleEndian16((short) 11002); output.writeStringNoTag(ifixVersion); } + if ((bitField0_ & 0x00008000) != 0) { + output.writeRawLittleEndian16((short) 29410); + output.writeStringNoTag(msg); + } if ((bitField0_ & 0x00010000) != 0) { - output.writeRawLittleEndian16((short) 23426); + output.writeRawLittleEndian16((short) 32210); output.writeStringNoTag(mdkResVersion); } } @@ -1302,19 +1282,19 @@ public final class GateserverOuterClass { size += 3; } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(assetBundleUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(luaUrl); } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(regionName); } if ((bitField0_ & 0x00000200) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(luaUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl); } if ((bitField0_ & 0x00000400) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(ip); } if ((bitField0_ & 0x00000800) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(regionName); + size += 1 + ProtoSink.computeStringSizeNoTag(assetBundleUrl); } if ((bitField0_ & 0x00001000) != 0) { size += 2 + ProtoSink.computeStringSizeNoTag(ifixUrl); @@ -1323,10 +1303,10 @@ public final class GateserverOuterClass { size += 2 + ProtoSink.computeStringSizeNoTag(clientSecretKey); } if ((bitField0_ & 0x00004000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(msg); + size += 2 + ProtoSink.computeStringSizeNoTag(ifixVersion); } if ((bitField0_ & 0x00008000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(ifixVersion); + size += 2 + ProtoSink.computeStringSizeNoTag(msg); } if ((bitField0_ & 0x00010000) != 0) { size += 2 + ProtoSink.computeStringSizeNoTag(mdkResVersion); @@ -1341,151 +1321,151 @@ public final class GateserverOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 8: { // port port = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 56) { break; } } - case 32: { + case 56: { // unk1 unk1 = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 88) { break; } } - case 64: { + case 88: { // unk2 unk2 = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 528) { + if (tag != 7680) { break; } } - case 528: { + case 7680: { // unk3 unk3 = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 4408) { + if (tag != 8960) { break; } } - case 4408: { + case 8960: { // unk4 unk4 = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 7432) { + if (tag != 10896) { break; } } - case 7432: { + case 10896: { // unk5 unk5 = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 7832) { + if (tag != 15248) { break; } } - case 7832: { + case 15248: { // unk6 unk6 = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 10) { + if (tag != 26) { break; } } - case 10: { - // assetBundleUrl - input.readString(assetBundleUrl); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 74) { - break; - } - } - case 74: { - // exResourceUrl - input.readString(exResourceUrl); - bitField0_ |= 0x00000100; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { + case 26: { // luaUrl input.readString(luaUrl); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { + // regionName + input.readString(regionName); + bitField0_ |= 0x00000100; + tag = input.readTag(); + if (tag != 50) { + break; + } + } + case 50: { + // exResourceUrl + input.readString(exResourceUrl); bitField0_ |= 0x00000200; tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { + // ip + input.readString(ip); + bitField0_ |= 0x00000400; + tag = input.readTag(); if (tag != 98) { break; } } case 98: { - // ip - input.readString(ip); - bitField0_ |= 0x00000400; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { - // regionName - input.readString(regionName); + // assetBundleUrl + input.readString(assetBundleUrl); bitField0_ |= 0x00000800; tag = input.readTag(); - if (tag != 1122) { + if (tag != 1202) { break; } } - case 1122: { + case 1202: { // ifixUrl input.readString(ifixUrl); bitField0_ |= 0x00001000; tag = input.readTag(); - if (tag != 4730) { + if (tag != 4842) { break; } } - case 4730: { + case 4842: { // clientSecretKey input.readString(clientSecretKey); bitField0_ |= 0x00002000; tag = input.readTag(); - if (tag != 8610) { + if (tag != 5498) { break; } } - case 8610: { - // msg - input.readString(msg); - bitField0_ |= 0x00004000; - tag = input.readTag(); - if (tag != 11554) { - break; - } - } - case 11554: { + case 5498: { // ifixVersion input.readString(ifixVersion); - bitField0_ |= 0x00008000; + bitField0_ |= 0x00004000; tag = input.readTag(); - if (tag != 11650) { + if (tag != 14690) { break; } } - case 11650: { + case 14690: { + // msg + input.readString(msg); + bitField0_ |= 0x00008000; + tag = input.readTag(); + if (tag != 16082) { + break; + } + } + case 16082: { // mdkResVersion input.readString(mdkResVersion); bitField0_ |= 0x00010000; @@ -1533,19 +1513,19 @@ public final class GateserverOuterClass { output.writeBool(FieldNames.unk6, unk6); } if ((bitField0_ & 0x00000080) != 0) { - output.writeString(FieldNames.assetBundleUrl, assetBundleUrl); + output.writeString(FieldNames.luaUrl, luaUrl); } if ((bitField0_ & 0x00000100) != 0) { - output.writeString(FieldNames.exResourceUrl, exResourceUrl); + output.writeString(FieldNames.regionName, regionName); } if ((bitField0_ & 0x00000200) != 0) { - output.writeString(FieldNames.luaUrl, luaUrl); + output.writeString(FieldNames.exResourceUrl, exResourceUrl); } if ((bitField0_ & 0x00000400) != 0) { output.writeString(FieldNames.ip, ip); } if ((bitField0_ & 0x00000800) != 0) { - output.writeString(FieldNames.regionName, regionName); + output.writeString(FieldNames.assetBundleUrl, assetBundleUrl); } if ((bitField0_ & 0x00001000) != 0) { output.writeString(FieldNames.ifixUrl, ifixUrl); @@ -1554,10 +1534,10 @@ public final class GateserverOuterClass { output.writeString(FieldNames.clientSecretKey, clientSecretKey); } if ((bitField0_ & 0x00004000) != 0) { - output.writeString(FieldNames.msg, msg); + output.writeString(FieldNames.ifixVersion, ifixVersion); } if ((bitField0_ & 0x00008000) != 0) { - output.writeString(FieldNames.ifixVersion, ifixVersion); + output.writeString(FieldNames.msg, msg); } if ((bitField0_ & 0x00010000) != 0) { output.writeString(FieldNames.mdkResVersion, mdkResVersion); @@ -1649,11 +1629,11 @@ public final class GateserverOuterClass { } break; } - case -1116358531: - case 1973569761: { - if (input.isAtField(FieldNames.assetBundleUrl)) { + case -1091991977: + case 508288168: { + if (input.isAtField(FieldNames.luaUrl)) { if (!input.trySkipNullValue()) { - input.readString(assetBundleUrl); + input.readString(luaUrl); bitField0_ |= 0x00000080; } } else { @@ -1661,23 +1641,23 @@ public final class GateserverOuterClass { } break; } + case -1990689889: + case -1565768458: { + if (input.isAtField(FieldNames.regionName)) { + if (!input.trySkipNullValue()) { + input.readString(regionName); + bitField0_ |= 0x00000100; + } + } else { + input.skipUnknownField(); + } + break; + } case 1643520974: case -1086137910: { if (input.isAtField(FieldNames.exResourceUrl)) { if (!input.trySkipNullValue()) { input.readString(exResourceUrl); - bitField0_ |= 0x00000100; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1091991977: - case 508288168: { - if (input.isAtField(FieldNames.luaUrl)) { - if (!input.trySkipNullValue()) { - input.readString(luaUrl); bitField0_ |= 0x00000200; } } else { @@ -1696,11 +1676,11 @@ public final class GateserverOuterClass { } break; } - case -1990689889: - case -1565768458: { - if (input.isAtField(FieldNames.regionName)) { + case -1116358531: + case 1973569761: { + if (input.isAtField(FieldNames.assetBundleUrl)) { if (!input.trySkipNullValue()) { - input.readString(regionName); + input.readString(assetBundleUrl); bitField0_ |= 0x00000800; } } else { @@ -1732,10 +1712,11 @@ public final class GateserverOuterClass { } break; } - case 108417: { - if (input.isAtField(FieldNames.msg)) { + case 1625073708: + case -827048283: { + if (input.isAtField(FieldNames.ifixVersion)) { if (!input.trySkipNullValue()) { - input.readString(msg); + input.readString(ifixVersion); bitField0_ |= 0x00004000; } } else { @@ -1743,11 +1724,10 @@ public final class GateserverOuterClass { } break; } - case 1625073708: - case -827048283: { - if (input.isAtField(FieldNames.ifixVersion)) { + case 108417: { + if (input.isAtField(FieldNames.msg)) { if (!input.trySkipNullValue()) { - input.readString(ifixVersion); + input.readString(msg); bitField0_ |= 0x00008000; } } else { @@ -1833,24 +1813,24 @@ public final class GateserverOuterClass { static final FieldName unk6 = FieldName.forField("unk6"); - static final FieldName assetBundleUrl = FieldName.forField("assetBundleUrl", "asset_bundle_url"); + static final FieldName luaUrl = FieldName.forField("luaUrl", "lua_url"); + + static final FieldName regionName = FieldName.forField("regionName", "region_name"); static final FieldName exResourceUrl = FieldName.forField("exResourceUrl", "ex_resource_url"); - static final FieldName luaUrl = FieldName.forField("luaUrl", "lua_url"); - static final FieldName ip = FieldName.forField("ip"); - static final FieldName regionName = FieldName.forField("regionName", "region_name"); + static final FieldName assetBundleUrl = FieldName.forField("assetBundleUrl", "asset_bundle_url"); static final FieldName ifixUrl = FieldName.forField("ifixUrl", "ifix_url"); static final FieldName clientSecretKey = FieldName.forField("clientSecretKey", "client_secret_key"); - static final FieldName msg = FieldName.forField("msg"); - static final FieldName ifixVersion = FieldName.forField("ifixVersion", "ifix_version"); + static final FieldName msg = FieldName.forField("msg"); + static final FieldName mdkResVersion = FieldName.forField("mdkResVersion", "mdk_res_version"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java index ae92faf..844ec6e 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 = 3; + * optional uint32 retcode = 4; */ private int retcode; /** - * repeated .ActivityScheduleInfo activity_schedule_list = 9; + * repeated .ActivityScheduleInfo activity_schedule_list = 7; */ private final RepeatedMessage activityScheduleList = RepeatedMessage.newEmptyInstance(ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * 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 GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return this */ public GetActivityScheduleConfigScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 9; + * repeated .ActivityScheduleInfo activity_schedule_list = 7; * @return whether the activityScheduleList field is set */ public boolean hasActivityScheduleList() { @@ -85,7 +85,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 9; + * repeated .ActivityScheduleInfo activity_schedule_list = 7; * @return this */ public GetActivityScheduleConfigScRsp clearActivityScheduleList() { @@ -95,7 +95,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 9; + * repeated .ActivityScheduleInfo activity_schedule_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. @@ -110,7 +110,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 9; + * repeated .ActivityScheduleInfo activity_schedule_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 @@ -125,7 +125,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 9; + * repeated .ActivityScheduleInfo activity_schedule_list = 7; * @param value the activityScheduleList to add * @return this */ @@ -137,7 +137,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 9; + * repeated .ActivityScheduleInfo activity_schedule_list = 7; * @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) 24); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < activityScheduleList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 58); output.writeMessageNoTag(activityScheduleList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetActivityScheduleConfigScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 58) { break; } } - case 74: { + case 58: { // 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 97d0d41..9228aa7 100644 --- a/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java @@ -20,17 +20,17 @@ public final class GetAllLineupDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; - */ - private int retcode; - - /** - * optional uint32 cur_index = 15; + * optional uint32 cur_index = 1; */ private int curIndex; /** - * repeated .LineupInfo lineup_list = 2; + * optional uint32 retcode = 4; + */ + private int retcode; + + /** + * repeated .LineupInfo lineup_list = 3; */ private final RepeatedMessage lineupList = RepeatedMessage.newEmptyInstance(LineupInfoOuterClass.LineupInfo.getFactory()); @@ -45,62 +45,25 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 3; - * @return whether the retcode field is set + * optional uint32 cur_index = 1; + * @return whether the curIndex field is set */ - public boolean hasRetcode() { + public boolean hasCurIndex() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 3; - * @return this - */ - public GetAllLineupDataScRsp 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 GetAllLineupDataScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 cur_index = 15; - * @return whether the curIndex field is set - */ - public boolean hasCurIndex() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cur_index = 15; + * optional uint32 cur_index = 1; * @return this */ public GetAllLineupDataScRsp clearCurIndex() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; curIndex = 0; return this; } /** - * optional uint32 cur_index = 15; + * optional uint32 cur_index = 1; * @return the curIndex */ public int getCurIndex() { @@ -108,18 +71,55 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 cur_index = 15; + * optional uint32 cur_index = 1; * @param value the curIndex to set * @return this */ public GetAllLineupDataScRsp setCurIndex(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; curIndex = value; return this; } /** - * repeated .LineupInfo lineup_list = 2; + * optional uint32 retcode = 4; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 4; + * @return this + */ + public GetAllLineupDataScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + 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 GetAllLineupDataScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * repeated .LineupInfo lineup_list = 3; * @return whether the lineupList field is set */ public boolean hasLineupList() { @@ -127,7 +127,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 2; + * repeated .LineupInfo lineup_list = 3; * @return this */ public GetAllLineupDataScRsp clearLineupList() { @@ -137,7 +137,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 2; + * repeated .LineupInfo lineup_list = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 2; + * repeated .LineupInfo lineup_list = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 2; + * repeated .LineupInfo lineup_list = 3; * @param value the lineupList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 2; + * repeated .LineupInfo lineup_list = 3; * @param values the lineupList to add * @return this */ @@ -191,8 +191,8 @@ public final class GetAllLineupDataScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; curIndex = other.curIndex; + retcode = other.retcode; lineupList.copyFrom(other.lineupList); } return this; @@ -204,12 +204,12 @@ public final class GetAllLineupDataScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasCurIndex()) { setCurIndex(other.curIndex); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasLineupList()) { getMutableLineupList().addAll(other.lineupList); } @@ -223,8 +223,8 @@ public final class GetAllLineupDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; curIndex = 0; + retcode = 0; lineupList.clear(); return this; } @@ -250,24 +250,24 @@ public final class GetAllLineupDataScRspOuterClass { } GetAllLineupDataScRsp other = (GetAllLineupDataScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasCurIndex() || curIndex == other.curIndex) + && (!hasRetcode() || retcode == other.retcode) && (!hasLineupList() || lineupList.equals(other.lineupList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(curIndex); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(curIndex); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < lineupList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 26); output.writeMessageNoTag(lineupList.get(i)); } } @@ -277,10 +277,10 @@ public final class GetAllLineupDataScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curIndex); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curIndex); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * lineupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(lineupList); @@ -295,25 +295,25 @@ public final class GetAllLineupDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 8: { // curIndex curIndex = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 32) { break; } } - case 18: { + case 32: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 26) { + break; + } + } + case 26: { // lineupList tag = input.readRepeatedMessage(lineupList, tag); bitField0_ |= 0x00000004; @@ -339,10 +339,10 @@ public final class GetAllLineupDataScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.curIndex, curIndex); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curIndex, curIndex); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.lineupList, lineupList); @@ -357,10 +357,11 @@ public final class GetAllLineupDataScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 537796210: + case 117333523: { + if (input.isAtField(FieldNames.curIndex)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + curIndex = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -368,11 +369,10 @@ public final class GetAllLineupDataScRspOuterClass { } break; } - case 537796210: - case 117333523: { - if (input.isAtField(FieldNames.curIndex)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - curIndex = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -445,10 +445,10 @@ public final class GetAllLineupDataScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName curIndex = FieldName.forField("curIndex", "cur_index"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName lineupList = FieldName.forField("lineupList", "lineup_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java index 3cc88a6..8a4f7ad 100644 --- a/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetArchiveDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional .ArchiveData archive_data = 15; + * optional .ArchiveData archive_data = 4; */ private final ArchiveDataOuterClass.ArchiveData archiveData = ArchiveDataOuterClass.ArchiveData.newInstance(); @@ -39,7 +39,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @return this */ public GetArchiveDataScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 15; + * optional .ArchiveData archive_data = 4; * @return whether the archiveData field is set */ public boolean hasArchiveData() { @@ -84,7 +84,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 15; + * optional .ArchiveData archive_data = 4; * @return this */ public GetArchiveDataScRsp clearArchiveData() { @@ -94,7 +94,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 15; + * optional .ArchiveData archive_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. @@ -108,7 +108,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 15; + * optional .ArchiveData archive_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 @@ -122,7 +122,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 15; + * optional .ArchiveData archive_data = 4; * @param value the archiveData to set * @return this */ @@ -198,11 +198,11 @@ public final class GetArchiveDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 34); output.writeMessageNoTag(archiveData); } } @@ -226,16 +226,16 @@ public final class GetArchiveDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 34) { break; } } - case 122: { + case 34: { // 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 564a0ed..0bee304 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 = 6; + * optional bool is_get_all = 1; */ private boolean isGetAll; /** - * repeated uint32 base_avatar_id_list = 15; + * repeated uint32 base_avatar_id_list = 7; */ private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 6; + * optional bool is_get_all = 1; * @return whether the isGetAll field is set */ public boolean hasIsGetAll() { @@ -48,7 +48,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 6; + * optional bool is_get_all = 1; * @return this */ public GetAvatarDataCsReq clearIsGetAll() { @@ -58,7 +58,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 6; + * optional bool is_get_all = 1; * @return the isGetAll */ public boolean getIsGetAll() { @@ -66,7 +66,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 6; + * optional bool is_get_all = 1; * @param value the isGetAll to set * @return this */ @@ -77,7 +77,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 15; + * repeated uint32 base_avatar_id_list = 7; * @return whether the baseAvatarIdList field is set */ public boolean hasBaseAvatarIdList() { @@ -85,7 +85,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 15; + * repeated uint32 base_avatar_id_list = 7; * @return this */ public GetAvatarDataCsReq clearBaseAvatarIdList() { @@ -95,7 +95,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 15; + * 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. @@ -109,7 +109,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 15; + * 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 @@ -123,7 +123,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 15; + * repeated uint32 base_avatar_id_list = 7; * @param value the baseAvatarIdList to add * @return this */ @@ -134,7 +134,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 15; + * repeated uint32 base_avatar_id_list = 7; * @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) 48); + output.writeRawByte((byte) 8); output.writeBoolNoTag(isGetAll); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < baseAvatarIdList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(baseAvatarIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class GetAvatarDataCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 8: { // isGetAll isGetAll = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 58) { break; } } - case 122: { + case 58: { // baseAvatarIdList [packed=true] input.readPackedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class GetAvatarDataCsReqOuterClass { tag = input.readTag(); break; } - case 120: { + case 56: { // 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 28978f4..e46ff63 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 = 6; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional bool is_get_all = 10; + * optional bool is_get_all = 6; */ private boolean isGetAll; /** - * repeated .Avatar avatar_list = 7; + * repeated .Avatar avatar_list = 15; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory()); @@ -45,7 +45,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 2; * @return this */ public GetAvatarDataScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 10; + * optional bool is_get_all = 6; * @return whether the isGetAll field is set */ public boolean hasIsGetAll() { @@ -90,7 +90,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 10; + * optional bool is_get_all = 6; * @return this */ public GetAvatarDataScRsp clearIsGetAll() { @@ -100,7 +100,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 10; + * optional bool is_get_all = 6; * @return the isGetAll */ public boolean getIsGetAll() { @@ -108,7 +108,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 10; + * optional bool is_get_all = 6; * @param value the isGetAll to set * @return this */ @@ -119,7 +119,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 7; + * repeated .Avatar avatar_list = 15; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -127,7 +127,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 7; + * repeated .Avatar avatar_list = 15; * @return this */ public GetAvatarDataScRsp clearAvatarList() { @@ -137,7 +137,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 7; + * repeated .Avatar avatar_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 7; + * repeated .Avatar avatar_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 7; + * repeated .Avatar avatar_list = 15; * @param value the avatarList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 7; + * repeated .Avatar avatar_list = 15; * @param values the avatarList to add * @return this */ @@ -258,16 +258,16 @@ public final class GetAvatarDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeBoolNoTag(isGetAll); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 122); output.writeMessageNoTag(avatarList.get(i)); } } @@ -295,25 +295,25 @@ public final class GetAvatarDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 48) { break; } } - case 80: { + case 48: { // isGetAll isGetAll = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 122) { break; } } - case 58: { + case 122: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java index 0506b02..b0aa4de 100644 --- a/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java @@ -20,25 +20,25 @@ public final class GetBagScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; */ private int retcode; /** - * repeated .Relic relic_list = 1; - */ - private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); - - /** - * repeated .Equipment equipment_list = 10; + * repeated .Equipment equipment_list = 2; */ private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); /** - * repeated .Material material_list = 14; + * repeated .Material material_list = 6; */ private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); + /** + * repeated .Relic relic_list = 11; + */ + private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); + private GetBagScRsp() { } @@ -50,7 +50,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -58,7 +58,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @return this */ public GetBagScRsp clearRetcode() { @@ -68,7 +68,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -76,7 +76,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -87,93 +87,25 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Relic relic_list = 1; - * @return whether the relicList field is set + * repeated .Equipment equipment_list = 2; + * @return whether the equipmentList field is set */ - public boolean hasRelicList() { + public boolean hasEquipmentList() { return (bitField0_ & 0x00000002) != 0; } /** - * repeated .Relic relic_list = 1; - * @return this - */ - public GetBagScRsp clearRelicList() { - bitField0_ &= ~0x00000002; - 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_ |= 0x00000002; - return relicList; - } - - /** - * repeated .Relic relic_list = 1; - * @param value the relicList to add - * @return this - */ - public GetBagScRsp addRelicList(final RelicOuterClass.Relic value) { - bitField0_ |= 0x00000002; - relicList.add(value); - return this; - } - - /** - * repeated .Relic relic_list = 1; - * @param values the relicList to add - * @return this - */ - public GetBagScRsp addAllRelicList(final RelicOuterClass.Relic... values) { - bitField0_ |= 0x00000002; - relicList.addAll(values); - return this; - } - - /** - * repeated .Equipment equipment_list = 10; - * @return whether the equipmentList field is set - */ - public boolean hasEquipmentList() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated .Equipment equipment_list = 10; + * repeated .Equipment equipment_list = 2; * @return this */ public GetBagScRsp clearEquipmentList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; equipmentList.clear(); return this; } /** - * repeated .Equipment equipment_list = 10; + * repeated .Equipment equipment_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. @@ -187,7 +119,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Equipment equipment_list = 10; + * repeated .Equipment equipment_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 @@ -196,52 +128,52 @@ public final class GetBagScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableEquipmentList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return equipmentList; } /** - * repeated .Equipment equipment_list = 10; + * repeated .Equipment equipment_list = 2; * @param value the equipmentList to add * @return this */ public GetBagScRsp addEquipmentList(final EquipmentOuterClass.Equipment value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; equipmentList.add(value); return this; } /** - * repeated .Equipment equipment_list = 10; + * repeated .Equipment equipment_list = 2; * @param values the equipmentList to add * @return this */ public GetBagScRsp addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; equipmentList.addAll(values); return this; } /** - * repeated .Material material_list = 14; + * repeated .Material material_list = 6; * @return whether the materialList field is set */ public boolean hasMaterialList() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * repeated .Material material_list = 14; + * repeated .Material material_list = 6; * @return this */ public GetBagScRsp clearMaterialList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; materialList.clear(); return this; } /** - * repeated .Material material_list = 14; + * repeated .Material material_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 +187,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Material material_list = 14; + * repeated .Material material_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 @@ -264,41 +196,109 @@ public final class GetBagScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMaterialList() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return materialList; } /** - * repeated .Material material_list = 14; + * repeated .Material material_list = 6; * @param value the materialList to add * @return this */ public GetBagScRsp addMaterialList(final MaterialOuterClass.Material value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; materialList.add(value); return this; } /** - * repeated .Material material_list = 14; + * repeated .Material material_list = 6; * @param values the materialList to add * @return this */ public GetBagScRsp addAllMaterialList(final MaterialOuterClass.Material... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; materialList.addAll(values); return this; } + /** + * repeated .Relic relic_list = 11; + * @return whether the relicList field is set + */ + public boolean hasRelicList() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * repeated .Relic relic_list = 11; + * @return this + */ + public GetBagScRsp clearRelicList() { + bitField0_ &= ~0x00000008; + relicList.clear(); + return this; + } + + /** + * repeated .Relic 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 .Relic 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_ |= 0x00000008; + return relicList; + } + + /** + * repeated .Relic relic_list = 11; + * @param value the relicList to add + * @return this + */ + public GetBagScRsp addRelicList(final RelicOuterClass.Relic value) { + bitField0_ |= 0x00000008; + relicList.add(value); + return this; + } + + /** + * repeated .Relic relic_list = 11; + * @param values the relicList to add + * @return this + */ + public GetBagScRsp addAllRelicList(final RelicOuterClass.Relic... values) { + bitField0_ |= 0x00000008; + relicList.addAll(values); + return this; + } + @Override public GetBagScRsp copyFrom(final GetBagScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - relicList.copyFrom(other.relicList); equipmentList.copyFrom(other.equipmentList); materialList.copyFrom(other.materialList); + relicList.copyFrom(other.relicList); } return this; } @@ -312,15 +312,15 @@ public final class GetBagScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasRelicList()) { - getMutableRelicList().addAll(other.relicList); - } if (other.hasEquipmentList()) { getMutableEquipmentList().addAll(other.equipmentList); } if (other.hasMaterialList()) { getMutableMaterialList().addAll(other.materialList); } + if (other.hasRelicList()) { + getMutableRelicList().addAll(other.relicList); + } return this; } @@ -332,9 +332,9 @@ public final class GetBagScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - relicList.clear(); equipmentList.clear(); materialList.clear(); + relicList.clear(); return this; } @@ -345,9 +345,9 @@ public final class GetBagScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - relicList.clearQuick(); equipmentList.clearQuick(); materialList.clearQuick(); + relicList.clearQuick(); return this; } @@ -362,35 +362,35 @@ public final class GetBagScRspOuterClass { GetBagScRsp other = (GetBagScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasRelicList() || relicList.equals(other.relicList)) && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)) - && (!hasMaterialList() || materialList.equals(other.materialList)); + && (!hasMaterialList() || materialList.equals(other.materialList)) + && (!hasRelicList() || relicList.equals(other.relicList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(relicList.get(i)); - } - } - if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < equipmentList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 18); output.writeMessageNoTag(equipmentList.get(i)); } } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < materialList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 50); output.writeMessageNoTag(materialList.get(i)); } } + if ((bitField0_ & 0x00000008) != 0) { + for (int i = 0; i < relicList.length(); i++) { + output.writeRawByte((byte) 90); + output.writeMessageNoTag(relicList.get(i)); + } + } } @Override @@ -400,14 +400,14 @@ public final class GetBagScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); - } - if ((bitField0_ & 0x00000004) != 0) { size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); } + if ((bitField0_ & 0x00000008) != 0) { + size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + } return size; } @@ -418,34 +418,34 @@ public final class GetBagScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 18) { break; } } - case 10: { - // relicList - tag = input.readRepeatedMessage(relicList, tag); - bitField0_ |= 0x00000002; - if (tag != 82) { - break; - } - } - case 82: { + case 18: { // equipmentList tag = input.readRepeatedMessage(equipmentList, tag); - bitField0_ |= 0x00000004; - if (tag != 114) { + bitField0_ |= 0x00000002; + if (tag != 50) { break; } } - case 114: { + case 50: { // materialList tag = input.readRepeatedMessage(materialList, tag); + bitField0_ |= 0x00000004; + if (tag != 90) { + break; + } + } + case 90: { + // relicList + tag = input.readRepeatedMessage(relicList, tag); bitField0_ |= 0x00000008; if (tag != 0) { break; @@ -472,14 +472,14 @@ public final class GetBagScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedMessage(FieldNames.relicList, relicList); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.materialList, materialList); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRepeatedMessage(FieldNames.relicList, relicList); + } output.endObject(); } @@ -501,24 +501,12 @@ public final class GetBagScRspOuterClass { } break; } - case 204814001: - case 2071893482: { - if (input.isAtField(FieldNames.relicList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(relicList); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 2007143244: case 2109525167: { if (input.isAtField(FieldNames.equipmentList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(equipmentList); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -530,6 +518,18 @@ public final class GetBagScRspOuterClass { if (input.isAtField(FieldNames.materialList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(materialList); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 204814001: + case 2071893482: { + if (input.isAtField(FieldNames.relicList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(relicList); bitField0_ |= 0x00000008; } } else { @@ -591,11 +591,11 @@ 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 equipmentList = FieldName.forField("equipmentList", "equipment_list"); static final FieldName materialList = FieldName.forField("materialList", "material_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 348356a..273ab58 100644 --- a/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java @@ -19,42 +19,42 @@ public final class GetBasicInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 next_recover_time = 1; + * optional int64 next_recover_time = 6; */ private long nextRecoverTime; /** - * optional int64 last_set_nickname_time = 11; + * optional int64 last_set_nickname_time = 7; */ private long lastSetNicknameTime; /** - * optional uint32 cur_day = 2; - */ - private int curDay; - - /** - * optional uint32 exchange_times = 4; - */ - private int exchangeTimes; - - /** - * optional uint32 week_cocoon_finished_count = 9; + * optional uint32 week_cocoon_finished_count = 3; */ private int weekCocoonFinishedCount; /** - * optional uint32 retcode = 13; + * optional uint32 cur_day = 4; */ - private int retcode; + private int curDay; /** - * optional uint32 gameplay_birthday = 14; + * optional uint32 gameplay_birthday = 5; */ private int gameplayBirthday; /** - * optional .PlayerSettingInfo player_setting_info = 6; + * optional uint32 retcode = 11; + */ + private int retcode; + + /** + * optional uint32 exchange_times = 14; + */ + private int exchangeTimes; + + /** + * optional .PlayerSettingInfo player_setting_info = 15; */ private final PlayerSettingInfoOuterClass.PlayerSettingInfo playerSettingInfo = PlayerSettingInfoOuterClass.PlayerSettingInfo.newInstance(); @@ -69,7 +69,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 next_recover_time = 1; + * optional int64 next_recover_time = 6; * @return whether the nextRecoverTime field is set */ public boolean hasNextRecoverTime() { @@ -77,7 +77,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 next_recover_time = 1; + * optional int64 next_recover_time = 6; * @return this */ public GetBasicInfoScRsp clearNextRecoverTime() { @@ -87,7 +87,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 next_recover_time = 1; + * optional int64 next_recover_time = 6; * @return the nextRecoverTime */ public long getNextRecoverTime() { @@ -95,7 +95,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 next_recover_time = 1; + * optional int64 next_recover_time = 6; * @param value the nextRecoverTime to set * @return this */ @@ -106,7 +106,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 last_set_nickname_time = 11; + * optional int64 last_set_nickname_time = 7; * @return whether the lastSetNicknameTime field is set */ public boolean hasLastSetNicknameTime() { @@ -114,7 +114,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 last_set_nickname_time = 11; + * optional int64 last_set_nickname_time = 7; * @return this */ public GetBasicInfoScRsp clearLastSetNicknameTime() { @@ -124,7 +124,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 last_set_nickname_time = 11; + * optional int64 last_set_nickname_time = 7; * @return the lastSetNicknameTime */ public long getLastSetNicknameTime() { @@ -132,7 +132,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 last_set_nickname_time = 11; + * optional int64 last_set_nickname_time = 7; * @param value the lastSetNicknameTime to set * @return this */ @@ -143,99 +143,25 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 cur_day = 2; - * @return whether the curDay field is set + * optional uint32 week_cocoon_finished_count = 3; + * @return whether the weekCocoonFinishedCount field is set */ - public boolean hasCurDay() { + public boolean hasWeekCocoonFinishedCount() { 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 exchange_times = 4; - * @return whether the exchangeTimes field is set - */ - public boolean hasExchangeTimes() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 exchange_times = 4; - * @return this - */ - public GetBasicInfoScRsp clearExchangeTimes() { - bitField0_ &= ~0x00000008; - exchangeTimes = 0; - return this; - } - - /** - * optional uint32 exchange_times = 4; - * @return the exchangeTimes - */ - public int getExchangeTimes() { - return exchangeTimes; - } - - /** - * optional uint32 exchange_times = 4; - * @param value the exchangeTimes to set - * @return this - */ - public GetBasicInfoScRsp setExchangeTimes(final int value) { - bitField0_ |= 0x00000008; - exchangeTimes = value; - return this; - } - - /** - * optional uint32 week_cocoon_finished_count = 9; - * @return whether the weekCocoonFinishedCount field is set - */ - public boolean hasWeekCocoonFinishedCount() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 week_cocoon_finished_count = 9; + * optional uint32 week_cocoon_finished_count = 3; * @return this */ public GetBasicInfoScRsp clearWeekCocoonFinishedCount() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; weekCocoonFinishedCount = 0; return this; } /** - * optional uint32 week_cocoon_finished_count = 9; + * optional uint32 week_cocoon_finished_count = 3; * @return the weekCocoonFinishedCount */ public int getWeekCocoonFinishedCount() { @@ -243,18 +169,92 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 week_cocoon_finished_count = 9; + * optional uint32 week_cocoon_finished_count = 3; * @param value the weekCocoonFinishedCount to set * @return this */ public GetBasicInfoScRsp setWeekCocoonFinishedCount(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; weekCocoonFinishedCount = value; return this; } /** - * optional uint32 retcode = 13; + * optional uint32 cur_day = 4; + * @return whether the curDay field is set + */ + public boolean hasCurDay() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 cur_day = 4; + * @return this + */ + public GetBasicInfoScRsp clearCurDay() { + bitField0_ &= ~0x00000008; + curDay = 0; + return this; + } + + /** + * optional uint32 cur_day = 4; + * @return the curDay + */ + public int getCurDay() { + return curDay; + } + + /** + * optional uint32 cur_day = 4; + * @param value the curDay to set + * @return this + */ + public GetBasicInfoScRsp setCurDay(final int value) { + bitField0_ |= 0x00000008; + curDay = value; + return this; + } + + /** + * optional uint32 gameplay_birthday = 5; + * @return whether the gameplayBirthday field is set + */ + public boolean hasGameplayBirthday() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 gameplay_birthday = 5; + * @return this + */ + public GetBasicInfoScRsp clearGameplayBirthday() { + bitField0_ &= ~0x00000010; + gameplayBirthday = 0; + return this; + } + + /** + * optional uint32 gameplay_birthday = 5; + * @return the gameplayBirthday + */ + public int getGameplayBirthday() { + return gameplayBirthday; + } + + /** + * optional uint32 gameplay_birthday = 5; + * @param value the gameplayBirthday to set + * @return this + */ + public GetBasicInfoScRsp setGameplayBirthday(final int value) { + bitField0_ |= 0x00000010; + gameplayBirthday = value; + return this; + } + + /** + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -262,7 +262,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 11; * @return this */ public GetBasicInfoScRsp clearRetcode() { @@ -272,7 +272,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -280,7 +280,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -291,44 +291,44 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 gameplay_birthday = 14; - * @return whether the gameplayBirthday field is set + * optional uint32 exchange_times = 14; + * @return whether the exchangeTimes field is set */ - public boolean hasGameplayBirthday() { + public boolean hasExchangeTimes() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 gameplay_birthday = 14; + * optional uint32 exchange_times = 14; * @return this */ - public GetBasicInfoScRsp clearGameplayBirthday() { + public GetBasicInfoScRsp clearExchangeTimes() { bitField0_ &= ~0x00000040; - gameplayBirthday = 0; + exchangeTimes = 0; return this; } /** - * optional uint32 gameplay_birthday = 14; - * @return the gameplayBirthday + * optional uint32 exchange_times = 14; + * @return the exchangeTimes */ - public int getGameplayBirthday() { - return gameplayBirthday; + public int getExchangeTimes() { + return exchangeTimes; } /** - * optional uint32 gameplay_birthday = 14; - * @param value the gameplayBirthday to set + * optional uint32 exchange_times = 14; + * @param value the exchangeTimes to set * @return this */ - public GetBasicInfoScRsp setGameplayBirthday(final int value) { + public GetBasicInfoScRsp setExchangeTimes(final int value) { bitField0_ |= 0x00000040; - gameplayBirthday = value; + exchangeTimes = value; return this; } /** - * optional .PlayerSettingInfo player_setting_info = 6; + * optional .PlayerSettingInfo player_setting_info = 15; * @return whether the playerSettingInfo field is set */ public boolean hasPlayerSettingInfo() { @@ -336,7 +336,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 6; + * optional .PlayerSettingInfo player_setting_info = 15; * @return this */ public GetBasicInfoScRsp clearPlayerSettingInfo() { @@ -346,7 +346,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 6; + * optional .PlayerSettingInfo player_setting_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. @@ -360,7 +360,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 6; + * optional .PlayerSettingInfo player_setting_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 @@ -374,7 +374,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 6; + * optional .PlayerSettingInfo player_setting_info = 15; * @param value the playerSettingInfo to set * @return this */ @@ -392,11 +392,11 @@ public final class GetBasicInfoScRspOuterClass { bitField0_ = other.bitField0_; nextRecoverTime = other.nextRecoverTime; lastSetNicknameTime = other.lastSetNicknameTime; - curDay = other.curDay; - exchangeTimes = other.exchangeTimes; weekCocoonFinishedCount = other.weekCocoonFinishedCount; - retcode = other.retcode; + curDay = other.curDay; gameplayBirthday = other.gameplayBirthday; + retcode = other.retcode; + exchangeTimes = other.exchangeTimes; playerSettingInfo.copyFrom(other.playerSettingInfo); } return this; @@ -414,20 +414,20 @@ public final class GetBasicInfoScRspOuterClass { if (other.hasLastSetNicknameTime()) { setLastSetNicknameTime(other.lastSetNicknameTime); } + if (other.hasWeekCocoonFinishedCount()) { + setWeekCocoonFinishedCount(other.weekCocoonFinishedCount); + } if (other.hasCurDay()) { setCurDay(other.curDay); } - if (other.hasExchangeTimes()) { - setExchangeTimes(other.exchangeTimes); - } - if (other.hasWeekCocoonFinishedCount()) { - setWeekCocoonFinishedCount(other.weekCocoonFinishedCount); + if (other.hasGameplayBirthday()) { + setGameplayBirthday(other.gameplayBirthday); } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasGameplayBirthday()) { - setGameplayBirthday(other.gameplayBirthday); + if (other.hasExchangeTimes()) { + setExchangeTimes(other.exchangeTimes); } if (other.hasPlayerSettingInfo()) { getMutablePlayerSettingInfo().mergeFrom(other.playerSettingInfo); @@ -444,11 +444,11 @@ public final class GetBasicInfoScRspOuterClass { bitField0_ = 0; nextRecoverTime = 0L; lastSetNicknameTime = 0L; - curDay = 0; - exchangeTimes = 0; weekCocoonFinishedCount = 0; - retcode = 0; + curDay = 0; gameplayBirthday = 0; + retcode = 0; + exchangeTimes = 0; playerSettingInfo.clear(); return this; } @@ -476,46 +476,46 @@ public final class GetBasicInfoScRspOuterClass { return bitField0_ == other.bitField0_ && (!hasNextRecoverTime() || nextRecoverTime == other.nextRecoverTime) && (!hasLastSetNicknameTime() || lastSetNicknameTime == other.lastSetNicknameTime) - && (!hasCurDay() || curDay == other.curDay) - && (!hasExchangeTimes() || exchangeTimes == other.exchangeTimes) && (!hasWeekCocoonFinishedCount() || weekCocoonFinishedCount == other.weekCocoonFinishedCount) - && (!hasRetcode() || retcode == other.retcode) + && (!hasCurDay() || curDay == other.curDay) && (!hasGameplayBirthday() || gameplayBirthday == other.gameplayBirthday) + && (!hasRetcode() || retcode == other.retcode) + && (!hasExchangeTimes() || exchangeTimes == other.exchangeTimes) && (!hasPlayerSettingInfo() || playerSettingInfo.equals(other.playerSettingInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 48); output.writeInt64NoTag(nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 56); output.writeInt64NoTag(lastSetNicknameTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(curDay); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(weekCocoonFinishedCount); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(exchangeTimes); + output.writeUInt32NoTag(curDay); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(weekCocoonFinishedCount); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(gameplayBirthday); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(gameplayBirthday); + output.writeUInt32NoTag(exchangeTimes); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 122); output.writeMessageNoTag(playerSettingInfo); } } @@ -530,19 +530,19 @@ public final class GetBasicInfoScRspOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(lastSetNicknameTime); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curDay); + size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exchangeTimes); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curDay); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exchangeTimes); } if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(playerSettingInfo); @@ -557,27 +557,27 @@ public final class GetBasicInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 48: { // nextRecoverTime nextRecoverTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 56) { break; } } - case 88: { + case 56: { // lastSetNicknameTime lastSetNicknameTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 16) { + if (tag != 24) { break; } } - case 16: { - // curDay - curDay = input.readUInt32(); + case 24: { + // weekCocoonFinishedCount + weekCocoonFinishedCount = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 32) { @@ -585,24 +585,24 @@ public final class GetBasicInfoScRspOuterClass { } } case 32: { - // exchangeTimes - exchangeTimes = input.readUInt32(); + // curDay + curDay = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 72) { + if (tag != 40) { break; } } - case 72: { - // weekCocoonFinishedCount - weekCocoonFinishedCount = input.readUInt32(); + case 40: { + // gameplayBirthday + gameplayBirthday = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 104) { + if (tag != 88) { break; } } - case 104: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000020; @@ -612,15 +612,15 @@ public final class GetBasicInfoScRspOuterClass { } } case 112: { - // gameplayBirthday - gameplayBirthday = input.readUInt32(); + // exchangeTimes + exchangeTimes = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 50) { + if (tag != 122) { break; } } - case 50: { + case 122: { // playerSettingInfo input.readMessage(playerSettingInfo); bitField0_ |= 0x00000080; @@ -653,19 +653,19 @@ public final class GetBasicInfoScRspOuterClass { output.writeInt64(FieldNames.lastSetNicknameTime, lastSetNicknameTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.curDay, curDay); + output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.exchangeTimes, exchangeTimes); + output.writeUInt32(FieldNames.curDay, curDay); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount); + output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday); } if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday); + output.writeUInt32(FieldNames.exchangeTimes, exchangeTimes); } if ((bitField0_ & 0x00000080) != 0) { output.writeMessage(FieldNames.playerSettingInfo, playerSettingInfo); @@ -704,11 +704,11 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case -1349164740: - case 1126372637: { - if (input.isAtField(FieldNames.curDay)) { + case 1387396786: + case 668486783: { + if (input.isAtField(FieldNames.weekCocoonFinishedCount)) { if (!input.trySkipNullValue()) { - curDay = input.readUInt32(); + weekCocoonFinishedCount = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -716,11 +716,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_ |= 0x00000008; } } else { @@ -728,11 +728,11 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case 1387396786: - case 668486783: { - if (input.isAtField(FieldNames.weekCocoonFinishedCount)) { + case 686542531: + case 172986486: { + if (input.isAtField(FieldNames.gameplayBirthday)) { if (!input.trySkipNullValue()) { - weekCocoonFinishedCount = input.readUInt32(); + gameplayBirthday = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -751,11 +751,11 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case 686542531: - case 172986486: { - if (input.isAtField(FieldNames.gameplayBirthday)) { + case 1371137763: + case -119434710: { + if (input.isAtField(FieldNames.exchangeTimes)) { if (!input.trySkipNullValue()) { - gameplayBirthday = input.readUInt32(); + exchangeTimes = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -832,15 +832,15 @@ public final class GetBasicInfoScRspOuterClass { static final FieldName lastSetNicknameTime = FieldName.forField("lastSetNicknameTime", "last_set_nickname_time"); + static final FieldName weekCocoonFinishedCount = FieldName.forField("weekCocoonFinishedCount", "week_cocoon_finished_count"); + static final FieldName curDay = FieldName.forField("curDay", "cur_day"); - static final FieldName exchangeTimes = FieldName.forField("exchangeTimes", "exchange_times"); - - static final FieldName weekCocoonFinishedCount = FieldName.forField("weekCocoonFinishedCount", "week_cocoon_finished_count"); + static final FieldName gameplayBirthday = FieldName.forField("gameplayBirthday", "gameplay_birthday"); static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName gameplayBirthday = FieldName.forField("gameplayBirthday", "gameplay_birthday"); + static final FieldName exchangeTimes = FieldName.forField("exchangeTimes", "exchange_times"); static final FieldName playerSettingInfo = FieldName.forField("playerSettingInfo", "player_setting_info"); } diff --git a/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java index 55224c6..1e3f6b2 100644 --- a/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java @@ -20,17 +20,17 @@ public final class GetChallengeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 14; */ private int retcode; /** - * repeated .ChallengeReward challenge_reward_list = 1; + * repeated .ChallengeReward challenge_reward_list = 2; */ private final RepeatedMessage challengeRewardList = RepeatedMessage.newEmptyInstance(ChallengeRewardOuterClass.ChallengeReward.getFactory()); /** - * repeated .Challenge challenge_list = 13; + * repeated .Challenge challenge_list = 10; */ private final RepeatedMessage challengeList = RepeatedMessage.newEmptyInstance(ChallengeOuterClass.Challenge.getFactory()); @@ -45,7 +45,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 14; * @return this */ public GetChallengeScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .ChallengeReward challenge_reward_list = 1; + * repeated .ChallengeReward challenge_reward_list = 2; * @return whether the challengeRewardList field is set */ public boolean hasChallengeRewardList() { @@ -90,7 +90,7 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .ChallengeReward challenge_reward_list = 1; + * repeated .ChallengeReward challenge_reward_list = 2; * @return this */ public GetChallengeScRsp clearChallengeRewardList() { @@ -100,7 +100,7 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .ChallengeReward challenge_reward_list = 1; + * repeated .ChallengeReward challenge_reward_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. @@ -114,7 +114,7 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .ChallengeReward challenge_reward_list = 1; + * repeated .ChallengeReward challenge_reward_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 @@ -129,7 +129,7 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .ChallengeReward challenge_reward_list = 1; + * repeated .ChallengeReward challenge_reward_list = 2; * @param value the challengeRewardList to add * @return this */ @@ -141,7 +141,7 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .ChallengeReward challenge_reward_list = 1; + * repeated .ChallengeReward challenge_reward_list = 2; * @param values the challengeRewardList to add * @return this */ @@ -153,7 +153,7 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .Challenge challenge_list = 13; + * repeated .Challenge challenge_list = 10; * @return whether the challengeList field is set */ public boolean hasChallengeList() { @@ -161,7 +161,7 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .Challenge challenge_list = 13; + * repeated .Challenge challenge_list = 10; * @return this */ public GetChallengeScRsp clearChallengeList() { @@ -171,7 +171,7 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .Challenge challenge_list = 13; + * repeated .Challenge challenge_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. @@ -185,7 +185,7 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .Challenge challenge_list = 13; + * repeated .Challenge challenge_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 GetChallengeScRspOuterClass { } /** - * repeated .Challenge challenge_list = 13; + * repeated .Challenge challenge_list = 10; * @param value the challengeList to add * @return this */ @@ -210,7 +210,7 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .Challenge challenge_list = 13; + * repeated .Challenge challenge_list = 10; * @param values the challengeList to add * @return this */ @@ -293,18 +293,18 @@ public final class GetChallengeScRspOuterClass { @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) { for (int i = 0; i < challengeRewardList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 18); output.writeMessageNoTag(challengeRewardList.get(i)); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < challengeList.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 82); output.writeMessageNoTag(challengeList.get(i)); } } @@ -332,24 +332,24 @@ public final class GetChallengeScRspOuterClass { 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 != 18) { break; } } - case 10: { + case 18: { // challengeRewardList tag = input.readRepeatedMessage(challengeRewardList, tag); bitField0_ |= 0x00000002; - if (tag != 106) { + if (tag != 82) { break; } } - case 106: { + case 82: { // challengeList tag = input.readRepeatedMessage(challengeList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java index 4e63fbf..13072b3 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 = 15; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional .ChallengeInfo challenge_info = 14; + * optional .ChallengeInfo challenge_info = 7; */ private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @return this */ public GetCurChallengeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 14; + * optional .ChallengeInfo challenge_info = 7; * @return whether the challengeInfo field is set */ public boolean hasChallengeInfo() { @@ -84,7 +84,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 14; + * optional .ChallengeInfo challenge_info = 7; * @return this */ public GetCurChallengeScRsp clearChallengeInfo() { @@ -94,7 +94,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 14; + * optional .ChallengeInfo challenge_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 GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 14; + * optional .ChallengeInfo challenge_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 GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 14; + * optional .ChallengeInfo challenge_info = 7; * @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) 120); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 58); output.writeMessageNoTag(challengeInfo); } } @@ -227,16 +227,16 @@ public final class GetCurChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 58) { break; } } - case 114: { + case 58: { // 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 28370e7..5775bb8 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 = 1; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 1; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 2; * @return this */ public GetCurLineupDataScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 1; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -84,7 +84,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 1; * @return this */ public GetCurLineupDataScRsp clearLineup() { @@ -94,7 +94,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * 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. @@ -108,7 +108,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * 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 @@ -122,7 +122,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 1; * @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) 8); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 10); output.writeMessageNoTag(lineup); } } @@ -226,16 +226,16 @@ public final class GetCurLineupDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 10) { break; } } - case 122: { + case 10: { // 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 73cf85e..4073c77 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 = 15; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional .SceneInfo scene = 13; + * optional .SceneInfo scene = 9; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 8; * @return this */ public GetCurSceneInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 13; + * optional .SceneInfo scene = 9; * @return whether the scene field is set */ public boolean hasScene() { @@ -84,7 +84,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 13; + * optional .SceneInfo scene = 9; * @return this */ public GetCurSceneInfoScRsp clearScene() { @@ -94,7 +94,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 13; + * optional .SceneInfo scene = 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 GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 13; + * optional .SceneInfo scene = 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 GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 13; + * optional .SceneInfo scene = 9; * @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) 120); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 74); output.writeMessageNoTag(scene); } } @@ -226,16 +226,16 @@ public final class GetCurSceneInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 74) { break; } } - case 106: { + case 74: { // scene input.readMessage(scene); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoCsReqOuterClass.java deleted file mode 100644 index ea51047..0000000 --- a/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoCsReqOuterClass.java +++ /dev/null @@ -1,174 +0,0 @@ -// Code generated by protocol buffer compiler. Do not edit! -package emu.lunarcore.proto; - -import java.io.IOException; -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 GetDailyActiveInfoCsReqOuterClass { - /** - * Protobuf type {@code GetDailyActiveInfoCsReq} - */ - public static final class GetDailyActiveInfoCsReq extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - private GetDailyActiveInfoCsReq() { - } - - /** - * @return a new empty instance of {@code GetDailyActiveInfoCsReq} - */ - public static GetDailyActiveInfoCsReq newInstance() { - return new GetDailyActiveInfoCsReq(); - } - - @Override - public GetDailyActiveInfoCsReq copyFrom(final GetDailyActiveInfoCsReq other) { - cachedSize = other.cachedSize; - return this; - } - - @Override - public GetDailyActiveInfoCsReq mergeFrom(final GetDailyActiveInfoCsReq other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - return this; - } - - @Override - public GetDailyActiveInfoCsReq clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - return this; - } - - @Override - public GetDailyActiveInfoCsReq clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof GetDailyActiveInfoCsReq)) { - return false; - } - GetDailyActiveInfoCsReq other = (GetDailyActiveInfoCsReq) o; - return true; - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - } - - @Override - protected int computeSerializedSize() { - int size = 0; - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public GetDailyActiveInfoCsReq mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - 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(); - output.endObject(); - } - - @Override - public GetDailyActiveInfoCsReq mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public GetDailyActiveInfoCsReq clone() { - return new GetDailyActiveInfoCsReq().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static GetDailyActiveInfoCsReq parseFrom(final byte[] data) throws - InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new GetDailyActiveInfoCsReq(), data).checkInitialized(); - } - - public static GetDailyActiveInfoCsReq parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new GetDailyActiveInfoCsReq(), input).checkInitialized(); - } - - public static GetDailyActiveInfoCsReq parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new GetDailyActiveInfoCsReq(), input).checkInitialized(); - } - - /** - * @return factory for creating GetDailyActiveInfoCsReq messages - */ - public static MessageFactory getFactory() { - return GetDailyActiveInfoCsReqFactory.INSTANCE; - } - - private enum GetDailyActiveInfoCsReqFactory implements MessageFactory { - INSTANCE; - - @Override - public GetDailyActiveInfoCsReq create() { - return GetDailyActiveInfoCsReq.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java index 60ed7d2..de3dae0 100644 --- a/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java @@ -26,17 +26,17 @@ public final class GetDailyActiveInfoScRspOuterClass { private int dailyActivePoint; /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 10; */ private int retcode; /** - * repeated uint32 daily_active_quest_id_list = 15; + * repeated uint32 daily_active_quest_id_list = 13; */ private final RepeatedInt dailyActiveQuestIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .DailyActivityInfo daily_active_level_list = 14; + * repeated .DailyActivityInfo daily_active_level_list = 11; */ private final RepeatedMessage dailyActiveLevelList = RepeatedMessage.newEmptyInstance(DailyActivityInfoOuterClass.DailyActivityInfo.getFactory()); @@ -88,7 +88,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -96,7 +96,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 10; * @return this */ public GetDailyActiveInfoScRsp clearRetcode() { @@ -106,7 +106,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -114,7 +114,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -125,7 +125,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 15; + * repeated uint32 daily_active_quest_id_list = 13; * @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 = 15; + * repeated uint32 daily_active_quest_id_list = 13; * @return this */ public GetDailyActiveInfoScRsp clearDailyActiveQuestIdList() { @@ -143,7 +143,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 15; + * repeated uint32 daily_active_quest_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. @@ -157,7 +157,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 15; + * repeated uint32 daily_active_quest_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 @@ -171,7 +171,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 15; + * repeated uint32 daily_active_quest_id_list = 13; * @param value the dailyActiveQuestIdList to add * @return this */ @@ -182,7 +182,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 15; + * repeated uint32 daily_active_quest_id_list = 13; * @param values the dailyActiveQuestIdList to add * @return this */ @@ -193,7 +193,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 14; + * repeated .DailyActivityInfo daily_active_level_list = 11; * @return whether the dailyActiveLevelList field is set */ public boolean hasDailyActiveLevelList() { @@ -201,7 +201,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 14; + * repeated .DailyActivityInfo daily_active_level_list = 11; * @return this */ public GetDailyActiveInfoScRsp clearDailyActiveLevelList() { @@ -211,7 +211,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 14; + * repeated .DailyActivityInfo daily_active_level_list = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -226,7 +226,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 14; + * repeated .DailyActivityInfo daily_active_level_list = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -241,7 +241,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 14; + * repeated .DailyActivityInfo daily_active_level_list = 11; * @param value the dailyActiveLevelList to add * @return this */ @@ -253,7 +253,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 14; + * repeated .DailyActivityInfo daily_active_level_list = 11; * @param values the dailyActiveLevelList to add * @return this */ @@ -347,18 +347,18 @@ public final class GetDailyActiveInfoScRspOuterClass { output.writeUInt32NoTag(dailyActivePoint); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < dailyActiveQuestIdList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(dailyActiveQuestIdList.array()[i]); } } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < dailyActiveLevelList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 90); output.writeMessageNoTag(dailyActiveLevelList.get(i)); } } @@ -394,29 +394,29 @@ public final class GetDailyActiveInfoScRspOuterClass { dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 80) { break; } } - case 48: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 106) { break; } } - case 122: { + case 106: { // dailyActiveQuestIdList [packed=true] input.readPackedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 114) { + if (tag != 90) { break; } } - case 114: { + case 90: { // dailyActiveLevelList tag = input.readRepeatedMessage(dailyActiveLevelList, tag); bitField0_ |= 0x00000008; @@ -434,7 +434,7 @@ public final class GetDailyActiveInfoScRspOuterClass { tag = input.readTag(); break; } - case 120: { + case 104: { // dailyActiveQuestIdList [packed=false] tag = input.readRepeatedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java index c3c3fdb..aab8eda 100644 --- a/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetEnteredSceneScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 2; */ private int retcode; /** - * repeated .EnteredSceneInfo entered_scene_info = 6; + * repeated .EnteredSceneInfo entered_scene_info = 4; */ private final RepeatedMessage enteredSceneInfo = RepeatedMessage.newEmptyInstance(EnteredSceneInfoOuterClass.EnteredSceneInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 2; * @return this */ public GetEnteredSceneScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 6; + * repeated .EnteredSceneInfo entered_scene_info = 4; * @return whether the enteredSceneInfo field is set */ public boolean hasEnteredSceneInfo() { @@ -85,7 +85,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 6; + * repeated .EnteredSceneInfo entered_scene_info = 4; * @return this */ public GetEnteredSceneScRsp clearEnteredSceneInfo() { @@ -95,7 +95,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 6; + * repeated .EnteredSceneInfo entered_scene_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. @@ -109,7 +109,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 6; + * repeated .EnteredSceneInfo entered_scene_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 @@ -124,7 +124,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 6; + * repeated .EnteredSceneInfo entered_scene_info = 4; * @param value the enteredSceneInfo to add * @return this */ @@ -136,7 +136,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 6; + * repeated .EnteredSceneInfo entered_scene_info = 4; * @param values the enteredSceneInfo to add * @return this */ @@ -213,12 +213,12 @@ public final class GetEnteredSceneScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < enteredSceneInfo.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 34); output.writeMessageNoTag(enteredSceneInfo.get(i)); } } @@ -243,16 +243,16 @@ public final class GetEnteredSceneScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 34) { break; } } - case 50: { + case 34: { // enteredSceneInfo tag = input.readRepeatedMessage(enteredSceneInfo, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java index 2760a8b..84eea45 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 farm_stage_gacha_id_list = 12; + * repeated uint32 farm_stage_gacha_id_list = 5; */ private final RepeatedInt farmStageGachaIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 12; + * repeated uint32 farm_stage_gacha_id_list = 5; * @return whether the farmStageGachaIdList field is set */ public boolean hasFarmStageGachaIdList() { @@ -43,7 +43,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 12; + * repeated uint32 farm_stage_gacha_id_list = 5; * @return this */ public GetFarmStageGachaInfoCsReq clearFarmStageGachaIdList() { @@ -53,7 +53,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 12; + * repeated uint32 farm_stage_gacha_id_list = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 12; + * repeated uint32 farm_stage_gacha_id_list = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 12; + * repeated uint32 farm_stage_gacha_id_list = 5; * @param value the farmStageGachaIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 12; + * repeated uint32 farm_stage_gacha_id_list = 5; * @param values the farmStageGachaIdList to add * @return this */ @@ -163,7 +163,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < farmStageGachaIdList.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(farmStageGachaIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 98: { + case 42: { // farmStageGachaIdList [packed=true] input.readPackedUInt32(farmStageGachaIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { tag = input.readTag(); break; } - case 96: { + case 40: { // farmStageGachaIdList [packed=false] tag = input.readRepeatedUInt32(farmStageGachaIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java index 789832d..e44ca89 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 = 6; + * repeated uint32 npc_talk_list = 3; */ private final RepeatedInt npcTalkList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 6; + * repeated uint32 npc_talk_list = 3; * @return whether the npcTalkList field is set */ public boolean hasNpcTalkList() { @@ -43,7 +43,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 6; + * repeated uint32 npc_talk_list = 3; * @return this */ public GetFirstTalkByPerformanceNpcCsReq clearNpcTalkList() { @@ -53,7 +53,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 6; + * repeated uint32 npc_talk_list = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 6; + * repeated uint32 npc_talk_list = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 6; + * repeated uint32 npc_talk_list = 3; * @param value the npcTalkList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 6; + * repeated uint32 npc_talk_list = 3; * @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) 48); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(npcTalkList.array()[i]); } } @@ -187,7 +187,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 50: { + case 26: { // npcTalkList [packed=true] input.readPackedUInt32(npcTalkList, tag); bitField0_ |= 0x00000001; @@ -206,7 +206,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { tag = input.readTag(); break; } - case 48: { + case 24: { // 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 f8b2d1c..8c987b5 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 3; */ private int retcode; /** - * repeated .NpcTalkInfo npc_talk_info_list = 4; + * repeated .NpcTalkInfo npc_talk_info_list = 12; */ private final RepeatedMessage npcTalkInfoList = RepeatedMessage.newEmptyInstance(NpcTalkInfoOuterClass.NpcTalkInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 3; * @return this */ public GetFirstTalkByPerformanceNpcScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 4; + * repeated .NpcTalkInfo npc_talk_info_list = 12; * @return whether the npcTalkInfoList field is set */ public boolean hasNpcTalkInfoList() { @@ -85,7 +85,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 4; + * repeated .NpcTalkInfo npc_talk_info_list = 12; * @return this */ public GetFirstTalkByPerformanceNpcScRsp clearNpcTalkInfoList() { @@ -95,7 +95,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 4; + * repeated .NpcTalkInfo npc_talk_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. @@ -109,7 +109,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 4; + * repeated .NpcTalkInfo npc_talk_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 @@ -123,7 +123,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 4; + * repeated .NpcTalkInfo npc_talk_info_list = 12; * @param value the npcTalkInfoList to add * @return this */ @@ -135,7 +135,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 4; + * repeated .NpcTalkInfo npc_talk_info_list = 12; * @param values the npcTalkInfoList to add * @return this */ @@ -214,12 +214,12 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < npcTalkInfoList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 98); output.writeMessageNoTag(npcTalkInfoList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 98) { break; } } - case 34: { + case 98: { // npcTalkInfoList tag = input.readRepeatedMessage(npcTalkInfoList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcCsReqOuterClass.java index 026cc66..c432774 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 = 12; + * repeated uint32 npc_id = 15; */ private final RepeatedInt npcId = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id = 12; + * repeated uint32 npc_id = 15; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -43,7 +43,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id = 12; + * repeated uint32 npc_id = 15; * @return this */ public GetFirstTalkNpcCsReq clearNpcId() { @@ -53,7 +53,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id = 12; + * repeated uint32 npc_id = 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 GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id = 12; + * repeated uint32 npc_id = 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 GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id = 12; + * repeated uint32 npc_id = 15; * @param value the npcId to add * @return this */ @@ -92,7 +92,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id = 12; + * repeated uint32 npc_id = 15; * @param values the npcId 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 < npcId.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(npcId.array()[i]); } } @@ -185,7 +185,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 98: { + case 122: { // npcId [packed=true] input.readPackedUInt32(npcId, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { tag = input.readTag(); break; } - case 96: { + case 120: { // npcId [packed=false] tag = input.readRepeatedUInt32(npcId, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcScRspOuterClass.java index 93d5269..8289e30 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 = 5; + * optional uint32 retcode = 4; */ private int retcode; /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 3; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; */ private final RepeatedMessage npcTalkInfoList = RepeatedMessage.newEmptyInstance(FirstNpcTalkInfoOuterClass.FirstNpcTalkInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 5; + * 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 = 5; + * optional uint32 retcode = 4; * @return this */ public GetFirstTalkNpcScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 5; + * 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 = 3; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; * @return whether the npcTalkInfoList field is set */ public boolean hasNpcTalkInfoList() { @@ -85,7 +85,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 3; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; * @return this */ public GetFirstTalkNpcScRsp clearNpcTalkInfoList() { @@ -95,7 +95,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 3; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 3; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -124,7 +124,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 3; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; * @param value the npcTalkInfoList to add * @return this */ @@ -136,7 +136,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 3; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; * @param values the npcTalkInfoList to add * @return this */ @@ -213,12 +213,12 @@ public final class GetFirstTalkNpcScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < npcTalkInfoList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 114); output.writeMessageNoTag(npcTalkInfoList.get(i)); } } @@ -243,16 +243,16 @@ public final class GetFirstTalkNpcScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 114) { break; } } - case 26: { + case 114: { // npcTalkInfoList tag = input.readRepeatedMessage(npcTalkInfoList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java index 75c2a1e..f4dd815 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 = 9; + * optional uint32 retcode = 12; */ private int retcode; /** - * repeated .FriendApplyInfo friend_apply_list = 5; + * repeated .FriendApplyInfo friend_apply_list = 3; */ private final RepeatedMessage friendApplyList = RepeatedMessage.newEmptyInstance(FriendApplyInfoOuterClass.FriendApplyInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * 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 GetFriendApplyListInfoScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @return this */ public GetFriendApplyListInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 5; + * repeated .FriendApplyInfo friend_apply_list = 3; * @return whether the friendApplyList field is set */ public boolean hasFriendApplyList() { @@ -85,7 +85,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 5; + * repeated .FriendApplyInfo friend_apply_list = 3; * @return this */ public GetFriendApplyListInfoScRsp clearFriendApplyList() { @@ -95,7 +95,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 5; + * repeated .FriendApplyInfo friend_apply_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 GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 5; + * repeated .FriendApplyInfo friend_apply_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 GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 5; + * repeated .FriendApplyInfo friend_apply_list = 3; * @param value the friendApplyList to add * @return this */ @@ -135,7 +135,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 5; + * repeated .FriendApplyInfo friend_apply_list = 3; * @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) 72); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendApplyList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 26); output.writeMessageNoTag(friendApplyList.get(i)); } } @@ -242,16 +242,16 @@ public final class GetFriendApplyListInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 26) { break; } } - case 42: { + case 26: { // 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 a879dd3..da87cb4 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 = 6; + * optional uint32 retcode = 10; */ private int retcode; /** - * repeated .FriendListInfo friend_list = 2; + * repeated .FriendListInfo friend_list = 13; */ private final RepeatedMessage friendList = RepeatedMessage.newEmptyInstance(FriendListInfoOuterClass.FriendListInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * 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 = 6; + * optional uint32 retcode = 10; * @return this */ public GetFriendListInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 2; + * repeated .FriendListInfo friend_list = 13; * @return whether the friendList field is set */ public boolean hasFriendList() { @@ -85,7 +85,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 2; + * repeated .FriendListInfo friend_list = 13; * @return this */ public GetFriendListInfoScRsp clearFriendList() { @@ -95,7 +95,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 2; + * repeated .FriendListInfo friend_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 GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 2; + * repeated .FriendListInfo friend_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 GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 2; + * repeated .FriendListInfo friend_list = 13; * @param value the friendList to add * @return this */ @@ -135,7 +135,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 2; + * repeated .FriendListInfo friend_list = 13; * @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) 48); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 106); output.writeMessageNoTag(friendList.get(i)); } } @@ -242,16 +242,16 @@ public final class GetFriendListInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 106) { break; } } - case 18: { + case 106: { // 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 9676d84..8669e44 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java @@ -20,20 +20,15 @@ public final class GetFriendLoginInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 9; */ private int retcode; /** - * repeated uint32 friend_uid_list = 11; + * repeated uint32 friend_uid_list = 2; */ private final RepeatedInt friendUidList = RepeatedInt.newEmptyInstance(); - /** - * repeated uint32 DKOGBHPIFKJ = 12; - */ - private final RepeatedInt dKOGBHPIFKJ = RepeatedInt.newEmptyInstance(); - private GetFriendLoginInfoScRsp() { } @@ -45,7 +40,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +48,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 9; * @return this */ public GetFriendLoginInfoScRsp clearRetcode() { @@ -63,7 +58,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -71,7 +66,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -82,7 +77,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 11; + * repeated uint32 friend_uid_list = 2; * @return whether the friendUidList field is set */ public boolean hasFriendUidList() { @@ -90,7 +85,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 11; + * repeated uint32 friend_uid_list = 2; * @return this */ public GetFriendLoginInfoScRsp clearFriendUidList() { @@ -100,7 +95,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 11; + * repeated uint32 friend_uid_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. @@ -114,7 +109,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 11; + * repeated uint32 friend_uid_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 @@ -128,7 +123,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 11; + * repeated uint32 friend_uid_list = 2; * @param value the friendUidList to add * @return this */ @@ -139,7 +134,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 11; + * repeated uint32 friend_uid_list = 2; * @param values the friendUidList to add * @return this */ @@ -149,74 +144,6 @@ public final class GetFriendLoginInfoScRspOuterClass { return this; } - /** - * repeated uint32 DKOGBHPIFKJ = 12; - * @return whether the dKOGBHPIFKJ field is set - */ - public boolean hasDKOGBHPIFKJ() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated uint32 DKOGBHPIFKJ = 12; - * @return this - */ - public GetFriendLoginInfoScRsp clearDKOGBHPIFKJ() { - bitField0_ &= ~0x00000004; - dKOGBHPIFKJ.clear(); - return this; - } - - /** - * repeated uint32 DKOGBHPIFKJ = 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 #getMutableDKOGBHPIFKJ()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getDKOGBHPIFKJ() { - return dKOGBHPIFKJ; - } - - /** - * repeated uint32 DKOGBHPIFKJ = 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 getMutableDKOGBHPIFKJ() { - bitField0_ |= 0x00000004; - return dKOGBHPIFKJ; - } - - /** - * repeated uint32 DKOGBHPIFKJ = 12; - * @param value the dKOGBHPIFKJ to add - * @return this - */ - public GetFriendLoginInfoScRsp addDKOGBHPIFKJ(final int value) { - bitField0_ |= 0x00000004; - dKOGBHPIFKJ.add(value); - return this; - } - - /** - * repeated uint32 DKOGBHPIFKJ = 12; - * @param values the dKOGBHPIFKJ to add - * @return this - */ - public GetFriendLoginInfoScRsp addAllDKOGBHPIFKJ(final int... values) { - bitField0_ |= 0x00000004; - dKOGBHPIFKJ.addAll(values); - return this; - } - @Override public GetFriendLoginInfoScRsp copyFrom(final GetFriendLoginInfoScRsp other) { cachedSize = other.cachedSize; @@ -224,7 +151,6 @@ public final class GetFriendLoginInfoScRspOuterClass { bitField0_ = other.bitField0_; retcode = other.retcode; friendUidList.copyFrom(other.friendUidList); - dKOGBHPIFKJ.copyFrom(other.dKOGBHPIFKJ); } return this; } @@ -241,9 +167,6 @@ public final class GetFriendLoginInfoScRspOuterClass { if (other.hasFriendUidList()) { getMutableFriendUidList().addAll(other.friendUidList); } - if (other.hasDKOGBHPIFKJ()) { - getMutableDKOGBHPIFKJ().addAll(other.dKOGBHPIFKJ); - } return this; } @@ -256,7 +179,6 @@ public final class GetFriendLoginInfoScRspOuterClass { bitField0_ = 0; retcode = 0; friendUidList.clear(); - dKOGBHPIFKJ.clear(); return this; } @@ -268,7 +190,6 @@ public final class GetFriendLoginInfoScRspOuterClass { cachedSize = -1; bitField0_ = 0; friendUidList.clear(); - dKOGBHPIFKJ.clear(); return this; } @@ -283,28 +204,21 @@ public final class GetFriendLoginInfoScRspOuterClass { GetFriendLoginInfoScRsp other = (GetFriendLoginInfoScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasFriendUidList() || friendUidList.equals(other.friendUidList)) - && (!hasDKOGBHPIFKJ() || dKOGBHPIFKJ.equals(other.dKOGBHPIFKJ)); + && (!hasFriendUidList() || friendUidList.equals(other.friendUidList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendUidList.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(friendUidList.array()[i]); } } - if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < dKOGBHPIFKJ.length(); i++) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(dKOGBHPIFKJ.array()[i]); - } - } } @Override @@ -316,9 +230,6 @@ public final class GetFriendLoginInfoScRspOuterClass { if ((bitField0_ & 0x00000002) != 0) { size += (1 * friendUidList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(friendUidList); } - if ((bitField0_ & 0x00000004) != 0) { - size += (1 * dKOGBHPIFKJ.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(dKOGBHPIFKJ); - } return size; } @@ -329,29 +240,20 @@ public final class GetFriendLoginInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 18) { break; } } - case 90: { + case 18: { // friendUidList [packed=true] input.readPackedUInt32(friendUidList, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { - // dKOGBHPIFKJ [packed=true] - input.readPackedUInt32(dKOGBHPIFKJ, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 0) { break; } @@ -366,18 +268,12 @@ public final class GetFriendLoginInfoScRspOuterClass { tag = input.readTag(); break; } - case 88: { + case 16: { // friendUidList [packed=false] tag = input.readRepeatedUInt32(friendUidList, tag); bitField0_ |= 0x00000002; break; } - case 96: { - // dKOGBHPIFKJ [packed=false] - tag = input.readRepeatedUInt32(dKOGBHPIFKJ, tag); - bitField0_ |= 0x00000004; - break; - } } } } @@ -391,9 +287,6 @@ public final class GetFriendLoginInfoScRspOuterClass { if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedUInt32(FieldNames.friendUidList, friendUidList); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.dKOGBHPIFKJ, dKOGBHPIFKJ); - } output.endObject(); } @@ -427,17 +320,6 @@ public final class GetFriendLoginInfoScRspOuterClass { } break; } - case -778625657: { - if (input.isAtField(FieldNames.dKOGBHPIFKJ)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(dKOGBHPIFKJ); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } default: { input.skipUnknownField(); break; @@ -494,8 +376,6 @@ public final class GetFriendLoginInfoScRspOuterClass { static final FieldName retcode = FieldName.forField("retcode"); static final FieldName friendUidList = FieldName.forField("friendUidList", "friend_uid_list"); - - static final FieldName dKOGBHPIFKJ = FieldName.forField("DKOGBHPIFKJ"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java index ef59c0b..9ec17b2 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 = 8; + * optional uint32 retcode = 2; */ private int retcode; /** - * repeated .FriendRecommendInfo friend_recommend_list = 10; + * 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 = 8; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 2; * @return this */ public GetFriendRecommendListInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 10; + * 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 = 10; + * repeated .FriendRecommendInfo friend_recommend_list = 12; * @return this */ public GetFriendRecommendListInfoScRsp clearFriendRecommendList() { @@ -95,7 +95,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 10; + * 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 = 10; + * 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 = 10; + * 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 = 10; + * 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) 64); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendRecommendList.length(); i++) { - output.writeRawByte((byte) 82); + 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 64: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 98) { break; } } - case 82: { + 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 ba29e9d..1df2c2e 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 = 12; + * optional uint32 gacha_type = 11; */ private int gachaType; @@ -34,7 +34,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 12; + * optional uint32 gacha_type = 11; * @return whether the gachaType field is set */ public boolean hasGachaType() { @@ -42,7 +42,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 12; + * optional uint32 gacha_type = 11; * @return this */ public GetGachaCeilingCsReq clearGachaType() { @@ -52,7 +52,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 12; + * optional uint32 gacha_type = 11; * @return the gachaType */ public int getGachaType() { @@ -60,7 +60,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 12; + * optional uint32 gacha_type = 11; * @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) 96); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(gachaType); } } @@ -150,7 +150,7 @@ public final class GetGachaCeilingCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 88: { // 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 38ffad6..528d386 100644 --- a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java @@ -24,12 +24,12 @@ public final class GetGachaCeilingScRspOuterClass { private int retcode; /** - * optional uint32 gacha_type = 6; + * optional uint32 gacha_type = 8; */ private int gachaType; /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 11; */ private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); @@ -81,7 +81,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 6; + * optional uint32 gacha_type = 8; * @return whether the gachaType field is set */ public boolean hasGachaType() { @@ -89,7 +89,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 6; + * optional uint32 gacha_type = 8; * @return this */ public GetGachaCeilingScRsp clearGachaType() { @@ -99,7 +99,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 6; + * optional uint32 gacha_type = 8; * @return the gachaType */ public int getGachaType() { @@ -107,7 +107,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 6; + * optional uint32 gacha_type = 8; * @param value the gachaType to set * @return this */ @@ -118,7 +118,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 11; * @return whether the gachaCeiling field is set */ public boolean hasGachaCeiling() { @@ -126,7 +126,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 11; * @return this */ public GetGachaCeilingScRsp clearGachaCeiling() { @@ -136,7 +136,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 11; * @param value the gachaCeiling to set * @return this */ @@ -250,11 +250,11 @@ public final class GetGachaCeilingScRspOuterClass { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(gachaType); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 90); output.writeMessageNoTag(gachaCeiling); } } @@ -286,20 +286,20 @@ public final class GetGachaCeilingScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 64) { break; } } - case 48: { + case 64: { // gachaType gachaType = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 10) { + if (tag != 90) { break; } } - case 10: { + case 90: { // 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 288028d..3a566cf 100644 --- a/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetGachaInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 8; */ private int retcode; /** - * repeated .GachaInfo gacha_info_list = 13; + * repeated .GachaInfo gacha_info_list = 7; */ private final RepeatedMessage gachaInfoList = RepeatedMessage.newEmptyInstance(GachaInfoOuterClass.GachaInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 8; * @return this */ public GetGachaInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 13; + * repeated .GachaInfo gacha_info_list = 7; * @return whether the gachaInfoList field is set */ public boolean hasGachaInfoList() { @@ -85,7 +85,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 13; + * repeated .GachaInfo gacha_info_list = 7; * @return this */ public GetGachaInfoScRsp clearGachaInfoList() { @@ -95,7 +95,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 13; + * repeated .GachaInfo gacha_info_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 13; + * repeated .GachaInfo gacha_info_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 13; + * repeated .GachaInfo gacha_info_list = 7; * @param value the gachaInfoList to add * @return this */ @@ -134,7 +134,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 13; + * repeated .GachaInfo gacha_info_list = 7; * @param values the gachaInfoList to add * @return this */ @@ -210,12 +210,12 @@ public final class GetGachaInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < gachaInfoList.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 58); output.writeMessageNoTag(gachaInfoList.get(i)); } } @@ -240,16 +240,16 @@ public final class GetGachaInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 58) { break; } } - case 106: { + case 58: { // gachaInfoList tag = input.readRepeatedMessage(gachaInfoList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java index 3646223..3f7a24d 100644 --- a/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java @@ -20,20 +20,20 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional .Gender gender = 1; - */ - private int gender; - - /** - * optional .HeroBasicType cur_basic_type = 7; + * optional .HeroBasicType cur_basic_type = 5; */ private int curBasicType; + /** + * optional .Gender gender = 13; + */ + private int gender; + /** * repeated .HeroBasicTypeInfo basic_type_info_list = 2; */ @@ -50,7 +50,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -58,7 +58,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 6; * @return this */ public GetHeroBasicTypeInfoScRsp clearRetcode() { @@ -68,7 +68,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -76,7 +76,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -87,87 +87,25 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional .Gender gender = 1; - * @return whether the gender field is set + * optional .HeroBasicType cur_basic_type = 5; + * @return whether the curBasicType field is set */ - public boolean hasGender() { + public boolean hasCurBasicType() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .Gender gender = 1; - * @return this - */ - public GetHeroBasicTypeInfoScRsp clearGender() { - bitField0_ &= ~0x00000002; - gender = 0; - return this; - } - - /** - * optional .Gender gender = 1; - * @return the gender - */ - public GenderOuterClass.Gender getGender() { - return GenderOuterClass.Gender.forNumber(gender); - } - - /** - * Gets the value of the internal enum store. The result is - * equivalent to {@link GetHeroBasicTypeInfoScRsp#getGender()}.getNumber(). - * - * @return numeric wire representation - */ - public int getGenderValue() { - return gender; - } - - /** - * Sets the value of the internal enum store. This does not - * do any validity checks, so be sure to use appropriate value - * constants from {@link GenderOuterClass.Gender}. Setting an invalid value - * can cause {@link GetHeroBasicTypeInfoScRsp#getGender()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public GetHeroBasicTypeInfoScRsp setGenderValue(final int value) { - bitField0_ |= 0x00000002; - gender = value; - return this; - } - - /** - * optional .Gender gender = 1; - * @param value the gender to set - * @return this - */ - public GetHeroBasicTypeInfoScRsp setGender(final GenderOuterClass.Gender value) { - bitField0_ |= 0x00000002; - gender = value.getNumber(); - return this; - } - - /** - * optional .HeroBasicType cur_basic_type = 7; - * @return whether the curBasicType field is set - */ - public boolean hasCurBasicType() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .HeroBasicType cur_basic_type = 7; + * optional .HeroBasicType cur_basic_type = 5; * @return this */ public GetHeroBasicTypeInfoScRsp clearCurBasicType() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; curBasicType = 0; return this; } /** - * optional .HeroBasicType cur_basic_type = 7; + * optional .HeroBasicType cur_basic_type = 5; * @return the curBasicType */ public HeroBasicTypeOuterClass.HeroBasicType getCurBasicType() { @@ -194,23 +132,85 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { * @return this */ public GetHeroBasicTypeInfoScRsp setCurBasicTypeValue(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; curBasicType = value; return this; } /** - * optional .HeroBasicType cur_basic_type = 7; + * optional .HeroBasicType cur_basic_type = 5; * @param value the curBasicType to set * @return this */ public GetHeroBasicTypeInfoScRsp setCurBasicType( final HeroBasicTypeOuterClass.HeroBasicType value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; curBasicType = value.getNumber(); return this; } + /** + * optional .Gender gender = 13; + * @return whether the gender field is set + */ + public boolean hasGender() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .Gender gender = 13; + * @return this + */ + public GetHeroBasicTypeInfoScRsp clearGender() { + bitField0_ &= ~0x00000004; + gender = 0; + return this; + } + + /** + * optional .Gender gender = 13; + * @return the gender + */ + public GenderOuterClass.Gender getGender() { + return GenderOuterClass.Gender.forNumber(gender); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link GetHeroBasicTypeInfoScRsp#getGender()}.getNumber(). + * + * @return numeric wire representation + */ + public int getGenderValue() { + return gender; + } + + /** + * Sets the value of the internal enum store. This does not + * do any validity checks, so be sure to use appropriate value + * constants from {@link GenderOuterClass.Gender}. Setting an invalid value + * can cause {@link GetHeroBasicTypeInfoScRsp#getGender()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public GetHeroBasicTypeInfoScRsp setGenderValue(final int value) { + bitField0_ |= 0x00000004; + gender = value; + return this; + } + + /** + * optional .Gender gender = 13; + * @param value the gender to set + * @return this + */ + public GetHeroBasicTypeInfoScRsp setGender(final GenderOuterClass.Gender value) { + bitField0_ |= 0x00000004; + gender = value.getNumber(); + return this; + } + /** * repeated .HeroBasicTypeInfo basic_type_info_list = 2; * @return whether the basicTypeInfoList field is set @@ -288,8 +288,8 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - gender = other.gender; curBasicType = other.curBasicType; + gender = other.gender; basicTypeInfoList.copyFrom(other.basicTypeInfoList); } return this; @@ -304,12 +304,12 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasGender()) { - setGenderValue(other.gender); - } if (other.hasCurBasicType()) { setCurBasicTypeValue(other.curBasicType); } + if (other.hasGender()) { + setGenderValue(other.gender); + } if (other.hasBasicTypeInfoList()) { getMutableBasicTypeInfoList().addAll(other.basicTypeInfoList); } @@ -324,8 +324,8 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - gender = 0; curBasicType = 0; + gender = 0; basicTypeInfoList.clear(); return this; } @@ -352,24 +352,24 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { GetHeroBasicTypeInfoScRsp other = (GetHeroBasicTypeInfoScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasGender() || gender == other.gender) && (!hasCurBasicType() || curBasicType == other.curBasicType) + && (!hasGender() || gender == other.gender) && (!hasBasicTypeInfoList() || basicTypeInfoList.equals(other.basicTypeInfoList)); } @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) 8); - output.writeEnumNoTag(gender); + output.writeRawByte((byte) 40); + output.writeEnumNoTag(curBasicType); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeEnumNoTag(curBasicType); + output.writeRawByte((byte) 104); + output.writeEnumNoTag(gender); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < basicTypeInfoList.length(); i++) { @@ -386,10 +386,10 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(gender); + size += 1 + ProtoSink.computeEnumSizeNoTag(curBasicType); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(curBasicType); + size += 1 + ProtoSink.computeEnumSizeNoTag(gender); } if ((bitField0_ & 0x00000008) != 0) { size += (1 * basicTypeInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(basicTypeInfoList); @@ -404,32 +404,32 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 40) { break; } } - case 8: { - // gender - final int value = input.readInt32(); - if (GenderOuterClass.Gender.forNumber(value) != null) { - gender = value; - bitField0_ |= 0x00000002; - } - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 40: { // curBasicType final int value = input.readInt32(); if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { curBasicType = value; + bitField0_ |= 0x00000002; + } + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // gender + final int value = input.readInt32(); + if (GenderOuterClass.Gender.forNumber(value) != null) { + gender = value; bitField0_ |= 0x00000004; } tag = input.readTag(); @@ -466,10 +466,10 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeEnum(FieldNames.gender, gender, GenderOuterClass.Gender.converter()); + output.writeEnum(FieldNames.curBasicType, curBasicType, HeroBasicTypeOuterClass.HeroBasicType.converter()); } if ((bitField0_ & 0x00000004) != 0) { - output.writeEnum(FieldNames.curBasicType, curBasicType, HeroBasicTypeOuterClass.HeroBasicType.converter()); + output.writeEnum(FieldNames.gender, gender, GenderOuterClass.Gender.converter()); } if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.basicTypeInfoList, basicTypeInfoList); @@ -495,12 +495,13 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } break; } - case -1249512767: { - if (input.isAtField(FieldNames.gender)) { + case -518506968: + case -979186678: { + if (input.isAtField(FieldNames.curBasicType)) { if (!input.trySkipNullValue()) { - final GenderOuterClass.Gender value = input.readEnum(GenderOuterClass.Gender.converter()); + final HeroBasicTypeOuterClass.HeroBasicType value = input.readEnum(HeroBasicTypeOuterClass.HeroBasicType.converter()); if (value != null) { - gender = value.getNumber(); + curBasicType = value.getNumber(); bitField0_ |= 0x00000002; } else { input.skipUnknownEnumValue(); @@ -511,13 +512,12 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } break; } - case -518506968: - case -979186678: { - if (input.isAtField(FieldNames.curBasicType)) { + case -1249512767: { + if (input.isAtField(FieldNames.gender)) { if (!input.trySkipNullValue()) { - final HeroBasicTypeOuterClass.HeroBasicType value = input.readEnum(HeroBasicTypeOuterClass.HeroBasicType.converter()); + final GenderOuterClass.Gender value = input.readEnum(GenderOuterClass.Gender.converter()); if (value != null) { - curBasicType = value.getNumber(); + gender = value.getNumber(); bitField0_ |= 0x00000004; } else { input.skipUnknownEnumValue(); @@ -595,10 +595,10 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName gender = FieldName.forField("gender"); - static final FieldName curBasicType = FieldName.forField("curBasicType", "cur_basic_type"); + static final FieldName gender = FieldName.forField("gender"); + static final FieldName basicTypeInfoList = FieldName.forField("basicTypeInfoList", "basic_type_info_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java index 3870f39..7098554 100644 --- a/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java @@ -25,12 +25,12 @@ public final class GetJukeboxDataScRspOuterClass { private int retcode; /** - * optional uint32 playing_id = 10; + * optional uint32 playing_id = 9; */ private int playingId; /** - * repeated .UnlockedMusic music_list = 3; + * repeated .UnlockedMusic music_list = 10; */ private final RepeatedMessage musicList = RepeatedMessage.newEmptyInstance(UnlockedMusicOuterClass.UnlockedMusic.getFactory()); @@ -82,7 +82,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 playing_id = 10; + * optional uint32 playing_id = 9; * @return whether the playingId field is set */ public boolean hasPlayingId() { @@ -90,7 +90,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 playing_id = 10; + * optional uint32 playing_id = 9; * @return this */ public GetJukeboxDataScRsp clearPlayingId() { @@ -100,7 +100,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 playing_id = 10; + * optional uint32 playing_id = 9; * @return the playingId */ public int getPlayingId() { @@ -108,7 +108,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 playing_id = 10; + * optional uint32 playing_id = 9; * @param value the playingId to set * @return this */ @@ -119,7 +119,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 3; + * repeated .UnlockedMusic music_list = 10; * @return whether the musicList field is set */ public boolean hasMusicList() { @@ -127,7 +127,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 3; + * repeated .UnlockedMusic music_list = 10; * @return this */ public GetJukeboxDataScRsp clearMusicList() { @@ -137,7 +137,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 3; + * repeated .UnlockedMusic music_list = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 3; + * repeated .UnlockedMusic music_list = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 3; + * repeated .UnlockedMusic music_list = 10; * @param value the musicList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 3; + * repeated .UnlockedMusic music_list = 10; * @param values the musicList to add * @return this */ @@ -263,12 +263,12 @@ public final class GetJukeboxDataScRspOuterClass { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(playingId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < musicList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 82); output.writeMessageNoTag(musicList.get(i)); } } @@ -301,20 +301,20 @@ public final class GetJukeboxDataScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 72) { break; } } - case 80: { + case 72: { // playingId playingId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { + if (tag != 82) { break; } } - case 26: { + case 82: { // 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 dc57150..bf5e595 100644 --- a/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java @@ -20,19 +20,19 @@ public final class GetMailScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; + * optional uint32 start = 2; */ - private int retcode; + private int start; /** - * optional uint32 total_num = 8; + * optional uint32 total_num = 5; */ private int totalNum; /** - * optional uint32 start = 14; + * optional uint32 retcode = 9; */ - private int start; + private int retcode; /** * optional bool is_end = 4; @@ -40,12 +40,12 @@ public final class GetMailScRspOuterClass { private boolean isEnd; /** - * repeated .ClientMail mail_list = 2; + * repeated .ClientMail mail_list = 1; */ private final RepeatedMessage mailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); /** - * repeated .ClientMail notice_mail_list = 6; + * repeated .ClientMail notice_mail_list = 7; */ private final RepeatedMessage noticeMailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); @@ -60,44 +60,44 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 retcode = 1; - * @return whether the retcode field is set + * optional uint32 start = 2; + * @return whether the start field is set */ - public boolean hasRetcode() { + public boolean hasStart() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 1; + * optional uint32 start = 2; * @return this */ - public GetMailScRsp clearRetcode() { + public GetMailScRsp clearStart() { bitField0_ &= ~0x00000001; - retcode = 0; + start = 0; return this; } /** - * optional uint32 retcode = 1; - * @return the retcode + * optional uint32 start = 2; + * @return the start */ - public int getRetcode() { - return retcode; + public int getStart() { + return start; } /** - * optional uint32 retcode = 1; - * @param value the retcode to set + * optional uint32 start = 2; + * @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 = 8; + * optional uint32 total_num = 5; * @return whether the totalNum field is set */ public boolean hasTotalNum() { @@ -105,7 +105,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 total_num = 8; + * optional uint32 total_num = 5; * @return this */ public GetMailScRsp clearTotalNum() { @@ -115,7 +115,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 total_num = 8; + * optional uint32 total_num = 5; * @return the totalNum */ public int getTotalNum() { @@ -123,7 +123,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 total_num = 8; + * optional uint32 total_num = 5; * @param value the totalNum to set * @return this */ @@ -134,39 +134,39 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 start = 14; - * @return whether the start field is set + * optional uint32 retcode = 9; + * @return whether the retcode field is set */ - public boolean hasStart() { + public boolean hasRetcode() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 start = 14; + * optional uint32 retcode = 9; * @return this */ - public GetMailScRsp clearStart() { + public GetMailScRsp clearRetcode() { bitField0_ &= ~0x00000004; - start = 0; + retcode = 0; return this; } /** - * optional uint32 start = 14; - * @return the start + * optional uint32 retcode = 9; + * @return the retcode */ - public int getStart() { - return start; + public int getRetcode() { + return retcode; } /** - * optional uint32 start = 14; - * @param value the start to set + * optional uint32 retcode = 9; + * @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; } @@ -208,7 +208,7 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail mail_list = 2; + * repeated .ClientMail mail_list = 1; * @return whether the mailList field is set */ public boolean hasMailList() { @@ -216,7 +216,7 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail mail_list = 2; + * repeated .ClientMail mail_list = 1; * @return this */ public GetMailScRsp clearMailList() { @@ -226,7 +226,7 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail mail_list = 2; + * repeated .ClientMail mail_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. @@ -240,7 +240,7 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail mail_list = 2; + * repeated .ClientMail mail_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 @@ -254,7 +254,7 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail mail_list = 2; + * repeated .ClientMail mail_list = 1; * @param value the mailList to add * @return this */ @@ -265,7 +265,7 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail mail_list = 2; + * repeated .ClientMail mail_list = 1; * @param values the mailList to add * @return this */ @@ -276,7 +276,7 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail notice_mail_list = 6; + * repeated .ClientMail notice_mail_list = 7; * @return whether the noticeMailList field is set */ public boolean hasNoticeMailList() { @@ -284,7 +284,7 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail notice_mail_list = 6; + * repeated .ClientMail notice_mail_list = 7; * @return this */ public GetMailScRsp clearNoticeMailList() { @@ -294,7 +294,7 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail notice_mail_list = 6; + * repeated .ClientMail notice_mail_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. @@ -308,7 +308,7 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail notice_mail_list = 6; + * repeated .ClientMail notice_mail_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 @@ -322,7 +322,7 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail notice_mail_list = 6; + * repeated .ClientMail notice_mail_list = 7; * @param value the noticeMailList to add * @return this */ @@ -333,7 +333,7 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail notice_mail_list = 6; + * repeated .ClientMail notice_mail_list = 7; * @param values the noticeMailList to add * @return this */ @@ -348,9 +348,9 @@ public final class GetMailScRspOuterClass { 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; mailList.copyFrom(other.mailList); noticeMailList.copyFrom(other.noticeMailList); @@ -364,14 +364,14 @@ 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); @@ -392,9 +392,9 @@ public final class GetMailScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; - totalNum = 0; start = 0; + totalNum = 0; + retcode = 0; isEnd = false; mailList.clear(); noticeMailList.clear(); @@ -423,9 +423,9 @@ 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) && (!hasMailList() || mailList.equals(other.mailList)) && (!hasNoticeMailList() || noticeMailList.equals(other.noticeMailList)); @@ -434,16 +434,16 @@ public final class GetMailScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(start); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(totalNum); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(start); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 32); @@ -451,13 +451,13 @@ public final class GetMailScRspOuterClass { } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < mailList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 10); output.writeMessageNoTag(mailList.get(i)); } } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < noticeMailList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 58); output.writeMessageNoTag(noticeMailList.get(i)); } } @@ -467,13 +467,13 @@ 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; @@ -494,27 +494,27 @@ public final class GetMailScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // retcode - retcode = input.readUInt32(); + case 16: { + // start + start = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 40) { break; } } - case 64: { + case 40: { // totalNum totalNum = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 72) { break; } } - case 112: { - // start - start = input.readUInt32(); + case 72: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 32) { @@ -526,19 +526,19 @@ public final class GetMailScRspOuterClass { isEnd = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 18) { + if (tag != 10) { break; } } - case 18: { + case 10: { // mailList tag = input.readRepeatedMessage(mailList, tag); bitField0_ |= 0x00000010; - if (tag != 50) { + if (tag != 58) { break; } } - case 50: { + case 58: { // noticeMailList tag = input.readRepeatedMessage(noticeMailList, tag); bitField0_ |= 0x00000020; @@ -564,13 +564,13 @@ 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); @@ -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 { @@ -713,11 +713,11 @@ 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"); diff --git a/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java index 86c0d76..a8da158 100644 --- a/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java @@ -20,17 +20,17 @@ public final class GetMissionStatusCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 mission_event_id_list = 7; - */ - private final RepeatedInt missionEventIdList = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 sub_mission_id_list = 8; + * repeated uint32 sub_mission_id_list = 2; */ private final RepeatedInt subMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 main_mission_id_list = 14; + * repeated uint32 mission_event_id_list = 8; + */ + private final RepeatedInt missionEventIdList = RepeatedInt.newEmptyInstance(); + + /** + * repeated uint32 main_mission_id_list = 13; */ private final RepeatedInt mainMissionIdList = RepeatedInt.newEmptyInstance(); @@ -45,93 +45,25 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 mission_event_id_list = 7; - * @return whether the missionEventIdList field is set + * repeated uint32 sub_mission_id_list = 2; + * @return whether the subMissionIdList field is set */ - public boolean hasMissionEventIdList() { + public boolean hasSubMissionIdList() { return (bitField0_ & 0x00000001) != 0; } /** - * repeated uint32 mission_event_id_list = 7; - * @return this - */ - public GetMissionStatusCsReq clearMissionEventIdList() { - bitField0_ &= ~0x00000001; - missionEventIdList.clear(); - return this; - } - - /** - * repeated uint32 mission_event_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. - * - * Use {@link #getMutableMissionEventIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getMissionEventIdList() { - return missionEventIdList; - } - - /** - * repeated uint32 mission_event_id_list = 7; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableMissionEventIdList() { - bitField0_ |= 0x00000001; - return missionEventIdList; - } - - /** - * repeated uint32 mission_event_id_list = 7; - * @param value the missionEventIdList to add - * @return this - */ - public GetMissionStatusCsReq addMissionEventIdList(final int value) { - bitField0_ |= 0x00000001; - missionEventIdList.add(value); - return this; - } - - /** - * repeated uint32 mission_event_id_list = 7; - * @param values the missionEventIdList to add - * @return this - */ - public GetMissionStatusCsReq addAllMissionEventIdList(final int... values) { - bitField0_ |= 0x00000001; - missionEventIdList.addAll(values); - return this; - } - - /** - * repeated uint32 sub_mission_id_list = 8; - * @return whether the subMissionIdList field is set - */ - public boolean hasSubMissionIdList() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * repeated uint32 sub_mission_id_list = 8; + * repeated uint32 sub_mission_id_list = 2; * @return this */ public GetMissionStatusCsReq clearSubMissionIdList() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; subMissionIdList.clear(); return this; } /** - * repeated uint32 sub_mission_id_list = 8; + * repeated uint32 sub_mission_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. @@ -145,7 +77,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 sub_mission_id_list = 8; + * repeated uint32 sub_mission_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 @@ -154,34 +86,102 @@ public final class GetMissionStatusCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableSubMissionIdList() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return subMissionIdList; } /** - * repeated uint32 sub_mission_id_list = 8; + * repeated uint32 sub_mission_id_list = 2; * @param value the subMissionIdList to add * @return this */ public GetMissionStatusCsReq addSubMissionIdList(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; subMissionIdList.add(value); return this; } /** - * repeated uint32 sub_mission_id_list = 8; + * repeated uint32 sub_mission_id_list = 2; * @param values the subMissionIdList to add * @return this */ public GetMissionStatusCsReq addAllSubMissionIdList(final int... values) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; subMissionIdList.addAll(values); return this; } /** - * repeated uint32 main_mission_id_list = 14; + * repeated uint32 mission_event_id_list = 8; + * @return whether the missionEventIdList field is set + */ + public boolean hasMissionEventIdList() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * repeated uint32 mission_event_id_list = 8; + * @return this + */ + public GetMissionStatusCsReq clearMissionEventIdList() { + bitField0_ &= ~0x00000002; + missionEventIdList.clear(); + return this; + } + + /** + * repeated uint32 mission_event_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. + * + * Use {@link #getMutableMissionEventIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getMissionEventIdList() { + return missionEventIdList; + } + + /** + * repeated uint32 mission_event_id_list = 8; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableMissionEventIdList() { + bitField0_ |= 0x00000002; + return missionEventIdList; + } + + /** + * repeated uint32 mission_event_id_list = 8; + * @param value the missionEventIdList to add + * @return this + */ + public GetMissionStatusCsReq addMissionEventIdList(final int value) { + bitField0_ |= 0x00000002; + missionEventIdList.add(value); + return this; + } + + /** + * repeated uint32 mission_event_id_list = 8; + * @param values the missionEventIdList to add + * @return this + */ + public GetMissionStatusCsReq addAllMissionEventIdList(final int... values) { + bitField0_ |= 0x00000002; + missionEventIdList.addAll(values); + return this; + } + + /** + * repeated uint32 main_mission_id_list = 13; * @return whether the mainMissionIdList field is set */ public boolean hasMainMissionIdList() { @@ -189,7 +189,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 main_mission_id_list = 14; + * repeated uint32 main_mission_id_list = 13; * @return this */ public GetMissionStatusCsReq clearMainMissionIdList() { @@ -199,7 +199,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 main_mission_id_list = 14; + * repeated uint32 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. @@ -213,7 +213,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 main_mission_id_list = 14; + * repeated uint32 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 @@ -227,7 +227,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 main_mission_id_list = 14; + * repeated uint32 main_mission_id_list = 13; * @param value the mainMissionIdList to add * @return this */ @@ -238,7 +238,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 main_mission_id_list = 14; + * repeated uint32 main_mission_id_list = 13; * @param values the mainMissionIdList to add * @return this */ @@ -253,8 +253,8 @@ public final class GetMissionStatusCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - missionEventIdList.copyFrom(other.missionEventIdList); subMissionIdList.copyFrom(other.subMissionIdList); + missionEventIdList.copyFrom(other.missionEventIdList); mainMissionIdList.copyFrom(other.mainMissionIdList); } return this; @@ -266,12 +266,12 @@ public final class GetMissionStatusCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasMissionEventIdList()) { - getMutableMissionEventIdList().addAll(other.missionEventIdList); - } if (other.hasSubMissionIdList()) { getMutableSubMissionIdList().addAll(other.subMissionIdList); } + if (other.hasMissionEventIdList()) { + getMutableMissionEventIdList().addAll(other.missionEventIdList); + } if (other.hasMainMissionIdList()) { getMutableMainMissionIdList().addAll(other.mainMissionIdList); } @@ -285,8 +285,8 @@ public final class GetMissionStatusCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - missionEventIdList.clear(); subMissionIdList.clear(); + missionEventIdList.clear(); mainMissionIdList.clear(); return this; } @@ -298,8 +298,8 @@ public final class GetMissionStatusCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - missionEventIdList.clear(); subMissionIdList.clear(); + missionEventIdList.clear(); mainMissionIdList.clear(); return this; } @@ -314,28 +314,28 @@ public final class GetMissionStatusCsReqOuterClass { } GetMissionStatusCsReq other = (GetMissionStatusCsReq) o; return bitField0_ == other.bitField0_ - && (!hasMissionEventIdList() || missionEventIdList.equals(other.missionEventIdList)) && (!hasSubMissionIdList() || subMissionIdList.equals(other.subMissionIdList)) + && (!hasMissionEventIdList() || missionEventIdList.equals(other.missionEventIdList)) && (!hasMainMissionIdList() || mainMissionIdList.equals(other.mainMissionIdList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - for (int i = 0; i < missionEventIdList.length(); i++) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(missionEventIdList.array()[i]); + for (int i = 0; i < subMissionIdList.length(); i++) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(subMissionIdList.array()[i]); } } if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < subMissionIdList.length(); i++) { + for (int i = 0; i < missionEventIdList.length(); i++) { output.writeRawByte((byte) 64); - output.writeUInt32NoTag(subMissionIdList.array()[i]); + output.writeUInt32NoTag(missionEventIdList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < mainMissionIdList.length(); i++) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(mainMissionIdList.array()[i]); } } @@ -345,10 +345,10 @@ public final class GetMissionStatusCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += (1 * missionEventIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(missionEventIdList); + size += (1 * subMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(subMissionIdList); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * subMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(subMissionIdList); + size += (1 * missionEventIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(missionEventIdList); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * mainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mainMissionIdList); @@ -363,9 +363,9 @@ public final class GetMissionStatusCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { - // missionEventIdList [packed=true] - input.readPackedUInt32(missionEventIdList, tag); + case 18: { + // subMissionIdList [packed=true] + input.readPackedUInt32(subMissionIdList, tag); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 66) { @@ -373,15 +373,15 @@ public final class GetMissionStatusCsReqOuterClass { } } case 66: { - // subMissionIdList [packed=true] - input.readPackedUInt32(subMissionIdList, tag); + // missionEventIdList [packed=true] + input.readPackedUInt32(missionEventIdList, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 114) { + if (tag != 106) { break; } } - case 114: { + case 106: { // mainMissionIdList [packed=true] input.readPackedUInt32(mainMissionIdList, tag); bitField0_ |= 0x00000004; @@ -400,19 +400,19 @@ public final class GetMissionStatusCsReqOuterClass { tag = input.readTag(); break; } - case 56: { - // missionEventIdList [packed=false] - tag = input.readRepeatedUInt32(missionEventIdList, tag); + case 16: { + // subMissionIdList [packed=false] + tag = input.readRepeatedUInt32(subMissionIdList, tag); bitField0_ |= 0x00000001; break; } case 64: { - // subMissionIdList [packed=false] - tag = input.readRepeatedUInt32(subMissionIdList, tag); + // missionEventIdList [packed=false] + tag = input.readRepeatedUInt32(missionEventIdList, tag); bitField0_ |= 0x00000002; break; } - case 112: { + case 104: { // mainMissionIdList [packed=false] tag = input.readRepeatedUInt32(mainMissionIdList, tag); bitField0_ |= 0x00000004; @@ -426,10 +426,10 @@ public final class GetMissionStatusCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeRepeatedUInt32(FieldNames.missionEventIdList, missionEventIdList); + output.writeRepeatedUInt32(FieldNames.subMissionIdList, subMissionIdList); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedUInt32(FieldNames.subMissionIdList, subMissionIdList); + output.writeRepeatedUInt32(FieldNames.missionEventIdList, missionEventIdList); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedUInt32(FieldNames.mainMissionIdList, mainMissionIdList); @@ -444,11 +444,11 @@ public final class GetMissionStatusCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 784770663: - case -628890838: { - if (input.isAtField(FieldNames.missionEventIdList)) { + case 2039339685: + case -225917552: { + if (input.isAtField(FieldNames.subMissionIdList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(missionEventIdList); + input.readRepeatedUInt32(subMissionIdList); bitField0_ |= 0x00000001; } } else { @@ -456,11 +456,11 @@ public final class GetMissionStatusCsReqOuterClass { } break; } - case 2039339685: - case -225917552: { - if (input.isAtField(FieldNames.subMissionIdList)) { + case 784770663: + case -628890838: { + if (input.isAtField(FieldNames.missionEventIdList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(subMissionIdList); + input.readRepeatedUInt32(missionEventIdList); bitField0_ |= 0x00000002; } } else { @@ -533,10 +533,10 @@ public final class GetMissionStatusCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName missionEventIdList = FieldName.forField("missionEventIdList", "mission_event_id_list"); - static final FieldName subMissionIdList = FieldName.forField("subMissionIdList", "sub_mission_id_list"); + static final FieldName missionEventIdList = FieldName.forField("missionEventIdList", "mission_event_id_list"); + static final FieldName mainMissionIdList = FieldName.forField("mainMissionIdList", "main_mission_id_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java index aba8881..807887a 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 = 4; + * optional uint32 retcode = 2; */ private int retcode; /** - * repeated uint32 unfinished_main_mission_id_list = 10; + * repeated uint32 unfinished_main_mission_id_list = 9; */ private final RepeatedInt unfinishedMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 disabled_main_mission_id_list = 11; + * repeated uint32 disabled_main_mission_id_list = 13; */ private final RepeatedInt disabledMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 finished_main_mission_id_list = 13; + * repeated uint32 finished_main_mission_id_list = 14; */ private final RepeatedInt finishedMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .Mission mission_event_status_list = 9; - */ - private final RepeatedMessage missionEventStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); - - /** - * repeated .Mission sub_mission_status_list = 14; + * repeated .Mission sub_mission_status_list = 5; */ private final RepeatedMessage subMissionStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); + /** + * repeated .Mission mission_event_status_list = 6; + */ + private final RepeatedMessage missionEventStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); + private GetMissionStatusScRsp() { } @@ -61,7 +61,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -69,7 +69,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @return this */ public GetMissionStatusScRsp clearRetcode() { @@ -79,7 +79,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -87,7 +87,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -98,7 +98,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 unfinished_main_mission_id_list = 10; + * repeated uint32 unfinished_main_mission_id_list = 9; * @return whether the unfinishedMainMissionIdList field is set */ public boolean hasUnfinishedMainMissionIdList() { @@ -106,7 +106,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 unfinished_main_mission_id_list = 10; + * repeated uint32 unfinished_main_mission_id_list = 9; * @return this */ public GetMissionStatusScRsp clearUnfinishedMainMissionIdList() { @@ -116,7 +116,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 unfinished_main_mission_id_list = 10; + * repeated uint32 unfinished_main_mission_id_list = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -130,7 +130,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 unfinished_main_mission_id_list = 10; + * repeated uint32 unfinished_main_mission_id_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -144,7 +144,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 unfinished_main_mission_id_list = 10; + * repeated uint32 unfinished_main_mission_id_list = 9; * @param value the unfinishedMainMissionIdList to add * @return this */ @@ -155,7 +155,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 unfinished_main_mission_id_list = 10; + * repeated uint32 unfinished_main_mission_id_list = 9; * @param values the unfinishedMainMissionIdList to add * @return this */ @@ -166,7 +166,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 11; + * repeated uint32 disabled_main_mission_id_list = 13; * @return whether the disabledMainMissionIdList field is set */ public boolean hasDisabledMainMissionIdList() { @@ -174,7 +174,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 11; + * repeated uint32 disabled_main_mission_id_list = 13; * @return this */ public GetMissionStatusScRsp clearDisabledMainMissionIdList() { @@ -184,7 +184,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 11; + * 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 +198,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 11; + * 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 @@ -212,7 +212,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 11; + * repeated uint32 disabled_main_mission_id_list = 13; * @param value the disabledMainMissionIdList to add * @return this */ @@ -223,7 +223,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 11; + * repeated uint32 disabled_main_mission_id_list = 13; * @param values the disabledMainMissionIdList to add * @return this */ @@ -234,7 +234,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 13; + * repeated uint32 finished_main_mission_id_list = 14; * @return whether the finishedMainMissionIdList field is set */ public boolean hasFinishedMainMissionIdList() { @@ -242,7 +242,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 13; + * repeated uint32 finished_main_mission_id_list = 14; * @return this */ public GetMissionStatusScRsp clearFinishedMainMissionIdList() { @@ -252,7 +252,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 13; + * repeated uint32 finished_main_mission_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. @@ -266,7 +266,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 13; + * repeated uint32 finished_main_mission_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 @@ -280,7 +280,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 13; + * repeated uint32 finished_main_mission_id_list = 14; * @param value the finishedMainMissionIdList to add * @return this */ @@ -291,7 +291,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 13; + * repeated uint32 finished_main_mission_id_list = 14; * @param values the finishedMainMissionIdList to add * @return this */ @@ -302,94 +302,25 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated .Mission mission_event_status_list = 9; - * @return whether the missionEventStatusList field is set + * repeated .Mission sub_mission_status_list = 5; + * @return whether the subMissionStatusList field is set */ - public boolean hasMissionEventStatusList() { + public boolean hasSubMissionStatusList() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated .Mission mission_event_status_list = 9; - * @return this - */ - public GetMissionStatusScRsp clearMissionEventStatusList() { - bitField0_ &= ~0x00000010; - 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_ |= 0x00000010; - 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_ |= 0x00000010; - 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_ |= 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 = 5; * @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 = 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. @@ -403,7 +334,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated .Mission sub_mission_status_list = 14; + * repeated .Mission sub_mission_status_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 @@ -412,33 +343,102 @@ public final class GetMissionStatusScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableSubMissionStatusList() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return subMissionStatusList; } /** - * repeated .Mission sub_mission_status_list = 14; + * repeated .Mission sub_mission_status_list = 5; * @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 = 5; * @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 = 6; + * @return whether the missionEventStatusList field is set + */ + public boolean hasMissionEventStatusList() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * repeated .Mission mission_event_status_list = 6; + * @return this + */ + public GetMissionStatusScRsp clearMissionEventStatusList() { + bitField0_ &= ~0x00000020; + missionEventStatusList.clear(); + return this; + } + + /** + * repeated .Mission mission_event_status_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 #getMutableMissionEventStatusList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMissionEventStatusList() { + return missionEventStatusList; + } + + /** + * repeated .Mission mission_event_status_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 getMutableMissionEventStatusList() { + bitField0_ |= 0x00000020; + return missionEventStatusList; + } + + /** + * repeated .Mission mission_event_status_list = 6; + * @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 = 6; + * @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; @@ -448,8 +448,8 @@ public final class GetMissionStatusScRspOuterClass { unfinishedMainMissionIdList.copyFrom(other.unfinishedMainMissionIdList); disabledMainMissionIdList.copyFrom(other.disabledMainMissionIdList); finishedMainMissionIdList.copyFrom(other.finishedMainMissionIdList); - missionEventStatusList.copyFrom(other.missionEventStatusList); subMissionStatusList.copyFrom(other.subMissionStatusList); + missionEventStatusList.copyFrom(other.missionEventStatusList); } return this; } @@ -472,12 +472,12 @@ public final class GetMissionStatusScRspOuterClass { if (other.hasFinishedMainMissionIdList()) { getMutableFinishedMainMissionIdList().addAll(other.finishedMainMissionIdList); } - if (other.hasMissionEventStatusList()) { - getMutableMissionEventStatusList().addAll(other.missionEventStatusList); - } if (other.hasSubMissionStatusList()) { getMutableSubMissionStatusList().addAll(other.subMissionStatusList); } + if (other.hasMissionEventStatusList()) { + getMutableMissionEventStatusList().addAll(other.missionEventStatusList); + } return this; } @@ -492,8 +492,8 @@ public final class GetMissionStatusScRspOuterClass { unfinishedMainMissionIdList.clear(); disabledMainMissionIdList.clear(); finishedMainMissionIdList.clear(); - missionEventStatusList.clear(); subMissionStatusList.clear(); + missionEventStatusList.clear(); return this; } @@ -507,8 +507,8 @@ public final class GetMissionStatusScRspOuterClass { unfinishedMainMissionIdList.clear(); disabledMainMissionIdList.clear(); finishedMainMissionIdList.clear(); - missionEventStatusList.clearQuick(); subMissionStatusList.clearQuick(); + missionEventStatusList.clearQuick(); return this; } @@ -526,44 +526,44 @@ public final class GetMissionStatusScRspOuterClass { && (!hasUnfinishedMainMissionIdList() || unfinishedMainMissionIdList.equals(other.unfinishedMainMissionIdList)) && (!hasDisabledMainMissionIdList() || disabledMainMissionIdList.equals(other.disabledMainMissionIdList)) && (!hasFinishedMainMissionIdList() || finishedMainMissionIdList.equals(other.finishedMainMissionIdList)) - && (!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) 32); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unfinishedMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(unfinishedMainMissionIdList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < disabledMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(disabledMainMissionIdList.array()[i]); } } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < finishedMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(finishedMainMissionIdList.array()[i]); } } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < missionEventStatusList.length(); i++) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(missionEventStatusList.get(i)); + for (int i = 0; i < subMissionStatusList.length(); i++) { + output.writeRawByte((byte) 42); + 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) 50); + output.writeMessageNoTag(missionEventStatusList.get(i)); } } } @@ -584,10 +584,10 @@ public final class GetMissionStatusScRspOuterClass { size += (1 * finishedMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(finishedMainMissionIdList); } 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,53 +599,53 @@ public final class GetMissionStatusScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { - break; - } - } - case 82: { - // unfinishedMainMissionIdList [packed=true] - input.readPackedUInt32(unfinishedMainMissionIdList, tag); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { - // disabledMainMissionIdList [packed=true] - input.readPackedUInt32(disabledMainMissionIdList, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { - // finishedMainMissionIdList [packed=true] - input.readPackedUInt32(finishedMainMissionIdList, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); if (tag != 74) { break; } } case 74: { - // missionEventStatusList - tag = input.readRepeatedMessage(missionEventStatusList, tag); - bitField0_ |= 0x00000010; + // unfinishedMainMissionIdList [packed=true] + input.readPackedUInt32(unfinishedMainMissionIdList, tag); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { + // disabledMainMissionIdList [packed=true] + input.readPackedUInt32(disabledMainMissionIdList, tag); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 114) { break; } } case 114: { + // finishedMainMissionIdList [packed=true] + input.readPackedUInt32(finishedMainMissionIdList, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { // subMissionStatusList tag = input.readRepeatedMessage(subMissionStatusList, tag); + bitField0_ |= 0x00000010; + if (tag != 50) { + break; + } + } + case 50: { + // missionEventStatusList + tag = input.readRepeatedMessage(missionEventStatusList, tag); bitField0_ |= 0x00000020; if (tag != 0) { break; @@ -661,19 +661,19 @@ public final class GetMissionStatusScRspOuterClass { tag = input.readTag(); break; } - case 80: { + case 72: { // unfinishedMainMissionIdList [packed=false] tag = input.readRepeatedUInt32(unfinishedMainMissionIdList, tag); bitField0_ |= 0x00000002; break; } - case 88: { + case 104: { // disabledMainMissionIdList [packed=false] tag = input.readRepeatedUInt32(disabledMainMissionIdList, tag); bitField0_ |= 0x00000004; break; } - case 104: { + case 112: { // finishedMainMissionIdList [packed=false] tag = input.readRepeatedUInt32(finishedMainMissionIdList, tag); bitField0_ |= 0x00000008; @@ -699,10 +699,10 @@ public final class GetMissionStatusScRspOuterClass { output.writeRepeatedUInt32(FieldNames.finishedMainMissionIdList, finishedMainMissionIdList); } 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(); } @@ -761,11 +761,11 @@ public final class GetMissionStatusScRspOuterClass { } break; } - case 582053566: - case 1494751923: { - if (input.isAtField(FieldNames.missionEventStatusList)) { + case -1842850820: + case 1165580825: { + if (input.isAtField(FieldNames.subMissionStatusList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(missionEventStatusList); + input.readRepeatedMessage(subMissionStatusList); bitField0_ |= 0x00000010; } } else { @@ -773,11 +773,11 @@ public final class GetMissionStatusScRspOuterClass { } break; } - case -1842850820: - case 1165580825: { - if (input.isAtField(FieldNames.subMissionStatusList)) { + case 582053566: + case 1494751923: { + if (input.isAtField(FieldNames.missionEventStatusList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(subMissionStatusList); + input.readRepeatedMessage(missionEventStatusList); bitField0_ |= 0x00000020; } } else { @@ -846,9 +846,9 @@ public final class GetMissionStatusScRspOuterClass { static final FieldName finishedMainMissionIdList = FieldName.forField("finishedMainMissionIdList", "finished_main_mission_id_list"); - static final FieldName missionEventStatusList = FieldName.forField("missionEventStatusList", "mission_event_status_list"); - static final FieldName subMissionStatusList = FieldName.forField("subMissionStatusList", "sub_mission_status_list"); + + static final FieldName missionEventStatusList = FieldName.forField("missionEventStatusList", "mission_event_status_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java index 5a73302..56d92ea 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 = 4; + * optional uint32 npc_id = 3; */ private int npcId; @@ -34,7 +34,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 4; + * optional uint32 npc_id = 3; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -42,7 +42,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 4; + * optional uint32 npc_id = 3; * @return this */ public GetNpcTakenRewardCsReq clearNpcId() { @@ -52,7 +52,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 4; + * optional uint32 npc_id = 3; * @return the npcId */ public int getNpcId() { @@ -60,7 +60,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 4; + * optional uint32 npc_id = 3; * @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) 32); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(npcId); } } @@ -150,7 +150,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 24: { // 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 8f9f014..82ec527 100644 --- a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java @@ -10,6 +10,7 @@ import us.hebi.quickbuf.MessageFactory; import us.hebi.quickbuf.ProtoMessage; import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; +import us.hebi.quickbuf.RepeatedInt; public final class GetNpcTakenRewardScRspOuterClass { /** @@ -19,14 +20,19 @@ public final class GetNpcTakenRewardScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; + * optional uint32 npc_id = 5; + */ + private int npcId; + + /** + * optional uint32 retcode = 8; */ private int retcode; /** - * optional uint32 npc_id = 13; + * repeated uint32 GGJBDJJGNIG = 7; */ - private int npcId; + private final RepeatedInt gGJBDJJGNIG = RepeatedInt.newEmptyInstance(); private GetNpcTakenRewardScRsp() { } @@ -39,62 +45,25 @@ public final class GetNpcTakenRewardScRspOuterClass { } /** - * optional uint32 retcode = 3; - * @return whether the retcode field is set + * optional uint32 npc_id = 5; + * @return whether the npcId field is set */ - public boolean hasRetcode() { + public boolean hasNpcId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 3; - * @return this - */ - public GetNpcTakenRewardScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 3; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 3; - * @param value the retcode to set - * @return this - */ - public GetNpcTakenRewardScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 npc_id = 13; - * @return whether the npcId field is set - */ - public boolean hasNpcId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 npc_id = 13; + * optional uint32 npc_id = 5; * @return this */ public GetNpcTakenRewardScRsp clearNpcId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; npcId = 0; return this; } /** - * optional uint32 npc_id = 13; + * optional uint32 npc_id = 5; * @return the npcId */ public int getNpcId() { @@ -102,23 +71,129 @@ public final class GetNpcTakenRewardScRspOuterClass { } /** - * optional uint32 npc_id = 13; + * optional uint32 npc_id = 5; * @param value the npcId to set * @return this */ public GetNpcTakenRewardScRsp setNpcId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; npcId = value; return this; } + /** + * optional uint32 retcode = 8; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 8; + * @return this + */ + public GetNpcTakenRewardScRsp 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 GetNpcTakenRewardScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * repeated uint32 GGJBDJJGNIG = 7; + * @return whether the gGJBDJJGNIG field is set + */ + public boolean hasGGJBDJJGNIG() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated uint32 GGJBDJJGNIG = 7; + * @return this + */ + public GetNpcTakenRewardScRsp clearGGJBDJJGNIG() { + bitField0_ &= ~0x00000004; + gGJBDJJGNIG.clear(); + return this; + } + + /** + * repeated uint32 GGJBDJJGNIG = 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 #getMutableGGJBDJJGNIG()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getGGJBDJJGNIG() { + return gGJBDJJGNIG; + } + + /** + * repeated uint32 GGJBDJJGNIG = 7; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableGGJBDJJGNIG() { + bitField0_ |= 0x00000004; + return gGJBDJJGNIG; + } + + /** + * repeated uint32 GGJBDJJGNIG = 7; + * @param value the gGJBDJJGNIG to add + * @return this + */ + public GetNpcTakenRewardScRsp addGGJBDJJGNIG(final int value) { + bitField0_ |= 0x00000004; + gGJBDJJGNIG.add(value); + return this; + } + + /** + * repeated uint32 GGJBDJJGNIG = 7; + * @param values the gGJBDJJGNIG to add + * @return this + */ + public GetNpcTakenRewardScRsp addAllGGJBDJJGNIG(final int... values) { + bitField0_ |= 0x00000004; + gGJBDJJGNIG.addAll(values); + return this; + } + @Override public GetNpcTakenRewardScRsp copyFrom(final GetNpcTakenRewardScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; npcId = other.npcId; + retcode = other.retcode; + gGJBDJJGNIG.copyFrom(other.gGJBDJJGNIG); } return this; } @@ -129,11 +204,14 @@ 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); + if (other.hasGGJBDJJGNIG()) { + getMutableGGJBDJJGNIG().addAll(other.gGJBDJJGNIG); } return this; } @@ -145,8 +223,9 @@ public final class GetNpcTakenRewardScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; npcId = 0; + retcode = 0; + gGJBDJJGNIG.clear(); return this; } @@ -157,6 +236,7 @@ public final class GetNpcTakenRewardScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + gGJBDJJGNIG.clear(); return this; } @@ -170,19 +250,26 @@ public final class GetNpcTakenRewardScRspOuterClass { } GetNpcTakenRewardScRsp other = (GetNpcTakenRewardScRsp) o; return bitField0_ == other.bitField0_ + && (!hasNpcId() || npcId == other.npcId) && (!hasRetcode() || retcode == other.retcode) - && (!hasNpcId() || npcId == other.npcId); + && (!hasGGJBDJJGNIG() || gGJBDJJGNIG.equals(other.gGJBDJJGNIG)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(npcId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(npcId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + for (int i = 0; i < gGJBDJJGNIG.length(); i++) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(gGJBDJJGNIG.array()[i]); + } } } @@ -190,10 +277,13 @@ public final class GetNpcTakenRewardScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + size += (1 * gGJBDJJGNIG.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(gGJBDJJGNIG); } return size; } @@ -205,20 +295,29 @@ public final class GetNpcTakenRewardScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // retcode - retcode = input.readUInt32(); + case 40: { + // npcId + npcId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 64) { break; } } - case 104: { - // npcId - npcId = input.readUInt32(); + case 64: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // gGJBDJJGNIG [packed=true] + input.readPackedUInt32(gGJBDJJGNIG, tag); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 0) { break; } @@ -233,6 +332,12 @@ public final class GetNpcTakenRewardScRspOuterClass { tag = input.readTag(); break; } + case 56: { + // gGJBDJJGNIG [packed=false] + tag = input.readRepeatedUInt32(gGJBDJJGNIG, tag); + bitField0_ |= 0x00000004; + break; + } } } } @@ -241,10 +346,13 @@ public final class GetNpcTakenRewardScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.npcId, npcId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.npcId, npcId); + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRepeatedUInt32(FieldNames.gGJBDJJGNIG, gGJBDJJGNIG); } output.endObject(); } @@ -256,10 +364,11 @@ public final class GetNpcTakenRewardScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 105021404: + case -1039282375: { + if (input.isAtField(FieldNames.npcId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + npcId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +376,10 @@ public final class GetNpcTakenRewardScRspOuterClass { } break; } - case 105021404: - case -1039282375: { - if (input.isAtField(FieldNames.npcId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - npcId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -279,6 +387,17 @@ public final class GetNpcTakenRewardScRspOuterClass { } break; } + case 1061434801: { + if (input.isAtField(FieldNames.gGJBDJJGNIG)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(gGJBDJJGNIG); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -332,9 +451,11 @@ 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"); + static final FieldName gGJBDJJGNIG = FieldName.forField("GGJBDJJGNIG"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java index 6c30f5c..2dbe8d5 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java @@ -20,30 +20,30 @@ public final class GetPhoneDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_phone_theme = 10; + * optional uint32 cur_phone_theme = 3; */ private int curPhoneTheme; + /** + * optional uint32 retcode = 6; + */ + private int retcode; + /** * optional uint32 cur_chat_bubble = 13; */ private int curChatBubble; /** - * optional uint32 retcode = 14; - */ - private int retcode; - - /** - * repeated uint32 owned_chat_bubbles = 9; - */ - private final RepeatedInt ownedChatBubbles = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 owned_phone_themes = 11; + * repeated uint32 owned_phone_themes = 1; */ private final RepeatedInt ownedPhoneThemes = RepeatedInt.newEmptyInstance(); + /** + * repeated uint32 owned_chat_bubbles = 15; + */ + private final RepeatedInt ownedChatBubbles = RepeatedInt.newEmptyInstance(); + private GetPhoneDataScRsp() { } @@ -55,7 +55,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 10; + * optional uint32 cur_phone_theme = 3; * @return whether the curPhoneTheme field is set */ public boolean hasCurPhoneTheme() { @@ -63,7 +63,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 10; + * optional uint32 cur_phone_theme = 3; * @return this */ public GetPhoneDataScRsp clearCurPhoneTheme() { @@ -73,7 +73,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 10; + * optional uint32 cur_phone_theme = 3; * @return the curPhoneTheme */ public int getCurPhoneTheme() { @@ -81,7 +81,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 10; + * optional uint32 cur_phone_theme = 3; * @param value the curPhoneTheme to set * @return this */ @@ -91,12 +91,49 @@ public final class GetPhoneDataScRspOuterClass { 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 GetPhoneDataScRsp 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 GetPhoneDataScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + /** * optional uint32 cur_chat_bubble = 13; * @return whether the curChatBubble field is set */ public boolean hasCurChatBubble() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -104,7 +141,7 @@ public final class GetPhoneDataScRspOuterClass { * @return this */ public GetPhoneDataScRsp clearCurChatBubble() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; curChatBubble = 0; return this; } @@ -123,136 +160,31 @@ public final class GetPhoneDataScRspOuterClass { * @return this */ public GetPhoneDataScRsp setCurChatBubble(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; curChatBubble = value; return this; } /** - * optional uint32 retcode = 14; - * @return whether the retcode field is set + * repeated uint32 owned_phone_themes = 1; + * @return whether the ownedPhoneThemes field is set */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 retcode = 14; - * @return this - */ - public GetPhoneDataScRsp 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 GetPhoneDataScRsp setRetcode(final int value) { - bitField0_ |= 0x00000004; - retcode = value; - return this; - } - - /** - * repeated uint32 owned_chat_bubbles = 9; - * @return whether the ownedChatBubbles field is set - */ - public boolean hasOwnedChatBubbles() { + public boolean hasOwnedPhoneThemes() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated uint32 owned_chat_bubbles = 9; - * @return this - */ - public GetPhoneDataScRsp clearOwnedChatBubbles() { - bitField0_ &= ~0x00000008; - 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_ |= 0x00000008; - return ownedChatBubbles; - } - - /** - * repeated uint32 owned_chat_bubbles = 9; - * @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 = 9; - * @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 = 11; - * @return whether the ownedPhoneThemes field is set - */ - public boolean hasOwnedPhoneThemes() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated uint32 owned_phone_themes = 11; + * repeated uint32 owned_phone_themes = 1; * @return this */ public GetPhoneDataScRsp clearOwnedPhoneThemes() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; ownedPhoneThemes.clear(); return this; } /** - * repeated uint32 owned_phone_themes = 11; + * repeated uint32 owned_phone_themes = 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. @@ -266,7 +198,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * repeated uint32 owned_phone_themes = 11; + * repeated uint32 owned_phone_themes = 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 @@ -275,42 +207,110 @@ public final class GetPhoneDataScRspOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableOwnedPhoneThemes() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return ownedPhoneThemes; } /** - * repeated uint32 owned_phone_themes = 11; + * repeated uint32 owned_phone_themes = 1; * @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 = 11; + * repeated uint32 owned_phone_themes = 1; * @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 = 15; + * @return whether the ownedChatBubbles field is set + */ + public boolean hasOwnedChatBubbles() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * repeated uint32 owned_chat_bubbles = 15; + * @return this + */ + public GetPhoneDataScRsp clearOwnedChatBubbles() { + bitField0_ &= ~0x00000010; + ownedChatBubbles.clear(); + return this; + } + + /** + * repeated uint32 owned_chat_bubbles = 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 #getMutableOwnedChatBubbles()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getOwnedChatBubbles() { + return ownedChatBubbles; + } + + /** + * repeated uint32 owned_chat_bubbles = 15; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableOwnedChatBubbles() { + bitField0_ |= 0x00000010; + return ownedChatBubbles; + } + + /** + * repeated uint32 owned_chat_bubbles = 15; + * @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 = 15; + * @param values the ownedChatBubbles to add + * @return this + */ + public GetPhoneDataScRsp addAllOwnedChatBubbles(final int... values) { + bitField0_ |= 0x00000010; + ownedChatBubbles.addAll(values); + return this; + } + @Override public GetPhoneDataScRsp copyFrom(final GetPhoneDataScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; curPhoneTheme = other.curPhoneTheme; - curChatBubble = other.curChatBubble; retcode = other.retcode; - ownedChatBubbles.copyFrom(other.ownedChatBubbles); + curChatBubble = other.curChatBubble; ownedPhoneThemes.copyFrom(other.ownedPhoneThemes); + ownedChatBubbles.copyFrom(other.ownedChatBubbles); } return this; } @@ -324,18 +324,18 @@ public final class GetPhoneDataScRspOuterClass { if (other.hasCurPhoneTheme()) { setCurPhoneTheme(other.curPhoneTheme); } - if (other.hasCurChatBubble()) { - setCurChatBubble(other.curChatBubble); - } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasOwnedChatBubbles()) { - getMutableOwnedChatBubbles().addAll(other.ownedChatBubbles); + if (other.hasCurChatBubble()) { + setCurChatBubble(other.curChatBubble); } if (other.hasOwnedPhoneThemes()) { getMutableOwnedPhoneThemes().addAll(other.ownedPhoneThemes); } + if (other.hasOwnedChatBubbles()) { + getMutableOwnedChatBubbles().addAll(other.ownedChatBubbles); + } return this; } @@ -347,10 +347,10 @@ public final class GetPhoneDataScRspOuterClass { cachedSize = -1; bitField0_ = 0; curPhoneTheme = 0; - curChatBubble = 0; retcode = 0; - ownedChatBubbles.clear(); + curChatBubble = 0; ownedPhoneThemes.clear(); + ownedChatBubbles.clear(); return this; } @@ -361,8 +361,8 @@ public final class GetPhoneDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - ownedChatBubbles.clear(); ownedPhoneThemes.clear(); + ownedChatBubbles.clear(); return this; } @@ -377,36 +377,36 @@ public final class GetPhoneDataScRspOuterClass { GetPhoneDataScRsp other = (GetPhoneDataScRsp) o; return bitField0_ == other.bitField0_ && (!hasCurPhoneTheme() || curPhoneTheme == other.curPhoneTheme) - && (!hasCurChatBubble() || curChatBubble == other.curChatBubble) && (!hasRetcode() || retcode == other.retcode) - && (!hasOwnedChatBubbles() || ownedChatBubbles.equals(other.ownedChatBubbles)) - && (!hasOwnedPhoneThemes() || ownedPhoneThemes.equals(other.ownedPhoneThemes)); + && (!hasCurChatBubble() || curChatBubble == other.curChatBubble) + && (!hasOwnedPhoneThemes() || ownedPhoneThemes.equals(other.ownedPhoneThemes)) + && (!hasOwnedChatBubbles() || ownedChatBubbles.equals(other.ownedChatBubbles)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(curPhoneTheme); } if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 104); output.writeUInt32NoTag(curChatBubble); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(retcode); - } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < ownedChatBubbles.length(); i++) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(ownedChatBubbles.array()[i]); + for (int i = 0; i < ownedPhoneThemes.length(); i++) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(ownedPhoneThemes.array()[i]); } } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < ownedPhoneThemes.length(); i++) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(ownedPhoneThemes.array()[i]); + for (int i = 0; i < ownedChatBubbles.length(); i++) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(ownedChatBubbles.array()[i]); } } } @@ -418,16 +418,16 @@ public final class GetPhoneDataScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(curPhoneTheme); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curChatBubble); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } + if ((bitField0_ & 0x00000004) != 0) { + 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; } @@ -439,11 +439,20 @@ public final class GetPhoneDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 24: { // curPhoneTheme curPhoneTheme = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 104) { break; } @@ -451,33 +460,24 @@ public final class GetPhoneDataScRspOuterClass { case 104: { // curChatBubble curChatBubble = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // retcode - retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 74) { + if (tag != 10) { break; } } - case 74: { - // ownedChatBubbles [packed=true] - input.readPackedUInt32(ownedChatBubbles, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { + case 10: { // ownedPhoneThemes [packed=true] input.readPackedUInt32(ownedPhoneThemes, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // 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 72: { - // ownedChatBubbles [packed=false] - tag = input.readRepeatedUInt32(ownedChatBubbles, tag); + case 8: { + // ownedPhoneThemes [packed=false] + tag = input.readRepeatedUInt32(ownedPhoneThemes, tag); bitField0_ |= 0x00000008; break; } - case 88: { - // ownedPhoneThemes [packed=false] - tag = input.readRepeatedUInt32(ownedPhoneThemes, tag); + case 120: { + // ownedChatBubbles [packed=false] + tag = input.readRepeatedUInt32(ownedChatBubbles, tag); bitField0_ |= 0x00000010; break; } @@ -517,16 +517,16 @@ public final class GetPhoneDataScRspOuterClass { output.writeUInt32(FieldNames.curPhoneTheme, curPhoneTheme); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curChatBubble, curChatBubble); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } + if ((bitField0_ & 0x00000004) != 0) { + 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(); } @@ -550,11 +550,10 @@ public final class GetPhoneDataScRspOuterClass { } break; } - case 94167140: - case 1828957140: { - if (input.isAtField(FieldNames.curChatBubble)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - curChatBubble = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -562,10 +561,11 @@ public final class GetPhoneDataScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 94167140: + case 1828957140: { + if (input.isAtField(FieldNames.curChatBubble)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + curChatBubble = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -573,23 +573,23 @@ public final class GetPhoneDataScRspOuterClass { } break; } - case -1579353334: - case -1491735846: { - if (input.isAtField(FieldNames.ownedChatBubbles)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(ownedChatBubbles); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case -512676109: case -1128638699: { if (input.isAtField(FieldNames.ownedPhoneThemes)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(ownedPhoneThemes); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1579353334: + case -1491735846: { + if (input.isAtField(FieldNames.ownedChatBubbles)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(ownedChatBubbles); bitField0_ |= 0x00000010; } } else { @@ -652,13 +652,13 @@ public final class GetPhoneDataScRspOuterClass { static class FieldNames { static final FieldName curPhoneTheme = FieldName.forField("curPhoneTheme", "cur_phone_theme"); - static final FieldName curChatBubble = FieldName.forField("curChatBubble", "cur_chat_bubble"); - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName ownedChatBubbles = FieldName.forField("ownedChatBubbles", "owned_chat_bubbles"); + static final FieldName curChatBubble = FieldName.forField("curChatBubble", "cur_chat_bubble"); 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 033ab71..3d94049 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.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; import us.hebi.quickbuf.Utf8String; @@ -21,25 +22,30 @@ public final class GetPlayerBoardDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 current_head_icon_id = 2; + * optional uint32 current_head_icon_id = 10; */ private int currentHeadIconId; /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; */ private int retcode; /** - * optional .DisplayAvatarVec display_avatar_vec = 13; + * optional .DisplayAvatarVec display_avatar_vec = 11; */ private final DisplayAvatarVecOuterClass.DisplayAvatarVec displayAvatarVec = DisplayAvatarVecOuterClass.DisplayAvatarVec.newInstance(); /** - * optional string signature = 15; + * optional string signature = 9; */ private final Utf8String signature = Utf8String.newEmptyInstance(); + /** + * repeated uint32 display_support_avatar_vec = 15; + */ + private final RepeatedInt displaySupportAvatarVec = RepeatedInt.newEmptyInstance(); + /** * repeated .HeadIcon unlocked_head_icon_list = 3; */ @@ -56,7 +62,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 2; + * optional uint32 current_head_icon_id = 10; * @return whether the currentHeadIconId field is set */ public boolean hasCurrentHeadIconId() { @@ -64,7 +70,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 2; + * optional uint32 current_head_icon_id = 10; * @return this */ public GetPlayerBoardDataScRsp clearCurrentHeadIconId() { @@ -74,7 +80,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 2; + * optional uint32 current_head_icon_id = 10; * @return the currentHeadIconId */ public int getCurrentHeadIconId() { @@ -82,7 +88,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 2; + * optional uint32 current_head_icon_id = 10; * @param value the currentHeadIconId to set * @return this */ @@ -93,7 +99,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -101,7 +107,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @return this */ public GetPlayerBoardDataScRsp clearRetcode() { @@ -111,7 +117,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -119,7 +125,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -130,7 +136,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional .DisplayAvatarVec display_avatar_vec = 13; + * optional .DisplayAvatarVec display_avatar_vec = 11; * @return whether the displayAvatarVec field is set */ public boolean hasDisplayAvatarVec() { @@ -138,7 +144,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional .DisplayAvatarVec display_avatar_vec = 13; + * optional .DisplayAvatarVec display_avatar_vec = 11; * @return this */ public GetPlayerBoardDataScRsp clearDisplayAvatarVec() { @@ -148,7 +154,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional .DisplayAvatarVec display_avatar_vec = 13; + * optional .DisplayAvatarVec display_avatar_vec = 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. @@ -162,7 +168,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional .DisplayAvatarVec display_avatar_vec = 13; + * optional .DisplayAvatarVec display_avatar_vec = 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 @@ -176,7 +182,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional .DisplayAvatarVec display_avatar_vec = 13; + * optional .DisplayAvatarVec display_avatar_vec = 11; * @param value the displayAvatarVec to set * @return this */ @@ -188,7 +194,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 15; + * optional string signature = 9; * @return whether the signature field is set */ public boolean hasSignature() { @@ -196,7 +202,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 15; + * optional string signature = 9; * @return this */ public GetPlayerBoardDataScRsp clearSignature() { @@ -206,7 +212,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 15; + * optional string signature = 9; * @return the signature */ public String getSignature() { @@ -214,7 +220,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 15; + * optional string signature = 9; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -222,7 +228,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 15; + * optional string signature = 9; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -231,7 +237,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 15; + * optional string signature = 9; * @param value the signature to set * @return this */ @@ -242,7 +248,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 15; + * optional string signature = 9; * @param value the signature to set * @return this */ @@ -252,12 +258,80 @@ public final class GetPlayerBoardDataScRspOuterClass { return this; } + /** + * repeated uint32 display_support_avatar_vec = 15; + * @return whether the displaySupportAvatarVec field is set + */ + public boolean hasDisplaySupportAvatarVec() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * repeated uint32 display_support_avatar_vec = 15; + * @return this + */ + public GetPlayerBoardDataScRsp clearDisplaySupportAvatarVec() { + bitField0_ &= ~0x00000010; + displaySupportAvatarVec.clear(); + return this; + } + + /** + * repeated uint32 display_support_avatar_vec = 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 #getMutableDisplaySupportAvatarVec()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getDisplaySupportAvatarVec() { + return displaySupportAvatarVec; + } + + /** + * repeated uint32 display_support_avatar_vec = 15; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableDisplaySupportAvatarVec() { + bitField0_ |= 0x00000010; + return displaySupportAvatarVec; + } + + /** + * repeated uint32 display_support_avatar_vec = 15; + * @param value the displaySupportAvatarVec to add + * @return this + */ + public GetPlayerBoardDataScRsp addDisplaySupportAvatarVec(final int value) { + bitField0_ |= 0x00000010; + displaySupportAvatarVec.add(value); + return this; + } + + /** + * repeated uint32 display_support_avatar_vec = 15; + * @param values the displaySupportAvatarVec to add + * @return this + */ + public GetPlayerBoardDataScRsp addAllDisplaySupportAvatarVec(final int... values) { + bitField0_ |= 0x00000010; + displaySupportAvatarVec.addAll(values); + return this; + } + /** * repeated .HeadIcon unlocked_head_icon_list = 3; * @return whether the unlockedHeadIconList field is set */ public boolean hasUnlockedHeadIconList() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000020) != 0; } /** @@ -265,7 +339,7 @@ public final class GetPlayerBoardDataScRspOuterClass { * @return this */ public GetPlayerBoardDataScRsp clearUnlockedHeadIconList() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000020; unlockedHeadIconList.clear(); return this; } @@ -294,7 +368,7 @@ public final class GetPlayerBoardDataScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableUnlockedHeadIconList() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; return unlockedHeadIconList; } @@ -305,7 +379,7 @@ public final class GetPlayerBoardDataScRspOuterClass { */ public GetPlayerBoardDataScRsp addUnlockedHeadIconList( final HeadIconOuterClass.HeadIcon value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; unlockedHeadIconList.add(value); return this; } @@ -317,7 +391,7 @@ public final class GetPlayerBoardDataScRspOuterClass { */ public GetPlayerBoardDataScRsp addAllUnlockedHeadIconList( final HeadIconOuterClass.HeadIcon... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; unlockedHeadIconList.addAll(values); return this; } @@ -331,6 +405,7 @@ public final class GetPlayerBoardDataScRspOuterClass { retcode = other.retcode; displayAvatarVec.copyFrom(other.displayAvatarVec); signature.copyFrom(other.signature); + displaySupportAvatarVec.copyFrom(other.displaySupportAvatarVec); unlockedHeadIconList.copyFrom(other.unlockedHeadIconList); } return this; @@ -354,6 +429,9 @@ public final class GetPlayerBoardDataScRspOuterClass { if (other.hasSignature()) { getMutableSignatureBytes().copyFrom(other.signature); } + if (other.hasDisplaySupportAvatarVec()) { + getMutableDisplaySupportAvatarVec().addAll(other.displaySupportAvatarVec); + } if (other.hasUnlockedHeadIconList()) { getMutableUnlockedHeadIconList().addAll(other.unlockedHeadIconList); } @@ -371,6 +449,7 @@ public final class GetPlayerBoardDataScRspOuterClass { retcode = 0; displayAvatarVec.clear(); signature.clear(); + displaySupportAvatarVec.clear(); unlockedHeadIconList.clear(); return this; } @@ -384,6 +463,7 @@ public final class GetPlayerBoardDataScRspOuterClass { bitField0_ = 0; displayAvatarVec.clearQuick(); signature.clear(); + displaySupportAvatarVec.clear(); unlockedHeadIconList.clearQuick(); return this; } @@ -402,28 +482,35 @@ public final class GetPlayerBoardDataScRspOuterClass { && (!hasRetcode() || retcode == other.retcode) && (!hasDisplayAvatarVec() || displayAvatarVec.equals(other.displayAvatarVec)) && (!hasSignature() || signature.equals(other.signature)) + && (!hasDisplaySupportAvatarVec() || displaySupportAvatarVec.equals(other.displaySupportAvatarVec)) && (!hasUnlockedHeadIconList() || unlockedHeadIconList.equals(other.unlockedHeadIconList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(currentHeadIconId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 90); output.writeMessageNoTag(displayAvatarVec); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 74); output.writeStringNoTag(signature); } if ((bitField0_ & 0x00000010) != 0) { + for (int i = 0; i < displaySupportAvatarVec.length(); i++) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(displaySupportAvatarVec.array()[i]); + } + } + if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < unlockedHeadIconList.length(); i++) { output.writeRawByte((byte) 26); output.writeMessageNoTag(unlockedHeadIconList.get(i)); @@ -447,6 +534,9 @@ public final class GetPlayerBoardDataScRspOuterClass { size += 1 + ProtoSink.computeStringSizeNoTag(signature); } if ((bitField0_ & 0x00000010) != 0) { + size += (1 * displaySupportAvatarVec.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(displaySupportAvatarVec); + } + if ((bitField0_ & 0x00000020) != 0) { size += (1 * unlockedHeadIconList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedHeadIconList); } return size; @@ -459,37 +549,46 @@ public final class GetPlayerBoardDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 80: { // currentHeadIconId currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 96) { break; } } - case 72: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 106) { + if (tag != 90) { break; } } - case 106: { + case 90: { // displayAvatarVec input.readMessage(displayAvatarVec); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // signature + input.readString(signature); + bitField0_ |= 0x00000008; + tag = input.readTag(); if (tag != 122) { break; } } case 122: { - // signature - input.readString(signature); - bitField0_ |= 0x00000008; + // displaySupportAvatarVec [packed=true] + input.readPackedUInt32(displaySupportAvatarVec, tag); + bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 26) { break; @@ -498,7 +597,7 @@ public final class GetPlayerBoardDataScRspOuterClass { case 26: { // unlockedHeadIconList tag = input.readRepeatedMessage(unlockedHeadIconList, tag); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; if (tag != 0) { break; } @@ -513,6 +612,12 @@ public final class GetPlayerBoardDataScRspOuterClass { tag = input.readTag(); break; } + case 120: { + // displaySupportAvatarVec [packed=false] + tag = input.readRepeatedUInt32(displaySupportAvatarVec, tag); + bitField0_ |= 0x00000010; + break; + } } } } @@ -533,6 +638,9 @@ public final class GetPlayerBoardDataScRspOuterClass { output.writeString(FieldNames.signature, signature); } if ((bitField0_ & 0x00000010) != 0) { + output.writeRepeatedUInt32(FieldNames.displaySupportAvatarVec, displaySupportAvatarVec); + } + if ((bitField0_ & 0x00000020) != 0) { output.writeRepeatedMessage(FieldNames.unlockedHeadIconList, unlockedHeadIconList); } output.endObject(); @@ -591,12 +699,24 @@ public final class GetPlayerBoardDataScRspOuterClass { } break; } + case -1742211762: + case -452250437: { + if (input.isAtField(FieldNames.displaySupportAvatarVec)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(displaySupportAvatarVec); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } case 1875382586: case -1276395039: { if (input.isAtField(FieldNames.unlockedHeadIconList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(unlockedHeadIconList); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -664,6 +784,8 @@ public final class GetPlayerBoardDataScRspOuterClass { static final FieldName signature = FieldName.forField("signature"); + static final FieldName displaySupportAvatarVec = FieldName.forField("displaySupportAvatarVec", "display_support_avatar_vec"); + static final FieldName unlockedHeadIconList = FieldName.forField("unlockedHeadIconList", "unlocked_head_icon_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoCsReqOuterClass.java index a29daa2..a895645 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 = 12; + * optional uint32 uid = 14; */ private int uid; @@ -34,7 +34,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 12; + * optional uint32 uid = 14; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 12; + * optional uint32 uid = 14; * @return this */ public GetPlayerDetailInfoCsReq clearUid() { @@ -52,7 +52,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 12; + * optional uint32 uid = 14; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 12; + * optional uint32 uid = 14; * @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) 96); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 112: { // 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 775fc3f..14ec163 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 = 9; */ private int retcode; /** - * optional .PlayerDetailInfo player_detail_info = 4; + * 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 = 9; * @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 = 9; * @return this */ public GetPlayerDetailInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 4; + * 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 = 4; + * optional .PlayerDetailInfo player_detail_info = 5; * @return this */ public GetPlayerDetailInfoScRsp clearPlayerDetailInfo() { @@ -94,7 +94,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 4; + * 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 = 4; + * 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 = 4; + * 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) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + 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 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 42) { break; } } - case 34: { + 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 5b74231..89ac472 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java @@ -19,15 +19,15 @@ public final class GetPrivateChatHistoryCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 sender_uid = 8; - */ - private int senderUid; - - /** - * optional uint32 to_uid = 13; + * optional uint32 to_uid = 9; */ private int toUid; + /** + * optional uint32 sender_uid = 11; + */ + private int senderUid; + private GetPrivateChatHistoryCsReq() { } @@ -39,62 +39,25 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 sender_uid = 8; - * @return whether the senderUid field is set + * optional uint32 to_uid = 9; + * @return whether the toUid field is set */ - public boolean hasSenderUid() { + public boolean hasToUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 sender_uid = 8; - * @return this - */ - public GetPrivateChatHistoryCsReq clearSenderUid() { - bitField0_ &= ~0x00000001; - senderUid = 0; - return this; - } - - /** - * optional uint32 sender_uid = 8; - * @return the senderUid - */ - public int getSenderUid() { - return senderUid; - } - - /** - * optional uint32 sender_uid = 8; - * @param value the senderUid to set - * @return this - */ - public GetPrivateChatHistoryCsReq setSenderUid(final int value) { - bitField0_ |= 0x00000001; - senderUid = value; - return this; - } - - /** - * optional uint32 to_uid = 13; - * @return whether the toUid field is set - */ - public boolean hasToUid() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 to_uid = 13; + * optional uint32 to_uid = 9; * @return this */ public GetPrivateChatHistoryCsReq clearToUid() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; toUid = 0; return this; } /** - * optional uint32 to_uid = 13; + * optional uint32 to_uid = 9; * @return the toUid */ public int getToUid() { @@ -102,23 +65,60 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 to_uid = 13; + * optional uint32 to_uid = 9; * @param value the toUid to set * @return this */ public GetPrivateChatHistoryCsReq setToUid(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; toUid = value; return this; } + /** + * optional uint32 sender_uid = 11; + * @return whether the senderUid field is set + */ + public boolean hasSenderUid() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 sender_uid = 11; + * @return this + */ + public GetPrivateChatHistoryCsReq clearSenderUid() { + bitField0_ &= ~0x00000002; + senderUid = 0; + return this; + } + + /** + * optional uint32 sender_uid = 11; + * @return the senderUid + */ + public int getSenderUid() { + return senderUid; + } + + /** + * optional uint32 sender_uid = 11; + * @param value the senderUid to set + * @return this + */ + public GetPrivateChatHistoryCsReq setSenderUid(final int value) { + bitField0_ |= 0x00000002; + senderUid = value; + return this; + } + @Override public GetPrivateChatHistoryCsReq copyFrom(final GetPrivateChatHistoryCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - senderUid = other.senderUid; toUid = other.toUid; + senderUid = other.senderUid; } return this; } @@ -129,12 +129,12 @@ public final class GetPrivateChatHistoryCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasSenderUid()) { - setSenderUid(other.senderUid); - } if (other.hasToUid()) { setToUid(other.toUid); } + if (other.hasSenderUid()) { + setSenderUid(other.senderUid); + } return this; } @@ -145,8 +145,8 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - senderUid = 0; toUid = 0; + senderUid = 0; return this; } @@ -170,19 +170,19 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } GetPrivateChatHistoryCsReq other = (GetPrivateChatHistoryCsReq) o; return bitField0_ == other.bitField0_ - && (!hasSenderUid() || senderUid == other.senderUid) - && (!hasToUid() || toUid == other.toUid); + && (!hasToUid() || toUid == other.toUid) + && (!hasSenderUid() || senderUid == other.senderUid); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(senderUid); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(toUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(toUid); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(senderUid); } } @@ -190,10 +190,10 @@ public final class GetPrivateChatHistoryCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); } return size; } @@ -205,18 +205,18 @@ public final class GetPrivateChatHistoryCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // senderUid - senderUid = input.readUInt32(); + case 72: { + // toUid + toUid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 88) { break; } } - case 104: { - // toUid - toUid = input.readUInt32(); + case 88: { + // senderUid + senderUid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class GetPrivateChatHistoryCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.senderUid, senderUid); + output.writeUInt32(FieldNames.toUid, toUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.toUid, toUid); + output.writeUInt32(FieldNames.senderUid, senderUid); } output.endObject(); } @@ -256,11 +256,11 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 32180699: - case 997911366: { - if (input.isAtField(FieldNames.senderUid)) { + case 110520277: + case -868529012: { + if (input.isAtField(FieldNames.toUid)) { if (!input.trySkipNullValue()) { - senderUid = input.readUInt32(); + toUid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } break; } - case 110520277: - case -868529012: { - if (input.isAtField(FieldNames.toUid)) { + case 32180699: + case 997911366: { + if (input.isAtField(FieldNames.senderUid)) { if (!input.trySkipNullValue()) { - toUid = input.readUInt32(); + senderUid = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class GetPrivateChatHistoryCsReqOuterClass { * 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 senderUid = FieldName.forField("senderUid", "sender_uid"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java index d643f56..046765d 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 = 8; - */ - private int toUid; - - /** - * optional uint32 retcode = 10; - */ - private int retcode; - - /** - * optional uint32 sender_uid = 13; + * optional uint32 sender_uid = 5; */ private int senderUid; /** - * repeated .Chat chat_list = 5; + * optional uint32 retcode = 8; + */ + private int retcode; + + /** + * optional uint32 to_uid = 9; + */ + private int toUid; + + /** + * repeated .Chat chat_list = 2; */ private final RepeatedMessage chatList = RepeatedMessage.newEmptyInstance(ChatOuterClass.Chat.getFactory()); @@ -50,44 +50,44 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 to_uid = 8; - * @return whether the toUid field is set + * optional uint32 sender_uid = 5; + * @return whether the senderUid field is set */ - public boolean hasToUid() { + public boolean hasSenderUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 to_uid = 8; + * optional uint32 sender_uid = 5; * @return this */ - public GetPrivateChatHistoryScRsp clearToUid() { + public GetPrivateChatHistoryScRsp clearSenderUid() { bitField0_ &= ~0x00000001; - toUid = 0; + senderUid = 0; return this; } /** - * optional uint32 to_uid = 8; - * @return the toUid + * optional uint32 sender_uid = 5; + * @return the senderUid */ - public int getToUid() { - return toUid; + public int getSenderUid() { + return senderUid; } /** - * optional uint32 to_uid = 8; - * @param value the toUid to set + * optional uint32 sender_uid = 5; + * @param value the senderUid to set * @return this */ - public GetPrivateChatHistoryScRsp setToUid(final int value) { + public GetPrivateChatHistoryScRsp setSenderUid(final int value) { bitField0_ |= 0x00000001; - toUid = value; + senderUid = value; return this; } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -95,7 +95,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 8; * @return this */ public GetPrivateChatHistoryScRsp clearRetcode() { @@ -105,7 +105,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -113,7 +113,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -124,44 +124,44 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 sender_uid = 13; - * @return whether the senderUid field is set + * optional uint32 to_uid = 9; + * @return whether the toUid field is set */ - public boolean hasSenderUid() { + public boolean hasToUid() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 sender_uid = 13; + * optional uint32 to_uid = 9; * @return this */ - public GetPrivateChatHistoryScRsp clearSenderUid() { + public GetPrivateChatHistoryScRsp clearToUid() { bitField0_ &= ~0x00000004; - senderUid = 0; + toUid = 0; return this; } /** - * optional uint32 sender_uid = 13; - * @return the senderUid + * optional uint32 to_uid = 9; + * @return the toUid */ - public int getSenderUid() { - return senderUid; + public int getToUid() { + return toUid; } /** - * optional uint32 sender_uid = 13; - * @param value the senderUid to set + * optional uint32 to_uid = 9; + * @param value the toUid to set * @return this */ - public GetPrivateChatHistoryScRsp setSenderUid(final int value) { + public GetPrivateChatHistoryScRsp setToUid(final int value) { bitField0_ |= 0x00000004; - senderUid = value; + toUid = value; return this; } /** - * repeated .Chat chat_list = 5; + * repeated .Chat chat_list = 2; * @return whether the chatList field is set */ public boolean hasChatList() { @@ -169,7 +169,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 5; + * repeated .Chat chat_list = 2; * @return this */ public GetPrivateChatHistoryScRsp clearChatList() { @@ -179,7 +179,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 5; + * repeated .Chat chat_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. @@ -193,7 +193,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 5; + * repeated .Chat chat_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 @@ -207,7 +207,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 5; + * repeated .Chat chat_list = 2; * @param value the chatList to add * @return this */ @@ -218,7 +218,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 5; + * repeated .Chat chat_list = 2; * @param values the chatList to add * @return this */ @@ -233,9 +233,9 @@ public final class GetPrivateChatHistoryScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - toUid = other.toUid; - retcode = other.retcode; senderUid = other.senderUid; + retcode = other.retcode; + toUid = other.toUid; chatList.copyFrom(other.chatList); } return this; @@ -247,14 +247,14 @@ public final class GetPrivateChatHistoryScRspOuterClass { return this; } cachedSize = -1; - if (other.hasToUid()) { - setToUid(other.toUid); + if (other.hasSenderUid()) { + setSenderUid(other.senderUid); } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasSenderUid()) { - setSenderUid(other.senderUid); + if (other.hasToUid()) { + setToUid(other.toUid); } if (other.hasChatList()) { getMutableChatList().addAll(other.chatList); @@ -269,9 +269,9 @@ public final class GetPrivateChatHistoryScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - toUid = 0; - retcode = 0; senderUid = 0; + retcode = 0; + toUid = 0; chatList.clear(); return this; } @@ -297,29 +297,29 @@ public final class GetPrivateChatHistoryScRspOuterClass { } GetPrivateChatHistoryScRsp other = (GetPrivateChatHistoryScRsp) o; return bitField0_ == other.bitField0_ - && (!hasToUid() || toUid == other.toUid) - && (!hasRetcode() || retcode == other.retcode) && (!hasSenderUid() || senderUid == other.senderUid) + && (!hasRetcode() || retcode == other.retcode) + && (!hasToUid() || toUid == other.toUid) && (!hasChatList() || chatList.equals(other.chatList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(toUid); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(senderUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(senderUid); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(toUid); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < chatList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 18); 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); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); } if ((bitField0_ & 0x00000008) != 0) { size += (1 * chatList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(chatList); @@ -350,34 +350,34 @@ public final class GetPrivateChatHistoryScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // toUid - toUid = input.readUInt32(); + case 40: { + // senderUid + senderUid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 64) { break; } } - case 80: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { - // senderUid - senderUid = input.readUInt32(); + case 72: { + // toUid + toUid = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 42) { + if (tag != 18) { break; } } - case 42: { + case 18: { // 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); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.senderUid, senderUid); + output.writeUInt32(FieldNames.toUid, toUid); } if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.chatList, chatList); @@ -424,11 +424,11 @@ public final class GetPrivateChatHistoryScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 110520277: - case -868529012: { - if (input.isAtField(FieldNames.toUid)) { + case 32180699: + case 997911366: { + if (input.isAtField(FieldNames.senderUid)) { if (!input.trySkipNullValue()) { - toUid = input.readUInt32(); + senderUid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -447,11 +447,11 @@ public final class GetPrivateChatHistoryScRspOuterClass { } break; } - case 32180699: - case 997911366: { - if (input.isAtField(FieldNames.senderUid)) { + case 110520277: + case -868529012: { + if (input.isAtField(FieldNames.toUid)) { if (!input.trySkipNullValue()) { - senderUid = input.readUInt32(); + toUid = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -524,11 +524,11 @@ public final class GetPrivateChatHistoryScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName toUid = FieldName.forField("toUid", "to_uid"); + static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid"); static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid"); + static final FieldName toUid = FieldName.forField("toUid", "to_uid"); static final FieldName chatList = FieldName.forField("chatList", "chat_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java index 6af7e8c..73ce388 100644 --- a/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java @@ -20,17 +20,17 @@ public final class GetQuestDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 total_achievement_exp = 3; - */ - private int totalAchievementExp; - - /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 2; */ private int retcode; /** - * repeated .Quest quest_list = 12; + * optional uint32 total_achievement_exp = 11; + */ + private int totalAchievementExp; + + /** + * repeated .Quest quest_list = 3; */ private final RepeatedMessage questList = RepeatedMessage.newEmptyInstance(QuestOuterClass.Quest.getFactory()); @@ -45,62 +45,25 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 total_achievement_exp = 3; - * @return whether the totalAchievementExp field is set + * optional uint32 retcode = 2; + * @return whether the retcode field is set */ - public boolean hasTotalAchievementExp() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 total_achievement_exp = 3; - * @return this - */ - public GetQuestDataScRsp clearTotalAchievementExp() { - bitField0_ &= ~0x00000001; - totalAchievementExp = 0; - return this; - } - - /** - * optional uint32 total_achievement_exp = 3; - * @return the totalAchievementExp - */ - public int getTotalAchievementExp() { - return totalAchievementExp; - } - - /** - * optional uint32 total_achievement_exp = 3; - * @param value the totalAchievementExp to set - * @return this - */ - public GetQuestDataScRsp setTotalAchievementExp(final int value) { - bitField0_ |= 0x00000001; - totalAchievementExp = value; - return this; - } - - /** - * optional uint32 retcode = 13; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 2; * @return this */ public GetQuestDataScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -108,18 +71,55 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ public GetQuestDataScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * repeated .Quest quest_list = 12; + * optional uint32 total_achievement_exp = 11; + * @return whether the totalAchievementExp field is set + */ + public boolean hasTotalAchievementExp() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 total_achievement_exp = 11; + * @return this + */ + public GetQuestDataScRsp clearTotalAchievementExp() { + bitField0_ &= ~0x00000002; + totalAchievementExp = 0; + return this; + } + + /** + * optional uint32 total_achievement_exp = 11; + * @return the totalAchievementExp + */ + public int getTotalAchievementExp() { + return totalAchievementExp; + } + + /** + * optional uint32 total_achievement_exp = 11; + * @param value the totalAchievementExp to set + * @return this + */ + public GetQuestDataScRsp setTotalAchievementExp(final int value) { + bitField0_ |= 0x00000002; + totalAchievementExp = value; + return this; + } + + /** + * repeated .Quest quest_list = 3; * @return whether the questList field is set */ public boolean hasQuestList() { @@ -127,7 +127,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 12; + * repeated .Quest quest_list = 3; * @return this */ public GetQuestDataScRsp clearQuestList() { @@ -137,7 +137,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 12; + * repeated .Quest quest_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 GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 12; + * repeated .Quest quest_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 GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 12; + * repeated .Quest quest_list = 3; * @param value the questList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 12; + * repeated .Quest quest_list = 3; * @param values the questList to add * @return this */ @@ -191,8 +191,8 @@ public final class GetQuestDataScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - totalAchievementExp = other.totalAchievementExp; retcode = other.retcode; + totalAchievementExp = other.totalAchievementExp; questList.copyFrom(other.questList); } return this; @@ -204,12 +204,12 @@ public final class GetQuestDataScRspOuterClass { return this; } cachedSize = -1; - if (other.hasTotalAchievementExp()) { - setTotalAchievementExp(other.totalAchievementExp); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasTotalAchievementExp()) { + setTotalAchievementExp(other.totalAchievementExp); + } if (other.hasQuestList()) { getMutableQuestList().addAll(other.questList); } @@ -223,8 +223,8 @@ public final class GetQuestDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - totalAchievementExp = 0; retcode = 0; + totalAchievementExp = 0; questList.clear(); return this; } @@ -250,24 +250,24 @@ public final class GetQuestDataScRspOuterClass { } GetQuestDataScRsp other = (GetQuestDataScRsp) o; return bitField0_ == other.bitField0_ - && (!hasTotalAchievementExp() || totalAchievementExp == other.totalAchievementExp) && (!hasRetcode() || retcode == other.retcode) + && (!hasTotalAchievementExp() || totalAchievementExp == other.totalAchievementExp) && (!hasQuestList() || questList.equals(other.questList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(totalAchievementExp); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(totalAchievementExp); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < questList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 26); output.writeMessageNoTag(questList.get(i)); } } @@ -277,10 +277,10 @@ public final class GetQuestDataScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(totalAchievementExp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(totalAchievementExp); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * questList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(questList); @@ -295,25 +295,25 @@ public final class GetQuestDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // totalAchievementExp - totalAchievementExp = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 16: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 88) { break; } } - case 98: { + case 88: { + // totalAchievementExp + totalAchievementExp = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 26) { + break; + } + } + case 26: { // questList tag = input.readRepeatedMessage(questList, tag); bitField0_ |= 0x00000004; @@ -339,10 +339,10 @@ public final class GetQuestDataScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.totalAchievementExp, totalAchievementExp); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.totalAchievementExp, totalAchievementExp); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.questList, questList); @@ -357,11 +357,10 @@ public final class GetQuestDataScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 255336658: - case -1295039982: { - if (input.isAtField(FieldNames.totalAchievementExp)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - totalAchievementExp = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -369,10 +368,11 @@ public final class GetQuestDataScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 255336658: + case -1295039982: { + if (input.isAtField(FieldNames.totalAchievementExp)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + totalAchievementExp = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -445,10 +445,10 @@ public final class GetQuestDataScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName totalAchievementExp = FieldName.forField("totalAchievementExp", "total_achievement_exp"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName totalAchievementExp = FieldName.forField("totalAchievementExp", "total_achievement_exp"); + static final FieldName questList = FieldName.forField("questList", "quest_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java index aed652a..b2f58d3 100644 --- a/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; */ private int retcode; /** - * optional .RogueBuffEnhanceShopInfo shop_info = 4; + * optional .RogueBuffEnhanceShopInfo shop_info = 5; */ private final RogueBuffEnhanceShopInfoOuterClass.RogueBuffEnhanceShopInfo shopInfo = RogueBuffEnhanceShopInfoOuterClass.RogueBuffEnhanceShopInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return this */ public GetRogueBuffEnhanceInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 4; + * optional .RogueBuffEnhanceShopInfo shop_info = 5; * @return whether the shopInfo field is set */ public boolean hasShopInfo() { @@ -84,7 +84,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 4; + * optional .RogueBuffEnhanceShopInfo shop_info = 5; * @return this */ public GetRogueBuffEnhanceInfoScRsp clearShopInfo() { @@ -94,7 +94,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 4; + * optional .RogueBuffEnhanceShopInfo shop_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 GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 4; + * optional .RogueBuffEnhanceShopInfo shop_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 GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 4; + * optional .RogueBuffEnhanceShopInfo shop_info = 5; * @param value the shopInfo to set * @return this */ @@ -199,11 +199,11 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 42); output.writeMessageNoTag(shopInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 42) { break; } } - case 34: { + case 42: { // 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 c9e6785..ef228e1 100644 --- a/src/generated/main/emu/lunarcore/proto/GetRogueHandbookDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetRogueHandbookDataScRspOuterClass.java @@ -24,7 +24,7 @@ public final class GetRogueHandbookDataScRspOuterClass { private int retcode; /** - * optional .RogueHandbookData handbook_info = 7; + * optional .RogueHandbookData handbook_info = 10; */ private final RogueHandbookDataOuterClass.RogueHandbookData handbookInfo = RogueHandbookDataOuterClass.RogueHandbookData.newInstance(); @@ -76,7 +76,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 7; + * optional .RogueHandbookData handbook_info = 10; * @return whether the handbookInfo field is set */ public boolean hasHandbookInfo() { @@ -84,7 +84,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 7; + * optional .RogueHandbookData handbook_info = 10; * @return this */ public GetRogueHandbookDataScRsp clearHandbookInfo() { @@ -94,7 +94,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 7; + * optional .RogueHandbookData handbook_info = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 7; + * optional .RogueHandbookData handbook_info = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 7; + * optional .RogueHandbookData handbook_info = 10; * @param value the handbookInfo to set * @return this */ @@ -203,7 +203,7 @@ public final class GetRogueHandbookDataScRspOuterClass { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 82); output.writeMessageNoTag(handbookInfo); } } @@ -232,11 +232,11 @@ public final class GetRogueHandbookDataScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 82) { break; } } - case 58: { + case 82: { // handbookInfo input.readMessage(handbookInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueInfoScRspOuterClass.java index d416f36..eee51f0 100644 --- a/src/generated/main/emu/lunarcore/proto/GetRogueInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetRogueInfoScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetRogueInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional .RogueInfo rogue_info = 14; + * optional .RogueInfo rogue_info = 12; */ private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; * @return this */ public GetRogueInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 14; + * optional .RogueInfo rogue_info = 12; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { @@ -84,7 +84,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 14; + * optional .RogueInfo rogue_info = 12; * @return this */ public GetRogueInfoScRsp clearRogueInfo() { @@ -94,7 +94,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 14; + * optional .RogueInfo rogue_info = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 14; + * optional .RogueInfo rogue_info = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 14; + * optional .RogueInfo rogue_info = 12; * @param value the rogueInfo to set * @return this */ @@ -198,11 +198,11 @@ public final class GetRogueInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 98); output.writeMessageNoTag(rogueInfo); } } @@ -226,16 +226,16 @@ public final class GetRogueInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 98) { break; } } - case 114: { + case 98: { // rogueInfo input.readMessage(rogueInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueInitialScoreScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueInitialScoreScRspOuterClass.java new file mode 100644 index 0000000..6b17e68 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/GetRogueInitialScoreScRspOuterClass.java @@ -0,0 +1,362 @@ +// 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 GetRogueInitialScoreScRspOuterClass { + /** + * Protobuf type {@code GetRogueInitialScoreScRsp} + */ + public static final class GetRogueInitialScoreScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 retcode = 11; + */ + private int retcode; + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 4; + */ + private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo rogueScoreInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); + + private GetRogueInitialScoreScRsp() { + } + + /** + * @return a new empty instance of {@code GetRogueInitialScoreScRsp} + */ + public static GetRogueInitialScoreScRsp newInstance() { + return new GetRogueInitialScoreScRsp(); + } + + /** + * optional uint32 retcode = 11; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 retcode = 11; + * @return this + */ + public GetRogueInitialScoreScRsp clearRetcode() { + bitField0_ &= ~0x00000001; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 11; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 11; + * @param value the retcode to set + * @return this + */ + public GetRogueInitialScoreScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 4; + * @return whether the rogueScoreInfo field is set + */ + public boolean hasRogueScoreInfo() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 4; + * @return this + */ + public GetRogueInitialScoreScRsp clearRogueScoreInfo() { + bitField0_ &= ~0x00000002; + rogueScoreInfo.clear(); + return this; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 4; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * 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 = 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 RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableRogueScoreInfo() { + bitField0_ |= 0x00000002; + return rogueScoreInfo; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 4; + * @param value the rogueScoreInfo to set + * @return this + */ + public GetRogueInitialScoreScRsp setRogueScoreInfo( + final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { + bitField0_ |= 0x00000002; + rogueScoreInfo.copyFrom(value); + return this; + } + + @Override + public GetRogueInitialScoreScRsp copyFrom(final GetRogueInitialScoreScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + retcode = other.retcode; + rogueScoreInfo.copyFrom(other.rogueScoreInfo); + } + return this; + } + + @Override + public GetRogueInitialScoreScRsp mergeFrom(final GetRogueInitialScoreScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasRogueScoreInfo()) { + getMutableRogueScoreInfo().mergeFrom(other.rogueScoreInfo); + } + return this; + } + + @Override + public GetRogueInitialScoreScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + retcode = 0; + rogueScoreInfo.clear(); + return this; + } + + @Override + public GetRogueInitialScoreScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + rogueScoreInfo.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof GetRogueInitialScoreScRsp)) { + return false; + } + GetRogueInitialScoreScRsp other = (GetRogueInitialScoreScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) + && (!hasRogueScoreInfo() || rogueScoreInfo.equals(other.rogueScoreInfo)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 34); + output.writeMessageNoTag(rogueScoreInfo); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueScoreInfo); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public GetRogueInitialScoreScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 88: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 34) { + break; + } + } + case 34: { + // rogueScoreInfo + input.readMessage(rogueScoreInfo); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeMessage(FieldNames.rogueScoreInfo, rogueScoreInfo); + } + output.endObject(); + } + + @Override + public GetRogueInitialScoreScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 2078217638: + case -208816704: { + if (input.isAtField(FieldNames.rogueScoreInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(rogueScoreInfo); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public GetRogueInitialScoreScRsp clone() { + return new GetRogueInitialScoreScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static GetRogueInitialScoreScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new GetRogueInitialScoreScRsp(), data).checkInitialized(); + } + + public static GetRogueInitialScoreScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new GetRogueInitialScoreScRsp(), input).checkInitialized(); + } + + public static GetRogueInitialScoreScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new GetRogueInitialScoreScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating GetRogueInitialScoreScRsp messages + */ + public static MessageFactory getFactory() { + return GetRogueInitialScoreScRspFactory.INSTANCE; + } + + private enum GetRogueInitialScoreScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public GetRogueInitialScoreScRsp create() { + return GetRogueInitialScoreScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName rogueScoreInfo = FieldName.forField("rogueScoreInfo", "rogue_score_info"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueScoreRewardInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueScoreRewardInfoScRspOuterClass.java index a42b760..e31a031 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 = 4; + * optional uint32 retcode = 15; */ private int retcode; /** - * optional .RogueScoreRewardInfo score_reward_info = 13; + * optional .RogueScoreRewardInfo score_reward_info = 2; */ private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo scoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 15; * @return this */ public GetRogueScoreRewardInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 13; + * optional .RogueScoreRewardInfo score_reward_info = 2; * @return whether the scoreRewardInfo field is set */ public boolean hasScoreRewardInfo() { @@ -84,7 +84,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 13; + * optional .RogueScoreRewardInfo score_reward_info = 2; * @return this */ public GetRogueScoreRewardInfoScRsp clearScoreRewardInfo() { @@ -94,7 +94,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 13; + * optional .RogueScoreRewardInfo 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. @@ -108,7 +108,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 13; + * optional .RogueScoreRewardInfo 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 @@ -122,7 +122,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 13; + * optional .RogueScoreRewardInfo score_reward_info = 2; * @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) 32); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 18); output.writeMessageNoTag(scoreRewardInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 18) { break; } } - case 106: { + case 18: { // 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 33f9e65..208f46b 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 = 8; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional .RogueTalentInfo talent_info = 10; + * optional .RogueTalentInfo talent_info = 13; */ private final RogueTalentInfoOuterClass.RogueTalentInfo talentInfo = RogueTalentInfoOuterClass.RogueTalentInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @return this */ public GetRogueTalentInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 10; + * optional .RogueTalentInfo talent_info = 13; * @return whether the talentInfo field is set */ public boolean hasTalentInfo() { @@ -84,7 +84,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 10; + * optional .RogueTalentInfo talent_info = 13; * @return this */ public GetRogueTalentInfoScRsp clearTalentInfo() { @@ -94,7 +94,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 10; + * optional .RogueTalentInfo talent_info = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 10; + * optional .RogueTalentInfo talent_info = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 10; + * optional .RogueTalentInfo talent_info = 13; * @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) 64); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 106); output.writeMessageNoTag(talentInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueTalentInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 106) { break; } } - case 82: { + case 106: { // talentInfo input.readMessage(talentInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java index 891e6e0..71806e2 100644 --- a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class GetSceneMapInfoCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entry_id = 15; + * optional uint32 entry_id = 4; */ private int entryId; /** - * repeated uint32 entry_id_list = 8; + * repeated uint32 entry_id_list = 9; */ private final RepeatedInt entryIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * optional uint32 entry_id = 15; + * optional uint32 entry_id = 4; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -48,7 +48,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * optional uint32 entry_id = 15; + * optional uint32 entry_id = 4; * @return this */ public GetSceneMapInfoCsReq clearEntryId() { @@ -58,7 +58,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * optional uint32 entry_id = 15; + * optional uint32 entry_id = 4; * @return the entryId */ public int getEntryId() { @@ -66,7 +66,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * optional uint32 entry_id = 15; + * optional uint32 entry_id = 4; * @param value the entryId to set * @return this */ @@ -77,7 +77,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 8; + * repeated uint32 entry_id_list = 9; * @return whether the entryIdList field is set */ public boolean hasEntryIdList() { @@ -85,7 +85,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 8; + * repeated uint32 entry_id_list = 9; * @return this */ public GetSceneMapInfoCsReq clearEntryIdList() { @@ -95,7 +95,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 8; + * repeated uint32 entry_id_list = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 8; + * repeated uint32 entry_id_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 8; + * repeated uint32 entry_id_list = 9; * @param value the entryIdList to add * @return this */ @@ -134,7 +134,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 8; + * repeated uint32 entry_id_list = 9; * @param values the entryIdList to add * @return this */ @@ -210,12 +210,12 @@ public final class GetSceneMapInfoCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < entryIdList.length(); i++) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(entryIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class GetSceneMapInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 32: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 74) { break; } } - case 66: { + case 74: { // entryIdList [packed=true] input.readPackedUInt32(entryIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class GetSceneMapInfoCsReqOuterClass { tag = input.readTag(); break; } - case 64: { + case 72: { // entryIdList [packed=false] tag = input.readRepeatedUInt32(entryIdList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java index 883787d..606cbc8 100644 --- a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java @@ -20,51 +20,51 @@ public final class GetSceneMapInfoScRspOuterClass { public static final class GetSceneMapInfoScRsp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 cur_map_entry_id = 7; + */ + private int curMapEntryId; + /** * optional uint32 retcode = 8; */ private int retcode; /** - * optional uint32 cur_map_entry_id = 9; - */ - private int curMapEntryId; - - /** - * optional uint32 entry_id = 10; + * optional uint32 entry_id = 15; */ private int entryId; /** - * repeated uint32 lighten_section_list = 4; + * repeated uint32 lighten_section_list = 1; */ private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 unlocked_teleport_list = 13; + * repeated uint32 unlocked_teleport_list = 14; */ private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); /** - * repeated .MazeProp maze_prop_list = 7; + * repeated .MazeGroup maze_group_list = 2; + */ + private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory()); + + /** + * repeated .MazeProp maze_prop_list = 4; */ private final RepeatedMessage mazePropList = RepeatedMessage.newEmptyInstance(MazePropOuterClass.MazeProp.getFactory()); /** - * repeated .MazeChest unlocked_chest_list = 12; + * repeated .MazeChest unlocked_chest_list = 10; */ private final RepeatedMessage unlockedChestList = RepeatedMessage.newEmptyInstance(MazeChestOuterClass.MazeChest.getFactory()); /** - * repeated .MazeMapData map_list = 14; + * repeated .MazeMapData map_list = 12; */ private final RepeatedMessage mapList = RepeatedMessage.newEmptyInstance(MazeMapDataOuterClass.MazeMapData.getFactory()); - /** - * repeated .MazeGroup maze_group_list = 15; - */ - private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory()); - private GetSceneMapInfoScRsp() { } @@ -75,12 +75,49 @@ public final class GetSceneMapInfoScRspOuterClass { return new GetSceneMapInfoScRsp(); } + /** + * optional uint32 cur_map_entry_id = 7; + * @return whether the curMapEntryId field is set + */ + public boolean hasCurMapEntryId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 cur_map_entry_id = 7; + * @return this + */ + public GetSceneMapInfoScRsp clearCurMapEntryId() { + bitField0_ &= ~0x00000001; + curMapEntryId = 0; + return this; + } + + /** + * optional uint32 cur_map_entry_id = 7; + * @return the curMapEntryId + */ + public int getCurMapEntryId() { + return curMapEntryId; + } + + /** + * optional uint32 cur_map_entry_id = 7; + * @param value the curMapEntryId to set + * @return this + */ + public GetSceneMapInfoScRsp setCurMapEntryId(final int value) { + bitField0_ |= 0x00000001; + curMapEntryId = value; + return this; + } + /** * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -88,7 +125,7 @@ public final class GetSceneMapInfoScRspOuterClass { * @return this */ public GetSceneMapInfoScRsp clearRetcode() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; retcode = 0; return this; } @@ -107,50 +144,13 @@ public final class GetSceneMapInfoScRspOuterClass { * @return this */ public GetSceneMapInfoScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; retcode = value; return this; } /** - * optional uint32 cur_map_entry_id = 9; - * @return whether the curMapEntryId field is set - */ - public boolean hasCurMapEntryId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cur_map_entry_id = 9; - * @return this - */ - public GetSceneMapInfoScRsp clearCurMapEntryId() { - bitField0_ &= ~0x00000002; - curMapEntryId = 0; - return this; - } - - /** - * optional uint32 cur_map_entry_id = 9; - * @return the curMapEntryId - */ - public int getCurMapEntryId() { - return curMapEntryId; - } - - /** - * optional uint32 cur_map_entry_id = 9; - * @param value the curMapEntryId to set - * @return this - */ - public GetSceneMapInfoScRsp setCurMapEntryId(final int value) { - bitField0_ |= 0x00000002; - curMapEntryId = value; - return this; - } - - /** - * optional uint32 entry_id = 10; + * optional uint32 entry_id = 15; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -158,7 +158,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * optional uint32 entry_id = 10; + * optional uint32 entry_id = 15; * @return this */ public GetSceneMapInfoScRsp clearEntryId() { @@ -168,7 +168,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * optional uint32 entry_id = 10; + * optional uint32 entry_id = 15; * @return the entryId */ public int getEntryId() { @@ -176,7 +176,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * optional uint32 entry_id = 10; + * optional uint32 entry_id = 15; * @param value the entryId to set * @return this */ @@ -187,7 +187,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated uint32 lighten_section_list = 4; + * repeated uint32 lighten_section_list = 1; * @return whether the lightenSectionList field is set */ public boolean hasLightenSectionList() { @@ -195,7 +195,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated uint32 lighten_section_list = 4; + * repeated uint32 lighten_section_list = 1; * @return this */ public GetSceneMapInfoScRsp clearLightenSectionList() { @@ -205,7 +205,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated uint32 lighten_section_list = 4; + * repeated uint32 lighten_section_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -219,7 +219,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated uint32 lighten_section_list = 4; + * repeated uint32 lighten_section_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -233,7 +233,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated uint32 lighten_section_list = 4; + * repeated uint32 lighten_section_list = 1; * @param value the lightenSectionList to add * @return this */ @@ -244,7 +244,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated uint32 lighten_section_list = 4; + * repeated uint32 lighten_section_list = 1; * @param values the lightenSectionList to add * @return this */ @@ -255,7 +255,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 13; + * repeated uint32 unlocked_teleport_list = 14; * @return whether the unlockedTeleportList field is set */ public boolean hasUnlockedTeleportList() { @@ -263,7 +263,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 13; + * repeated uint32 unlocked_teleport_list = 14; * @return this */ public GetSceneMapInfoScRsp clearUnlockedTeleportList() { @@ -273,7 +273,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 13; + * repeated uint32 unlocked_teleport_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -287,7 +287,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 13; + * repeated uint32 unlocked_teleport_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -301,7 +301,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 13; + * repeated uint32 unlocked_teleport_list = 14; * @param value the unlockedTeleportList to add * @return this */ @@ -312,7 +312,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 13; + * repeated uint32 unlocked_teleport_list = 14; * @param values the unlockedTeleportList to add * @return this */ @@ -323,230 +323,25 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeProp maze_prop_list = 7; - * @return whether the mazePropList field is set + * repeated .MazeGroup maze_group_list = 2; + * @return whether the mazeGroupList field is set */ - public boolean hasMazePropList() { + public boolean hasMazeGroupList() { return (bitField0_ & 0x00000020) != 0; } /** - * repeated .MazeProp maze_prop_list = 7; - * @return this - */ - public GetSceneMapInfoScRsp clearMazePropList() { - bitField0_ &= ~0x00000020; - mazePropList.clear(); - return this; - } - - /** - * repeated .MazeProp maze_prop_list = 7; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableMazePropList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMazePropList() { - return mazePropList; - } - - /** - * repeated .MazeProp maze_prop_list = 7; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableMazePropList() { - bitField0_ |= 0x00000020; - return mazePropList; - } - - /** - * repeated .MazeProp maze_prop_list = 7; - * @param value the mazePropList to add - * @return this - */ - public GetSceneMapInfoScRsp addMazePropList(final MazePropOuterClass.MazeProp value) { - bitField0_ |= 0x00000020; - mazePropList.add(value); - return this; - } - - /** - * repeated .MazeProp maze_prop_list = 7; - * @param values the mazePropList to add - * @return this - */ - public GetSceneMapInfoScRsp addAllMazePropList(final MazePropOuterClass.MazeProp... values) { - bitField0_ |= 0x00000020; - mazePropList.addAll(values); - return this; - } - - /** - * repeated .MazeChest unlocked_chest_list = 12; - * @return whether the unlockedChestList field is set - */ - public boolean hasUnlockedChestList() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * repeated .MazeChest unlocked_chest_list = 12; - * @return this - */ - public GetSceneMapInfoScRsp clearUnlockedChestList() { - bitField0_ &= ~0x00000040; - unlockedChestList.clear(); - return this; - } - - /** - * repeated .MazeChest unlocked_chest_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 #getMutableUnlockedChestList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getUnlockedChestList() { - return unlockedChestList; - } - - /** - * repeated .MazeChest unlocked_chest_list = 12; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableUnlockedChestList() { - bitField0_ |= 0x00000040; - return unlockedChestList; - } - - /** - * repeated .MazeChest unlocked_chest_list = 12; - * @param value the unlockedChestList to add - * @return this - */ - public GetSceneMapInfoScRsp addUnlockedChestList(final MazeChestOuterClass.MazeChest value) { - bitField0_ |= 0x00000040; - unlockedChestList.add(value); - return this; - } - - /** - * repeated .MazeChest unlocked_chest_list = 12; - * @param values the unlockedChestList to add - * @return this - */ - public GetSceneMapInfoScRsp addAllUnlockedChestList( - final MazeChestOuterClass.MazeChest... values) { - bitField0_ |= 0x00000040; - unlockedChestList.addAll(values); - return this; - } - - /** - * repeated .MazeMapData map_list = 14; - * @return whether the mapList field is set - */ - public boolean hasMapList() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated .MazeMapData map_list = 14; - * @return this - */ - public GetSceneMapInfoScRsp clearMapList() { - bitField0_ &= ~0x00000080; - mapList.clear(); - return this; - } - - /** - * repeated .MazeMapData map_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 #getMutableMapList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMapList() { - return mapList; - } - - /** - * repeated .MazeMapData map_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 getMutableMapList() { - bitField0_ |= 0x00000080; - return mapList; - } - - /** - * repeated .MazeMapData map_list = 14; - * @param value the mapList to add - * @return this - */ - public GetSceneMapInfoScRsp addMapList(final MazeMapDataOuterClass.MazeMapData value) { - bitField0_ |= 0x00000080; - mapList.add(value); - return this; - } - - /** - * repeated .MazeMapData map_list = 14; - * @param values the mapList to add - * @return this - */ - public GetSceneMapInfoScRsp addAllMapList(final MazeMapDataOuterClass.MazeMapData... values) { - bitField0_ |= 0x00000080; - mapList.addAll(values); - return this; - } - - /** - * repeated .MazeGroup maze_group_list = 15; - * @return whether the mazeGroupList field is set - */ - public boolean hasMazeGroupList() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * repeated .MazeGroup maze_group_list = 15; + * repeated .MazeGroup maze_group_list = 2; * @return this */ public GetSceneMapInfoScRsp clearMazeGroupList() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000020; mazeGroupList.clear(); return this; } /** - * repeated .MazeGroup maze_group_list = 15; + * repeated .MazeGroup maze_group_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -560,7 +355,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeGroup maze_group_list = 15; + * repeated .MazeGroup maze_group_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -569,46 +364,251 @@ public final class GetSceneMapInfoScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMazeGroupList() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000020; return mazeGroupList; } /** - * repeated .MazeGroup maze_group_list = 15; + * repeated .MazeGroup maze_group_list = 2; * @param value the mazeGroupList to add * @return this */ public GetSceneMapInfoScRsp addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000020; mazeGroupList.add(value); return this; } /** - * repeated .MazeGroup maze_group_list = 15; + * repeated .MazeGroup maze_group_list = 2; * @param values the mazeGroupList to add * @return this */ public GetSceneMapInfoScRsp addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000020; mazeGroupList.addAll(values); return this; } + /** + * repeated .MazeProp maze_prop_list = 4; + * @return whether the mazePropList field is set + */ + public boolean hasMazePropList() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * repeated .MazeProp maze_prop_list = 4; + * @return this + */ + public GetSceneMapInfoScRsp clearMazePropList() { + bitField0_ &= ~0x00000040; + mazePropList.clear(); + return this; + } + + /** + * repeated .MazeProp maze_prop_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 #getMutableMazePropList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMazePropList() { + return mazePropList; + } + + /** + * repeated .MazeProp maze_prop_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 getMutableMazePropList() { + bitField0_ |= 0x00000040; + return mazePropList; + } + + /** + * repeated .MazeProp maze_prop_list = 4; + * @param value the mazePropList to add + * @return this + */ + public GetSceneMapInfoScRsp addMazePropList(final MazePropOuterClass.MazeProp value) { + bitField0_ |= 0x00000040; + mazePropList.add(value); + return this; + } + + /** + * repeated .MazeProp maze_prop_list = 4; + * @param values the mazePropList to add + * @return this + */ + public GetSceneMapInfoScRsp addAllMazePropList(final MazePropOuterClass.MazeProp... values) { + bitField0_ |= 0x00000040; + mazePropList.addAll(values); + return this; + } + + /** + * repeated .MazeChest unlocked_chest_list = 10; + * @return whether the unlockedChestList field is set + */ + public boolean hasUnlockedChestList() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * repeated .MazeChest unlocked_chest_list = 10; + * @return this + */ + public GetSceneMapInfoScRsp clearUnlockedChestList() { + bitField0_ &= ~0x00000080; + unlockedChestList.clear(); + return this; + } + + /** + * repeated .MazeChest unlocked_chest_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 #getMutableUnlockedChestList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getUnlockedChestList() { + return unlockedChestList; + } + + /** + * repeated .MazeChest unlocked_chest_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 getMutableUnlockedChestList() { + bitField0_ |= 0x00000080; + return unlockedChestList; + } + + /** + * repeated .MazeChest unlocked_chest_list = 10; + * @param value the unlockedChestList to add + * @return this + */ + public GetSceneMapInfoScRsp addUnlockedChestList(final MazeChestOuterClass.MazeChest value) { + bitField0_ |= 0x00000080; + unlockedChestList.add(value); + return this; + } + + /** + * repeated .MazeChest unlocked_chest_list = 10; + * @param values the unlockedChestList to add + * @return this + */ + public GetSceneMapInfoScRsp addAllUnlockedChestList( + final MazeChestOuterClass.MazeChest... values) { + bitField0_ |= 0x00000080; + unlockedChestList.addAll(values); + return this; + } + + /** + * repeated .MazeMapData map_list = 12; + * @return whether the mapList field is set + */ + public boolean hasMapList() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * repeated .MazeMapData map_list = 12; + * @return this + */ + public GetSceneMapInfoScRsp clearMapList() { + bitField0_ &= ~0x00000100; + mapList.clear(); + return this; + } + + /** + * repeated .MazeMapData map_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 #getMutableMapList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMapList() { + return mapList; + } + + /** + * repeated .MazeMapData map_list = 12; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableMapList() { + bitField0_ |= 0x00000100; + return mapList; + } + + /** + * repeated .MazeMapData map_list = 12; + * @param value the mapList to add + * @return this + */ + public GetSceneMapInfoScRsp addMapList(final MazeMapDataOuterClass.MazeMapData value) { + bitField0_ |= 0x00000100; + mapList.add(value); + return this; + } + + /** + * repeated .MazeMapData map_list = 12; + * @param values the mapList to add + * @return this + */ + public GetSceneMapInfoScRsp addAllMapList(final MazeMapDataOuterClass.MazeMapData... values) { + bitField0_ |= 0x00000100; + mapList.addAll(values); + return this; + } + @Override public GetSceneMapInfoScRsp copyFrom(final GetSceneMapInfoScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; curMapEntryId = other.curMapEntryId; + retcode = other.retcode; entryId = other.entryId; lightenSectionList.copyFrom(other.lightenSectionList); unlockedTeleportList.copyFrom(other.unlockedTeleportList); + mazeGroupList.copyFrom(other.mazeGroupList); mazePropList.copyFrom(other.mazePropList); unlockedChestList.copyFrom(other.unlockedChestList); mapList.copyFrom(other.mapList); - mazeGroupList.copyFrom(other.mazeGroupList); } return this; } @@ -619,12 +619,12 @@ public final class GetSceneMapInfoScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasCurMapEntryId()) { setCurMapEntryId(other.curMapEntryId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasEntryId()) { setEntryId(other.entryId); } @@ -634,6 +634,9 @@ public final class GetSceneMapInfoScRspOuterClass { if (other.hasUnlockedTeleportList()) { getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList); } + if (other.hasMazeGroupList()) { + getMutableMazeGroupList().addAll(other.mazeGroupList); + } if (other.hasMazePropList()) { getMutableMazePropList().addAll(other.mazePropList); } @@ -643,9 +646,6 @@ public final class GetSceneMapInfoScRspOuterClass { if (other.hasMapList()) { getMutableMapList().addAll(other.mapList); } - if (other.hasMazeGroupList()) { - getMutableMazeGroupList().addAll(other.mazeGroupList); - } return this; } @@ -656,15 +656,15 @@ public final class GetSceneMapInfoScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; curMapEntryId = 0; + retcode = 0; entryId = 0; lightenSectionList.clear(); unlockedTeleportList.clear(); + mazeGroupList.clear(); mazePropList.clear(); unlockedChestList.clear(); mapList.clear(); - mazeGroupList.clear(); return this; } @@ -677,10 +677,10 @@ public final class GetSceneMapInfoScRspOuterClass { bitField0_ = 0; lightenSectionList.clear(); unlockedTeleportList.clear(); + mazeGroupList.clearQuick(); mazePropList.clearQuick(); unlockedChestList.clearQuick(); mapList.clearQuick(); - mazeGroupList.clearQuick(); return this; } @@ -694,65 +694,65 @@ public final class GetSceneMapInfoScRspOuterClass { } GetSceneMapInfoScRsp other = (GetSceneMapInfoScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId) + && (!hasRetcode() || retcode == other.retcode) && (!hasEntryId() || entryId == other.entryId) && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList)) + && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)) && (!hasMazePropList() || mazePropList.equals(other.mazePropList)) && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList)) - && (!hasMapList() || mapList.equals(other.mapList)) - && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)); + && (!hasMapList() || mapList.equals(other.mapList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(curMapEntryId); + } + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(curMapEntryId); - } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < lightenSectionList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(lightenSectionList.array()[i]); } } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < unlockedTeleportList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(unlockedTeleportList.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < mazePropList.length(); i++) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(mazePropList.get(i)); + for (int i = 0; i < mazeGroupList.length(); i++) { + output.writeRawByte((byte) 18); + output.writeMessageNoTag(mazeGroupList.get(i)); } } if ((bitField0_ & 0x00000040) != 0) { - for (int i = 0; i < unlockedChestList.length(); i++) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(unlockedChestList.get(i)); + for (int i = 0; i < mazePropList.length(); i++) { + output.writeRawByte((byte) 34); + output.writeMessageNoTag(mazePropList.get(i)); } } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < mapList.length(); i++) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(mapList.get(i)); + for (int i = 0; i < unlockedChestList.length(); i++) { + output.writeRawByte((byte) 82); + output.writeMessageNoTag(unlockedChestList.get(i)); } } if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < mazeGroupList.length(); i++) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(mazeGroupList.get(i)); + for (int i = 0; i < mapList.length(); i++) { + output.writeRawByte((byte) 98); + output.writeMessageNoTag(mapList.get(i)); } } } @@ -761,10 +761,10 @@ public final class GetSceneMapInfoScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); @@ -776,16 +776,16 @@ public final class GetSceneMapInfoScRspOuterClass { size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); + size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); } if ((bitField0_ & 0x00000040) != 0) { - size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); + size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * mapList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mapList); + size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); } if ((bitField0_ & 0x00000100) != 0) { - size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); + size += (1 * mapList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mapList); } return size; } @@ -797,78 +797,78 @@ public final class GetSceneMapInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { + case 56: { + // curMapEntryId + curMapEntryId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 64) { + break; + } + } case 64: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // curMapEntryId - curMapEntryId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 120) { break; } } - case 80: { + case 120: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 34) { + if (tag != 10) { break; } } - case 34: { + case 10: { // lightenSectionList [packed=true] input.readPackedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { - // unlockedTeleportList [packed=true] - input.readPackedUInt32(unlockedTeleportList, tag); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { - // mazePropList - tag = input.readRepeatedMessage(mazePropList, tag); - bitField0_ |= 0x00000020; - if (tag != 98) { - break; - } - } - case 98: { - // unlockedChestList - tag = input.readRepeatedMessage(unlockedChestList, tag); - bitField0_ |= 0x00000040; if (tag != 114) { break; } } case 114: { - // mapList - tag = input.readRepeatedMessage(mapList, tag); - bitField0_ |= 0x00000080; - if (tag != 122) { + // unlockedTeleportList [packed=true] + input.readPackedUInt32(unlockedTeleportList, tag); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 18) { break; } } - case 122: { + case 18: { // mazeGroupList tag = input.readRepeatedMessage(mazeGroupList, tag); + bitField0_ |= 0x00000020; + if (tag != 34) { + break; + } + } + case 34: { + // mazePropList + tag = input.readRepeatedMessage(mazePropList, tag); + bitField0_ |= 0x00000040; + if (tag != 82) { + break; + } + } + case 82: { + // unlockedChestList + tag = input.readRepeatedMessage(unlockedChestList, tag); + bitField0_ |= 0x00000080; + if (tag != 98) { + break; + } + } + case 98: { + // mapList + tag = input.readRepeatedMessage(mapList, tag); bitField0_ |= 0x00000100; if (tag != 0) { break; @@ -884,13 +884,13 @@ public final class GetSceneMapInfoScRspOuterClass { tag = input.readTag(); break; } - case 32: { + case 8: { // lightenSectionList [packed=false] tag = input.readRepeatedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000008; break; } - case 104: { + case 112: { // unlockedTeleportList [packed=false] tag = input.readRepeatedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000010; @@ -904,10 +904,10 @@ public final class GetSceneMapInfoScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.entryId, entryId); @@ -919,16 +919,16 @@ public final class GetSceneMapInfoScRspOuterClass { output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); + output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); + output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.mapList, mapList); + output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); + output.writeRepeatedMessage(FieldNames.mapList, mapList); } output.endObject(); } @@ -940,10 +940,11 @@ public final class GetSceneMapInfoScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 764919441: + case 2115673898: { + if (input.isAtField(FieldNames.curMapEntryId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + curMapEntryId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -951,11 +952,10 @@ public final class GetSceneMapInfoScRspOuterClass { } break; } - case 764919441: - case 2115673898: { - if (input.isAtField(FieldNames.curMapEntryId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - curMapEntryId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -999,12 +999,24 @@ public final class GetSceneMapInfoScRspOuterClass { } break; } + case -317054274: + case 407435998: { + if (input.isAtField(FieldNames.mazeGroupList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(mazeGroupList); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } case 1676123008: case 1875839866: { if (input.isAtField(FieldNames.mazePropList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(mazePropList); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -1016,7 +1028,7 @@ public final class GetSceneMapInfoScRspOuterClass { if (input.isAtField(FieldNames.unlockedChestList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(unlockedChestList); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1028,18 +1040,6 @@ public final class GetSceneMapInfoScRspOuterClass { if (input.isAtField(FieldNames.mapList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(mapList); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } - case -317054274: - case 407435998: { - if (input.isAtField(FieldNames.mazeGroupList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(mazeGroupList); bitField0_ |= 0x00000100; } } else { @@ -1100,23 +1100,23 @@ public final class GetSceneMapInfoScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); static final FieldName unlockedTeleportList = FieldName.forField("unlockedTeleportList", "unlocked_teleport_list"); + static final FieldName mazeGroupList = FieldName.forField("mazeGroupList", "maze_group_list"); + static final FieldName mazePropList = FieldName.forField("mazePropList", "maze_prop_list"); static final FieldName unlockedChestList = FieldName.forField("unlockedChestList", "unlocked_chest_list"); static final FieldName mapList = FieldName.forField("mapList", "map_list"); - - static final FieldName mazeGroupList = FieldName.forField("mazeGroupList", "maze_group_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java index ad0df6e..2394832 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 = 10; + * optional uint32 shop_type = 7; */ private int shopType; @@ -34,7 +34,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 10; + * optional uint32 shop_type = 7; * @return whether the shopType field is set */ public boolean hasShopType() { @@ -42,7 +42,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 10; + * optional uint32 shop_type = 7; * @return this */ public GetShopListCsReq clearShopType() { @@ -52,7 +52,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 10; + * optional uint32 shop_type = 7; * @return the shopType */ public int getShopType() { @@ -60,7 +60,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 10; + * optional uint32 shop_type = 7; * @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) 80); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(shopType); } } @@ -150,7 +150,7 @@ public final class GetShopListCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 56: { // 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 ad5a9e3..d95fe81 100644 --- a/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java @@ -20,17 +20,17 @@ public final class GetShopListScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 shop_type = 3; - */ - private int shopType; - - /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; */ private int retcode; /** - * repeated .Shop shop_list = 8; + * optional uint32 shop_type = 11; + */ + private int shopType; + + /** + * repeated .Shop shop_list = 7; */ private final RepeatedMessage shopList = RepeatedMessage.newEmptyInstance(ShopOuterClass.Shop.getFactory()); @@ -45,62 +45,25 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 shop_type = 3; - * @return whether the shopType field is set + * optional uint32 retcode = 1; + * @return whether the retcode field is set */ - public boolean hasShopType() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 shop_type = 3; - * @return this - */ - public GetShopListScRsp clearShopType() { - bitField0_ &= ~0x00000001; - shopType = 0; - return this; - } - - /** - * optional uint32 shop_type = 3; - * @return the shopType - */ - public int getShopType() { - return shopType; - } - - /** - * optional uint32 shop_type = 3; - * @param value the shopType to set - * @return this - */ - public GetShopListScRsp setShopType(final int value) { - bitField0_ |= 0x00000001; - shopType = value; - return this; - } - - /** - * optional uint32 retcode = 13; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @return this */ public GetShopListScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -108,18 +71,55 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ public GetShopListScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * repeated .Shop shop_list = 8; + * optional uint32 shop_type = 11; + * @return whether the shopType field is set + */ + public boolean hasShopType() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 shop_type = 11; + * @return this + */ + public GetShopListScRsp clearShopType() { + bitField0_ &= ~0x00000002; + shopType = 0; + return this; + } + + /** + * optional uint32 shop_type = 11; + * @return the shopType + */ + public int getShopType() { + return shopType; + } + + /** + * optional uint32 shop_type = 11; + * @param value the shopType to set + * @return this + */ + public GetShopListScRsp setShopType(final int value) { + bitField0_ |= 0x00000002; + shopType = value; + return this; + } + + /** + * repeated .Shop shop_list = 7; * @return whether the shopList field is set */ public boolean hasShopList() { @@ -127,7 +127,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 8; + * repeated .Shop shop_list = 7; * @return this */ public GetShopListScRsp clearShopList() { @@ -137,7 +137,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 8; + * repeated .Shop shop_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 8; + * repeated .Shop shop_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 8; + * repeated .Shop shop_list = 7; * @param value the shopList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 8; + * repeated .Shop shop_list = 7; * @param values the shopList to add * @return this */ @@ -191,8 +191,8 @@ public final class GetShopListScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - shopType = other.shopType; retcode = other.retcode; + shopType = other.shopType; shopList.copyFrom(other.shopList); } return this; @@ -204,12 +204,12 @@ public final class GetShopListScRspOuterClass { return this; } cachedSize = -1; - if (other.hasShopType()) { - setShopType(other.shopType); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasShopType()) { + setShopType(other.shopType); + } if (other.hasShopList()) { getMutableShopList().addAll(other.shopList); } @@ -223,8 +223,8 @@ public final class GetShopListScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - shopType = 0; retcode = 0; + shopType = 0; shopList.clear(); return this; } @@ -250,24 +250,24 @@ public final class GetShopListScRspOuterClass { } GetShopListScRsp other = (GetShopListScRsp) o; return bitField0_ == other.bitField0_ - && (!hasShopType() || shopType == other.shopType) && (!hasRetcode() || retcode == other.retcode) + && (!hasShopType() || shopType == other.shopType) && (!hasShopList() || shopList.equals(other.shopList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(shopType); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(shopType); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < shopList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 58); output.writeMessageNoTag(shopList.get(i)); } } @@ -277,10 +277,10 @@ public final class GetShopListScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(shopType); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(shopType); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * shopList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(shopList); @@ -295,25 +295,25 @@ public final class GetShopListScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // shopType - shopType = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 8: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 88) { break; } } - case 66: { + case 88: { + // shopType + shopType = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { // shopList tag = input.readRepeatedMessage(shopList, tag); bitField0_ |= 0x00000004; @@ -339,10 +339,10 @@ public final class GetShopListScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.shopType, shopType); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.shopType, shopType); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.shopList, shopList); @@ -357,11 +357,10 @@ public final class GetShopListScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -345279664: - case -2103716125: { - if (input.isAtField(FieldNames.shopType)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - shopType = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -369,10 +368,11 @@ public final class GetShopListScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -345279664: + case -2103716125: { + if (input.isAtField(FieldNames.shopType)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + shopType = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -445,10 +445,10 @@ public final class GetShopListScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName shopType = FieldName.forField("shopType", "shop_type"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName shopType = FieldName.forField("shopType", "shop_type"); + static final FieldName shopList = FieldName.forField("shopList", "shop_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java index bfa4941..6973675 100644 --- a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class GetUnlockTeleportCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 10; */ private final RepeatedInt entryIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 10; * @return whether the entryIdList field is set */ public boolean hasEntryIdList() { @@ -43,7 +43,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 10; * @return this */ public GetUnlockTeleportCsReq clearEntryIdList() { @@ -53,7 +53,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 10; * @param value the entryIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 10; * @param values the entryIdList to add * @return this */ @@ -163,7 +163,7 @@ public final class GetUnlockTeleportCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < entryIdList.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(entryIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class GetUnlockTeleportCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 82: { // entryIdList [packed=true] input.readPackedUInt32(entryIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class GetUnlockTeleportCsReqOuterClass { tag = input.readTag(); break; } - case 8: { + case 80: { // 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 54e00f3..14c58f9 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 = 6; + * optional uint32 retcode = 3; */ private int retcode; /** - * repeated uint32 unlocked_teleport_list = 3; + * repeated uint32 unlocked_teleport_list = 7; */ private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 3; * @return this */ public GetUnlockTeleportScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 3; + * repeated uint32 unlocked_teleport_list = 7; * @return whether the unlockedTeleportList field is set */ public boolean hasUnlockedTeleportList() { @@ -85,7 +85,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 3; + * repeated uint32 unlocked_teleport_list = 7; * @return this */ public GetUnlockTeleportScRsp clearUnlockedTeleportList() { @@ -95,7 +95,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 3; + * repeated uint32 unlocked_teleport_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 3; + * repeated uint32 unlocked_teleport_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 3; + * repeated uint32 unlocked_teleport_list = 7; * @param value the unlockedTeleportList to add * @return this */ @@ -134,7 +134,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 3; + * repeated uint32 unlocked_teleport_list = 7; * @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) 48); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unlockedTeleportList.length(); i++) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(unlockedTeleportList.array()[i]); } } @@ -240,16 +240,16 @@ public final class GetUnlockTeleportScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 58) { break; } } - case 26: { + case 58: { // unlockedTeleportList [packed=true] input.readPackedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class GetUnlockTeleportScRspOuterClass { tag = input.readTag(); break; } - case 24: { + case 56: { // 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 2fa1970..82dfbbd 100644 --- a/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java @@ -19,29 +19,29 @@ public final class GoodsOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 3; - */ - private long beginTime; - - /** - * optional int64 end_time = 13; + * optional int64 end_time = 3; */ private long endTime; /** - * optional uint32 goods_id = 4; + * optional int64 begin_time = 8; */ - private int goodsId; + private long beginTime; /** - * optional uint32 buy_times = 8; + * optional uint32 item_id = 4; + */ + private int itemId; + + /** + * optional uint32 buy_times = 10; */ private int buyTimes; /** - * optional uint32 item_id = 14; + * optional uint32 goods_id = 13; */ - private int itemId; + private int goodsId; private Goods() { } @@ -54,62 +54,25 @@ public final class GoodsOuterClass { } /** - * optional int64 begin_time = 3; - * @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 = 3; - * @return this - */ - public Goods clearBeginTime() { - bitField0_ &= ~0x00000001; - beginTime = 0L; - return this; - } - - /** - * optional int64 begin_time = 3; - * @return the beginTime - */ - public long getBeginTime() { - return beginTime; - } - - /** - * optional int64 begin_time = 3; - * @param value the beginTime to set - * @return this - */ - public Goods setBeginTime(final long value) { - bitField0_ |= 0x00000001; - beginTime = value; - return this; - } - - /** - * optional int64 end_time = 13; - * @return whether the endTime field is set - */ - public boolean hasEndTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 end_time = 13; + * optional int64 end_time = 3; * @return this */ public Goods clearEndTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; endTime = 0L; return this; } /** - * optional int64 end_time = 13; + * optional int64 end_time = 3; * @return the endTime */ public long getEndTime() { @@ -117,55 +80,92 @@ public final class GoodsOuterClass { } /** - * optional int64 end_time = 13; + * 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 goods_id = 4; - * @return whether the goodsId field is set + * optional int64 begin_time = 8; + * @return whether the beginTime field is set */ - public boolean hasGoodsId() { + public boolean hasBeginTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 begin_time = 8; + * @return this + */ + public Goods clearBeginTime() { + bitField0_ &= ~0x00000002; + beginTime = 0L; + return this; + } + + /** + * optional int64 begin_time = 8; + * @return the beginTime + */ + public long getBeginTime() { + return beginTime; + } + + /** + * optional int64 begin_time = 8; + * @param value the beginTime to set + * @return this + */ + public Goods setBeginTime(final long value) { + bitField0_ |= 0x00000002; + beginTime = value; + return this; + } + + /** + * optional uint32 item_id = 4; + * @return whether the itemId field is set + */ + public boolean hasItemId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 goods_id = 4; + * optional uint32 item_id = 4; * @return this */ - public Goods clearGoodsId() { + public Goods clearItemId() { bitField0_ &= ~0x00000004; - goodsId = 0; + itemId = 0; return this; } /** - * optional uint32 goods_id = 4; - * @return the goodsId + * optional uint32 item_id = 4; + * @return the itemId */ - public int getGoodsId() { - return goodsId; + public int getItemId() { + return itemId; } /** - * optional uint32 goods_id = 4; - * @param value the goodsId to set + * optional uint32 item_id = 4; + * @param value the itemId to set * @return this */ - public Goods setGoodsId(final int value) { + public Goods setItemId(final int value) { bitField0_ |= 0x00000004; - goodsId = value; + itemId = value; return this; } /** - * optional uint32 buy_times = 8; + * optional uint32 buy_times = 10; * @return whether the buyTimes field is set */ public boolean hasBuyTimes() { @@ -173,7 +173,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 buy_times = 8; + * optional uint32 buy_times = 10; * @return this */ public Goods clearBuyTimes() { @@ -183,7 +183,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 buy_times = 8; + * optional uint32 buy_times = 10; * @return the buyTimes */ public int getBuyTimes() { @@ -191,7 +191,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 buy_times = 8; + * optional uint32 buy_times = 10; * @param value the buyTimes to set * @return this */ @@ -202,39 +202,39 @@ public final class GoodsOuterClass { } /** - * optional uint32 item_id = 14; - * @return whether the itemId field is set + * optional uint32 goods_id = 13; + * @return whether the goodsId field is set */ - public boolean hasItemId() { + public boolean hasGoodsId() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 item_id = 14; + * optional uint32 goods_id = 13; * @return this */ - public Goods clearItemId() { + public Goods clearGoodsId() { bitField0_ &= ~0x00000010; - itemId = 0; + goodsId = 0; return this; } /** - * optional uint32 item_id = 14; - * @return the itemId + * optional uint32 goods_id = 13; + * @return the goodsId */ - public int getItemId() { - return itemId; + public int getGoodsId() { + return goodsId; } /** - * optional uint32 item_id = 14; - * @param value the itemId to set + * optional uint32 goods_id = 13; + * @param value the goodsId to set * @return this */ - public Goods setItemId(final int value) { + public Goods setGoodsId(final int value) { bitField0_ |= 0x00000010; - itemId = value; + goodsId = value; return this; } @@ -243,11 +243,11 @@ public final class GoodsOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - beginTime = other.beginTime; endTime = other.endTime; - goodsId = other.goodsId; - buyTimes = other.buyTimes; + beginTime = other.beginTime; itemId = other.itemId; + buyTimes = other.buyTimes; + goodsId = other.goodsId; } return this; } @@ -258,20 +258,20 @@ public final class GoodsOuterClass { return this; } cachedSize = -1; - if (other.hasBeginTime()) { - setBeginTime(other.beginTime); - } if (other.hasEndTime()) { setEndTime(other.endTime); } - if (other.hasGoodsId()) { - setGoodsId(other.goodsId); + if (other.hasBeginTime()) { + setBeginTime(other.beginTime); + } + if (other.hasItemId()) { + setItemId(other.itemId); } if (other.hasBuyTimes()) { setBuyTimes(other.buyTimes); } - if (other.hasItemId()) { - setItemId(other.itemId); + if (other.hasGoodsId()) { + setGoodsId(other.goodsId); } return this; } @@ -283,11 +283,11 @@ public final class GoodsOuterClass { } cachedSize = -1; bitField0_ = 0; - beginTime = 0L; endTime = 0L; - goodsId = 0; - buyTimes = 0; + beginTime = 0L; itemId = 0; + buyTimes = 0; + goodsId = 0; return this; } @@ -311,34 +311,34 @@ public final class GoodsOuterClass { } Goods other = (Goods) o; return bitField0_ == other.bitField0_ - && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) - && (!hasGoodsId() || goodsId == other.goodsId) + && (!hasBeginTime() || beginTime == other.beginTime) + && (!hasItemId() || itemId == other.itemId) && (!hasBuyTimes() || buyTimes == other.buyTimes) - && (!hasItemId() || itemId == other.itemId); + && (!hasGoodsId() || goodsId == other.goodsId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 24); - output.writeInt64NoTag(beginTime); + output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeInt64NoTag(endTime); + output.writeRawByte((byte) 64); + output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(goodsId); + output.writeUInt32NoTag(itemId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(buyTimes); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(itemId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(goodsId); } } @@ -346,19 +346,19 @@ public final class GoodsOuterClass { 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(goodsId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(buyTimes); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); } return size; } @@ -371,17 +371,17 @@ public final class GoodsOuterClass { while (true) { switch (tag) { case 24: { - // beginTime - beginTime = input.readInt64(); + // endTime + endTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 64) { break; } } - case 104: { - // endTime - endTime = input.readInt64(); + case 64: { + // beginTime + beginTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 32) { @@ -389,26 +389,26 @@ public final class GoodsOuterClass { } } case 32: { - // goodsId - goodsId = input.readUInt32(); + // itemId + itemId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { + if (tag != 80) { break; } } - case 64: { + case 80: { // buyTimes buyTimes = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { - // itemId - itemId = input.readUInt32(); + case 104: { + // goodsId + goodsId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -433,19 +433,19 @@ public final class GoodsOuterClass { 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.goodsId, goodsId); + output.writeUInt32(FieldNames.itemId, itemId); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.buyTimes, buyTimes); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.goodsId, goodsId); } output.endObject(); } @@ -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 { @@ -481,11 +481,11 @@ public final class GoodsOuterClass { } break; } - case 207037201: - case 2123207332: { - if (input.isAtField(FieldNames.goodsId)) { + case -1178662002: + case 2116204999: { + if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { - goodsId = input.readUInt32(); + itemId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -505,11 +505,11 @@ public final class GoodsOuterClass { } break; } - case -1178662002: - case 2116204999: { - if (input.isAtField(FieldNames.itemId)) { + case 207037201: + case 2123207332: { + if (input.isAtField(FieldNames.goodsId)) { if (!input.trySkipNullValue()) { - itemId = input.readUInt32(); + goodsId = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -569,15 +569,15 @@ 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 goodsId = FieldName.forField("goodsId", "goods_id"); + static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); + + static final FieldName itemId = FieldName.forField("itemId", "item_id"); static final FieldName buyTimes = FieldName.forField("buyTimes", "buy_times"); - static final FieldName itemId = FieldName.forField("itemId", "item_id"); + 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 152f823..dba3509 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_state_info = 8; + * optional .GroupStateInfo group_state_info = 6; */ private final GroupStateInfoOuterClass.GroupStateInfo groupStateInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); @@ -34,7 +34,7 @@ public final class GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_info = 6; * @return whether the groupStateInfo field is set */ public boolean hasGroupStateInfo() { @@ -42,7 +42,7 @@ public final class GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_info = 6; * @return this */ public GroupStateChangeCsReq clearGroupStateInfo() { @@ -52,7 +52,7 @@ public final class GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_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 GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_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 GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_state_info = 6; * @param value the groupStateInfo to set * @return this */ @@ -151,7 +151,7 @@ public final class GroupStateChangeCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 50); output.writeMessageNoTag(groupStateInfo); } } @@ -172,7 +172,7 @@ public final class GroupStateChangeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 50: { // groupStateInfo input.readMessage(groupStateInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java index 4fd2d70..a302888 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 = 6; + * optional .GroupStateInfo group_state_info = 1; */ private final GroupStateInfoOuterClass.GroupStateInfo groupStateInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); @@ -34,7 +34,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 6; + * optional .GroupStateInfo group_state_info = 1; * @return whether the groupStateInfo field is set */ public boolean hasGroupStateInfo() { @@ -42,7 +42,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 6; + * optional .GroupStateInfo group_state_info = 1; * @return this */ public GroupStateChangeScNotify clearGroupStateInfo() { @@ -52,7 +52,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 6; + * optional .GroupStateInfo group_state_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. @@ -66,7 +66,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 6; + * optional .GroupStateInfo group_state_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 @@ -80,7 +80,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 6; + * optional .GroupStateInfo group_state_info = 1; * @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) 50); + output.writeRawByte((byte) 10); output.writeMessageNoTag(groupStateInfo); } } @@ -172,7 +172,7 @@ public final class GroupStateChangeScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 50: { + case 10: { // 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 9061326..3a7a9b6 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 = 10; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional .GroupStateInfo group_state_info = 3; + * optional .GroupStateInfo group_state_info = 1; */ private final GroupStateInfoOuterClass.GroupStateInfo groupStateInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 2; * @return this */ public GroupStateChangeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_state_info = 3; + * optional .GroupStateInfo group_state_info = 1; * @return whether the groupStateInfo field is set */ public boolean hasGroupStateInfo() { @@ -84,7 +84,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_state_info = 3; + * optional .GroupStateInfo group_state_info = 1; * @return this */ public GroupStateChangeScRsp clearGroupStateInfo() { @@ -94,7 +94,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_state_info = 3; + * optional .GroupStateInfo group_state_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 GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_state_info = 3; + * optional .GroupStateInfo group_state_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 GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_state_info = 3; + * optional .GroupStateInfo group_state_info = 1; * @param value the groupStateInfo to set * @return this */ @@ -199,11 +199,11 @@ public final class GroupStateChangeScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 10); output.writeMessageNoTag(groupStateInfo); } } @@ -227,16 +227,16 @@ public final class GroupStateChangeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 10) { break; } } - case 26: { + case 10: { // groupStateInfo input.readMessage(groupStateInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java index 7de7788..bfc90c2 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java @@ -19,25 +19,25 @@ public final class GroupStateInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 group_id = 1; + * optional uint32 group_state = 4; + */ + private int groupState; + + /** + * optional uint32 player_uid = 6; + */ + private int playerUid; + + /** + * optional uint32 group_id = 8; */ private int groupId; /** - * optional uint32 entry_id = 3; + * optional uint32 entry_id = 10; */ private int entryId; - /** - * optional uint32 IJMFKKGOPJF = 8; - */ - private int iJMFKKGOPJF; - - /** - * optional uint32 group_state = 14; - */ - private int groupState; - private GroupStateInfo() { } @@ -49,136 +49,25 @@ public final class GroupStateInfoOuterClass { } /** - * optional uint32 group_id = 1; - * @return whether the groupId field is set + * optional uint32 group_state = 4; + * @return whether the groupState field is set */ - public boolean hasGroupId() { + public boolean hasGroupState() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 group_id = 1; - * @return this - */ - public GroupStateInfo clearGroupId() { - bitField0_ &= ~0x00000001; - groupId = 0; - return this; - } - - /** - * optional uint32 group_id = 1; - * @return the groupId - */ - public int getGroupId() { - return groupId; - } - - /** - * optional uint32 group_id = 1; - * @param value the groupId to set - * @return this - */ - public GroupStateInfo setGroupId(final int value) { - bitField0_ |= 0x00000001; - groupId = value; - return this; - } - - /** - * optional uint32 entry_id = 3; - * @return whether the entryId field is set - */ - public boolean hasEntryId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 entry_id = 3; - * @return this - */ - public GroupStateInfo clearEntryId() { - bitField0_ &= ~0x00000002; - entryId = 0; - return this; - } - - /** - * optional uint32 entry_id = 3; - * @return the entryId - */ - public int getEntryId() { - return entryId; - } - - /** - * optional uint32 entry_id = 3; - * @param value the entryId to set - * @return this - */ - public GroupStateInfo setEntryId(final int value) { - bitField0_ |= 0x00000002; - entryId = value; - return this; - } - - /** - * optional uint32 IJMFKKGOPJF = 8; - * @return whether the iJMFKKGOPJF field is set - */ - public boolean hasIJMFKKGOPJF() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 IJMFKKGOPJF = 8; - * @return this - */ - public GroupStateInfo clearIJMFKKGOPJF() { - bitField0_ &= ~0x00000004; - iJMFKKGOPJF = 0; - return this; - } - - /** - * optional uint32 IJMFKKGOPJF = 8; - * @return the iJMFKKGOPJF - */ - public int getIJMFKKGOPJF() { - return iJMFKKGOPJF; - } - - /** - * optional uint32 IJMFKKGOPJF = 8; - * @param value the iJMFKKGOPJF to set - * @return this - */ - public GroupStateInfo setIJMFKKGOPJF(final int value) { - bitField0_ |= 0x00000004; - iJMFKKGOPJF = value; - return this; - } - - /** - * optional uint32 group_state = 14; - * @return whether the groupState field is set - */ - public boolean hasGroupState() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 group_state = 14; + * optional uint32 group_state = 4; * @return this */ public GroupStateInfo clearGroupState() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; groupState = 0; return this; } /** - * optional uint32 group_state = 14; + * optional uint32 group_state = 4; * @return the groupState */ public int getGroupState() { @@ -186,25 +75,136 @@ public final class GroupStateInfoOuterClass { } /** - * optional uint32 group_state = 14; + * optional uint32 group_state = 4; * @param value the groupState to set * @return this */ public GroupStateInfo setGroupState(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; groupState = value; return this; } + /** + * optional uint32 player_uid = 6; + * @return whether the playerUid field is set + */ + public boolean hasPlayerUid() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 player_uid = 6; + * @return this + */ + public GroupStateInfo clearPlayerUid() { + bitField0_ &= ~0x00000002; + 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_ |= 0x00000002; + playerUid = value; + return this; + } + + /** + * optional uint32 group_id = 8; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 group_id = 8; + * @return this + */ + public GroupStateInfo clearGroupId() { + bitField0_ &= ~0x00000004; + groupId = 0; + return this; + } + + /** + * optional uint32 group_id = 8; + * @return the groupId + */ + public int getGroupId() { + return groupId; + } + + /** + * optional uint32 group_id = 8; + * @param value the groupId to set + * @return this + */ + public GroupStateInfo setGroupId(final int value) { + bitField0_ |= 0x00000004; + groupId = value; + return this; + } + + /** + * optional uint32 entry_id = 10; + * @return whether the entryId field is set + */ + public boolean hasEntryId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 entry_id = 10; + * @return this + */ + public GroupStateInfo clearEntryId() { + bitField0_ &= ~0x00000008; + entryId = 0; + return this; + } + + /** + * optional uint32 entry_id = 10; + * @return the entryId + */ + public int getEntryId() { + return entryId; + } + + /** + * optional uint32 entry_id = 10; + * @param value the entryId to set + * @return this + */ + public GroupStateInfo setEntryId(final int value) { + bitField0_ |= 0x00000008; + entryId = value; + return this; + } + @Override public GroupStateInfo copyFrom(final GroupStateInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + groupState = other.groupState; + playerUid = other.playerUid; groupId = other.groupId; entryId = other.entryId; - iJMFKKGOPJF = other.iJMFKKGOPJF; - groupState = other.groupState; } return this; } @@ -215,18 +215,18 @@ public final class GroupStateInfoOuterClass { return this; } cachedSize = -1; + if (other.hasGroupState()) { + setGroupState(other.groupState); + } + if (other.hasPlayerUid()) { + setPlayerUid(other.playerUid); + } if (other.hasGroupId()) { setGroupId(other.groupId); } if (other.hasEntryId()) { setEntryId(other.entryId); } - if (other.hasIJMFKKGOPJF()) { - setIJMFKKGOPJF(other.iJMFKKGOPJF); - } - if (other.hasGroupState()) { - setGroupState(other.groupState); - } return this; } @@ -237,10 +237,10 @@ public final class GroupStateInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + groupState = 0; + playerUid = 0; groupId = 0; entryId = 0; - iJMFKKGOPJF = 0; - groupState = 0; return this; } @@ -264,29 +264,29 @@ public final class GroupStateInfoOuterClass { } GroupStateInfo other = (GroupStateInfo) o; return bitField0_ == other.bitField0_ + && (!hasGroupState() || groupState == other.groupState) + && (!hasPlayerUid() || playerUid == other.playerUid) && (!hasGroupId() || groupId == other.groupId) - && (!hasEntryId() || entryId == other.entryId) - && (!hasIJMFKKGOPJF() || iJMFKKGOPJF == other.iJMFKKGOPJF) - && (!hasGroupState() || groupState == other.groupState); + && (!hasEntryId() || entryId == other.entryId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(groupState); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(entryId); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(playerUid); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 64); - output.writeUInt32NoTag(iJMFKKGOPJF); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(groupState); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(entryId); } } @@ -294,16 +294,16 @@ public final class GroupStateInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupState); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(playerUid); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(iJMFKKGOPJF); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupState); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } return size; } @@ -315,18 +315,18 @@ public final class GroupStateInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // groupId - groupId = input.readUInt32(); + case 32: { + // groupState + groupState = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 48) { break; } } - case 24: { - // entryId - entryId = input.readUInt32(); + case 48: { + // playerUid + playerUid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 64) { @@ -334,17 +334,17 @@ public final class GroupStateInfoOuterClass { } } case 64: { - // iJMFKKGOPJF - iJMFKKGOPJF = input.readUInt32(); + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 112) { + if (tag != 80) { break; } } - case 112: { - // groupState - groupState = input.readUInt32(); + case 80: { + // entryId + entryId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public final class GroupStateInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.groupState, groupState); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); + output.writeUInt32(FieldNames.playerUid, playerUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.iJMFKKGOPJF, iJMFKKGOPJF); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.groupState, groupState); + output.writeUInt32(FieldNames.entryId, entryId); } output.endObject(); } @@ -390,12 +390,36 @@ public final class GroupStateInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 1271403858: + case 1101988561: { + if (input.isAtField(FieldNames.groupState)) { + if (!input.trySkipNullValue()) { + groupState = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case -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_ |= 0x00000001; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -407,29 +431,6 @@ public final class GroupStateInfoOuterClass { if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { entryId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 370526858: { - if (input.isAtField(FieldNames.iJMFKKGOPJF)) { - if (!input.trySkipNullValue()) { - iJMFKKGOPJF = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1271403858: - case 1101988561: { - if (input.isAtField(FieldNames.groupState)) { - if (!input.trySkipNullValue()) { - groupState = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -490,13 +491,13 @@ public final class GroupStateInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName groupState = FieldName.forField("groupState", "group_state"); + + static final FieldName playerUid = FieldName.forField("playerUid", "player_uid"); + static final FieldName groupId = FieldName.forField("groupId", "group_id"); static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - - static final FieldName iJMFKKGOPJF = FieldName.forField("IJMFKKGOPJF"); - - static final FieldName groupState = FieldName.forField("groupState", "group_state"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java index c3e3ba9..57b05a6 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 = 2; + * optional uint32 uid = 8; */ private int uid; /** - * optional bool handle_result = 12; + * optional bool handle_result = 9; */ private boolean handleResult; @@ -39,7 +39,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 8; * @return whether the uid field is set */ public boolean hasUid() { @@ -47,7 +47,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 8; * @return this */ public HandleFriendCsReq clearUid() { @@ -57,7 +57,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 8; * @return the uid */ public int getUid() { @@ -65,7 +65,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 8; * @param value the uid to set * @return this */ @@ -76,7 +76,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 12; + * optional bool handle_result = 9; * @return whether the handleResult field is set */ public boolean hasHandleResult() { @@ -84,7 +84,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 12; + * optional bool handle_result = 9; * @return this */ public HandleFriendCsReq clearHandleResult() { @@ -94,7 +94,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 12; + * optional bool handle_result = 9; * @return the handleResult */ public boolean getHandleResult() { @@ -102,7 +102,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 12; + * optional bool handle_result = 9; * @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) 16); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 72); output.writeBoolNoTag(handleResult); } } @@ -205,16 +205,16 @@ public final class HandleFriendCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 64: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 72) { break; } } - case 96: { + case 72: { // 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 d972f5d..3c6e6f8 100644 --- a/src/generated/main/emu/lunarcore/proto/HandleFriendScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HandleFriendScRspOuterClass.java @@ -19,12 +19,12 @@ public final class HandleFriendScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 6; + * optional uint32 uid = 4; */ private int uid; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; */ private int retcode; @@ -34,7 +34,7 @@ public final class HandleFriendScRspOuterClass { private boolean handleResult; /** - * optional .FriendListInfo handle_friend_info = 3; + * optional .FriendListInfo handle_friend_info = 14; */ private final FriendListInfoOuterClass.FriendListInfo handleFriendInfo = FriendListInfoOuterClass.FriendListInfo.newInstance(); @@ -49,7 +49,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 uid = 6; + * optional uint32 uid = 4; * @return whether the uid field is set */ public boolean hasUid() { @@ -57,7 +57,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 uid = 6; + * optional uint32 uid = 4; * @return this */ public HandleFriendScRsp clearUid() { @@ -67,7 +67,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 uid = 6; + * optional uint32 uid = 4; * @return the uid */ public int getUid() { @@ -75,7 +75,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 uid = 6; + * optional uint32 uid = 4; * @param value the uid to set * @return this */ @@ -86,7 +86,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -94,7 +94,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @return this */ public HandleFriendScRsp clearRetcode() { @@ -104,7 +104,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -112,7 +112,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -160,7 +160,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 3; + * optional .FriendListInfo handle_friend_info = 14; * @return whether the handleFriendInfo field is set */ public boolean hasHandleFriendInfo() { @@ -168,7 +168,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 3; + * optional .FriendListInfo handle_friend_info = 14; * @return this */ public HandleFriendScRsp clearHandleFriendInfo() { @@ -178,7 +178,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 3; + * optional .FriendListInfo handle_friend_info = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -192,7 +192,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 3; + * optional .FriendListInfo handle_friend_info = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -206,7 +206,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 3; + * optional .FriendListInfo handle_friend_info = 14; * @param value the handleFriendInfo to set * @return this */ @@ -295,11 +295,11 @@ public final class HandleFriendScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { @@ -307,7 +307,7 @@ public final class HandleFriendScRspOuterClass { output.writeBoolNoTag(handleResult); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 114); output.writeMessageNoTag(handleFriendInfo); } } @@ -337,16 +337,16 @@ public final class HandleFriendScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 32: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 96) { break; } } - case 120: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; @@ -360,11 +360,11 @@ public final class HandleFriendScRspOuterClass { handleResult = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 26) { + if (tag != 114) { break; } } - case 26: { + case 114: { // handleFriendInfo input.readMessage(handleFriendInfo); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java index dd81167..a0702ee 100644 --- a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java @@ -19,34 +19,34 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     * PHDCDDGMOJD MKNBOHDIBMC = 1285;
-     * LNKCIHHBMCN LMGOMLNGOCL = 1618;
-     * ECNFHANMIJD PCEFILHFHDH = 368;
-     * GOGIJMPCNAO FBDCGDPCBNL = 569;
-     *
- * - * optional .RogueBonusSelectResult bonus_select_result = 136; - */ - private final RogueBonusSelectResultOuterClass.RogueBonusSelectResult bonusSelectResult = RogueBonusSelectResultOuterClass.RogueBonusSelectResult.newInstance(); - - /** - * optional .RogueMiracleSelectResult miracle_select_result = 194; + * optional .RogueMiracleSelectResult miracle_select_result = 1175; */ private final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult miracleSelectResult = RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult.newInstance(); /** * 
-     * KINJFMEPCKE LIIGPIFDPLK = 1157;
-     * CKGDDAIDEMO OECLKHEGBFM = 1521;
+     * JACBIHGHBBH GINJAHMNLMN = 21;
+     * DIALLJLHKEK NLCPCIOBHKN = 1424;
+     * OLNALBGNCPE NFPPMBBMMJL = 1886;
+     * JFCGPBHHKLD EFGNPNPEDEA = 220;
      *
* - * optional .RogueBuffRollInfo roll_buff = 689; + * optional .RogueBonusSelectResult bonus_select_result = 1242; + */ + private final RogueBonusSelectResultOuterClass.RogueBonusSelectResult bonusSelectResult = RogueBonusSelectResultOuterClass.RogueBonusSelectResult.newInstance(); + + /** + * 
+     * JNJLFGDKHJC GKCFOFJCFLO = 907;
+     * FCCPIEBHDJA NLMFGNLNHJL = 1353;
+     *
+ * + * optional .RogueBuffRollInfo roll_buff = 1414; */ private final RogueBuffRollInfoOuterClass.RogueBuffRollInfo rollBuff = RogueBuffRollInfoOuterClass.RogueBuffRollInfo.newInstance(); /** - * optional .RogueCommonBuffSelectResult buff_select_result = 1139; + * optional .RogueCommonBuffSelectResult buff_select_result = 1802; */ private final RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult buffSelectResult = RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult.newInstance(); @@ -61,46 +61,105 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * 
-     * PHDCDDGMOJD MKNBOHDIBMC = 1285;
-     * LNKCIHHBMCN LMGOMLNGOCL = 1618;
-     * ECNFHANMIJD PCEFILHFHDH = 368;
-     * GOGIJMPCNAO FBDCGDPCBNL = 569;
-     *
- * - * optional .RogueBonusSelectResult bonus_select_result = 136; - * @return whether the bonusSelectResult field is set + * optional .RogueMiracleSelectResult miracle_select_result = 1175; + * @return whether the miracleSelectResult field is set */ - public boolean hasBonusSelectResult() { + public boolean hasMiracleSelectResult() { return (bitField0_ & 0x00000001) != 0; } + /** + * optional .RogueMiracleSelectResult miracle_select_result = 1175; + * @return this + */ + public HandleRogueCommonPendingActionCsReq clearMiracleSelectResult() { + bitField0_ &= ~0x00000001; + miracleSelectResult.clear(); + return this; + } + + /** + * optional .RogueMiracleSelectResult miracle_select_result = 1175; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableMiracleSelectResult()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult getMiracleSelectResult() { + return miracleSelectResult; + } + + /** + * optional .RogueMiracleSelectResult miracle_select_result = 1175; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult getMutableMiracleSelectResult( + ) { + bitField0_ |= 0x00000001; + return miracleSelectResult; + } + + /** + * optional .RogueMiracleSelectResult miracle_select_result = 1175; + * @param value the miracleSelectResult to set + * @return this + */ + public HandleRogueCommonPendingActionCsReq setMiracleSelectResult( + final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult value) { + bitField0_ |= 0x00000001; + miracleSelectResult.copyFrom(value); + return this; + } + /** * 
-     * PHDCDDGMOJD MKNBOHDIBMC = 1285;
-     * LNKCIHHBMCN LMGOMLNGOCL = 1618;
-     * ECNFHANMIJD PCEFILHFHDH = 368;
-     * GOGIJMPCNAO FBDCGDPCBNL = 569;
+     * JACBIHGHBBH GINJAHMNLMN = 21;
+     * DIALLJLHKEK NLCPCIOBHKN = 1424;
+     * OLNALBGNCPE NFPPMBBMMJL = 1886;
+     * JFCGPBHHKLD EFGNPNPEDEA = 220;
      *
* - * optional .RogueBonusSelectResult bonus_select_result = 136; + * optional .RogueBonusSelectResult bonus_select_result = 1242; + * @return whether the bonusSelectResult field is set + */ + public boolean hasBonusSelectResult() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * 
+     * JACBIHGHBBH GINJAHMNLMN = 21;
+     * DIALLJLHKEK NLCPCIOBHKN = 1424;
+     * OLNALBGNCPE NFPPMBBMMJL = 1886;
+     * JFCGPBHHKLD EFGNPNPEDEA = 220;
+     *
+ * + * optional .RogueBonusSelectResult bonus_select_result = 1242; * @return this */ public HandleRogueCommonPendingActionCsReq clearBonusSelectResult() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; bonusSelectResult.clear(); return this; } /** * 
-     * PHDCDDGMOJD MKNBOHDIBMC = 1285;
-     * LNKCIHHBMCN LMGOMLNGOCL = 1618;
-     * ECNFHANMIJD PCEFILHFHDH = 368;
-     * GOGIJMPCNAO FBDCGDPCBNL = 569;
+     * JACBIHGHBBH GINJAHMNLMN = 21;
+     * DIALLJLHKEK NLCPCIOBHKN = 1424;
+     * OLNALBGNCPE NFPPMBBMMJL = 1886;
+     * JFCGPBHHKLD EFGNPNPEDEA = 220;
      *
* - * optional .RogueBonusSelectResult bonus_select_result = 136; + * optional .RogueBonusSelectResult bonus_select_result = 1242; * * This 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,13 +174,13 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { /** * 
-     * PHDCDDGMOJD MKNBOHDIBMC = 1285;
-     * LNKCIHHBMCN LMGOMLNGOCL = 1618;
-     * ECNFHANMIJD PCEFILHFHDH = 368;
-     * GOGIJMPCNAO FBDCGDPCBNL = 569;
+     * JACBIHGHBBH GINJAHMNLMN = 21;
+     * DIALLJLHKEK NLCPCIOBHKN = 1424;
+     * OLNALBGNCPE NFPPMBBMMJL = 1886;
+     * JFCGPBHHKLD EFGNPNPEDEA = 220;
      *
* - * optional .RogueBonusSelectResult bonus_select_result = 136; + * optional .RogueBonusSelectResult bonus_select_result = 1242; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -130,95 +189,36 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { * @return internal storage object for modifications */ public RogueBonusSelectResultOuterClass.RogueBonusSelectResult getMutableBonusSelectResult() { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return bonusSelectResult; } /** * 
-     * PHDCDDGMOJD MKNBOHDIBMC = 1285;
-     * LNKCIHHBMCN LMGOMLNGOCL = 1618;
-     * ECNFHANMIJD PCEFILHFHDH = 368;
-     * GOGIJMPCNAO FBDCGDPCBNL = 569;
+     * JACBIHGHBBH GINJAHMNLMN = 21;
+     * DIALLJLHKEK NLCPCIOBHKN = 1424;
+     * OLNALBGNCPE NFPPMBBMMJL = 1886;
+     * JFCGPBHHKLD EFGNPNPEDEA = 220;
      *
* - * optional .RogueBonusSelectResult bonus_select_result = 136; + * optional .RogueBonusSelectResult bonus_select_result = 1242; * @param value the bonusSelectResult to set * @return this */ public HandleRogueCommonPendingActionCsReq setBonusSelectResult( final RogueBonusSelectResultOuterClass.RogueBonusSelectResult value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; bonusSelectResult.copyFrom(value); return this; } - /** - * optional .RogueMiracleSelectResult miracle_select_result = 194; - * @return whether the miracleSelectResult field is set - */ - public boolean hasMiracleSelectResult() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .RogueMiracleSelectResult miracle_select_result = 194; - * @return this - */ - public HandleRogueCommonPendingActionCsReq clearMiracleSelectResult() { - bitField0_ &= ~0x00000002; - miracleSelectResult.clear(); - return this; - } - - /** - * optional .RogueMiracleSelectResult miracle_select_result = 194; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableMiracleSelectResult()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult getMiracleSelectResult() { - return miracleSelectResult; - } - - /** - * optional .RogueMiracleSelectResult miracle_select_result = 194; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult getMutableMiracleSelectResult( - ) { - bitField0_ |= 0x00000002; - return miracleSelectResult; - } - - /** - * optional .RogueMiracleSelectResult miracle_select_result = 194; - * @param value the miracleSelectResult to set - * @return this - */ - public HandleRogueCommonPendingActionCsReq setMiracleSelectResult( - final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult value) { - bitField0_ |= 0x00000002; - miracleSelectResult.copyFrom(value); - return this; - } - /** * 
-     * KINJFMEPCKE LIIGPIFDPLK = 1157;
-     * CKGDDAIDEMO OECLKHEGBFM = 1521;
+     * JNJLFGDKHJC GKCFOFJCFLO = 907;
+     * FCCPIEBHDJA NLMFGNLNHJL = 1353;
      *
* - * optional .RogueBuffRollInfo roll_buff = 689; + * optional .RogueBuffRollInfo roll_buff = 1414; * @return whether the rollBuff field is set */ public boolean hasRollBuff() { @@ -227,11 +227,11 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { /** * 
-     * KINJFMEPCKE LIIGPIFDPLK = 1157;
-     * CKGDDAIDEMO OECLKHEGBFM = 1521;
+     * JNJLFGDKHJC GKCFOFJCFLO = 907;
+     * FCCPIEBHDJA NLMFGNLNHJL = 1353;
      *
* - * optional .RogueBuffRollInfo roll_buff = 689; + * optional .RogueBuffRollInfo roll_buff = 1414; * @return this */ public HandleRogueCommonPendingActionCsReq clearRollBuff() { @@ -242,11 +242,11 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { /** * 
-     * KINJFMEPCKE LIIGPIFDPLK = 1157;
-     * CKGDDAIDEMO OECLKHEGBFM = 1521;
+     * JNJLFGDKHJC GKCFOFJCFLO = 907;
+     * FCCPIEBHDJA NLMFGNLNHJL = 1353;
      *
* - * optional .RogueBuffRollInfo roll_buff = 689; + * optional .RogueBuffRollInfo roll_buff = 1414; * * This 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,11 +261,11 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { /** * 
-     * KINJFMEPCKE LIIGPIFDPLK = 1157;
-     * CKGDDAIDEMO OECLKHEGBFM = 1521;
+     * JNJLFGDKHJC GKCFOFJCFLO = 907;
+     * FCCPIEBHDJA NLMFGNLNHJL = 1353;
      *
* - * optional .RogueBuffRollInfo roll_buff = 689; + * optional .RogueBuffRollInfo roll_buff = 1414; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -280,11 +280,11 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { /** * 
-     * KINJFMEPCKE LIIGPIFDPLK = 1157;
-     * CKGDDAIDEMO OECLKHEGBFM = 1521;
+     * JNJLFGDKHJC GKCFOFJCFLO = 907;
+     * FCCPIEBHDJA NLMFGNLNHJL = 1353;
      *
* - * optional .RogueBuffRollInfo roll_buff = 689; + * optional .RogueBuffRollInfo roll_buff = 1414; * @param value the rollBuff to set * @return this */ @@ -296,7 +296,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueCommonBuffSelectResult buff_select_result = 1139; + * optional .RogueCommonBuffSelectResult buff_select_result = 1802; * @return whether the buffSelectResult field is set */ public boolean hasBuffSelectResult() { @@ -304,7 +304,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueCommonBuffSelectResult buff_select_result = 1139; + * optional .RogueCommonBuffSelectResult buff_select_result = 1802; * @return this */ public HandleRogueCommonPendingActionCsReq clearBuffSelectResult() { @@ -314,7 +314,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueCommonBuffSelectResult buff_select_result = 1139; + * optional .RogueCommonBuffSelectResult buff_select_result = 1802; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -328,7 +328,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueCommonBuffSelectResult buff_select_result = 1139; + * optional .RogueCommonBuffSelectResult buff_select_result = 1802; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -343,7 +343,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueCommonBuffSelectResult buff_select_result = 1139; + * optional .RogueCommonBuffSelectResult buff_select_result = 1802; * @param value the buffSelectResult to set * @return this */ @@ -360,8 +360,8 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - bonusSelectResult.copyFrom(other.bonusSelectResult); miracleSelectResult.copyFrom(other.miracleSelectResult); + bonusSelectResult.copyFrom(other.bonusSelectResult); rollBuff.copyFrom(other.rollBuff); buffSelectResult.copyFrom(other.buffSelectResult); } @@ -375,12 +375,12 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasBonusSelectResult()) { - getMutableBonusSelectResult().mergeFrom(other.bonusSelectResult); - } if (other.hasMiracleSelectResult()) { getMutableMiracleSelectResult().mergeFrom(other.miracleSelectResult); } + if (other.hasBonusSelectResult()) { + getMutableBonusSelectResult().mergeFrom(other.bonusSelectResult); + } if (other.hasRollBuff()) { getMutableRollBuff().mergeFrom(other.rollBuff); } @@ -397,8 +397,8 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - bonusSelectResult.clear(); miracleSelectResult.clear(); + bonusSelectResult.clear(); rollBuff.clear(); buffSelectResult.clear(); return this; @@ -411,8 +411,8 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - bonusSelectResult.clearQuick(); miracleSelectResult.clearQuick(); + bonusSelectResult.clearQuick(); rollBuff.clearQuick(); buffSelectResult.clearQuick(); return this; @@ -428,8 +428,8 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } HandleRogueCommonPendingActionCsReq other = (HandleRogueCommonPendingActionCsReq) o; return bitField0_ == other.bitField0_ - && (!hasBonusSelectResult() || bonusSelectResult.equals(other.bonusSelectResult)) && (!hasMiracleSelectResult() || miracleSelectResult.equals(other.miracleSelectResult)) + && (!hasBonusSelectResult() || bonusSelectResult.equals(other.bonusSelectResult)) && (!hasRollBuff() || rollBuff.equals(other.rollBuff)) && (!hasBuffSelectResult() || buffSelectResult.equals(other.buffSelectResult)); } @@ -437,19 +437,19 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawLittleEndian16((short) 2242); - output.writeMessageNoTag(bonusSelectResult); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawLittleEndian16((short) 3218); + output.writeRawLittleEndian16((short) 18874); output.writeMessageNoTag(miracleSelectResult); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawLittleEndian16((short) 19922); + output.writeMessageNoTag(bonusSelectResult); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 11146); + output.writeRawLittleEndian16((short) 22706); output.writeMessageNoTag(rollBuff); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 18330); + output.writeRawLittleEndian16((short) 28882); output.writeMessageNoTag(buffSelectResult); } } @@ -458,10 +458,10 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectResult); + size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectResult); } if ((bitField0_ & 0x00000002) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectResult); + size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectResult); } if ((bitField0_ & 0x00000004) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(rollBuff); @@ -480,34 +480,34 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 1090: { - // bonusSelectResult - input.readMessage(bonusSelectResult); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 1554) { - break; - } - } - case 1554: { + case 9402: { // miracleSelectResult input.readMessage(miracleSelectResult); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 5514) { + if (tag != 9938) { break; } } - case 5514: { + case 9938: { + // bonusSelectResult + input.readMessage(bonusSelectResult); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 11314) { + break; + } + } + case 11314: { // rollBuff input.readMessage(rollBuff); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 9114) { + if (tag != 14418) { break; } } - case 9114: { + case 14418: { // buffSelectResult input.readMessage(buffSelectResult); bitField0_ |= 0x00000008; @@ -534,10 +534,10 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.bonusSelectResult, bonusSelectResult); + output.writeMessage(FieldNames.miracleSelectResult, miracleSelectResult); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.miracleSelectResult, miracleSelectResult); + output.writeMessage(FieldNames.bonusSelectResult, bonusSelectResult); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.rollBuff, rollBuff); @@ -556,11 +556,11 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 732920312: - case 396692640: { - if (input.isAtField(FieldNames.bonusSelectResult)) { + case 961581898: + case 1097144690: { + if (input.isAtField(FieldNames.miracleSelectResult)) { if (!input.trySkipNullValue()) { - input.readMessage(bonusSelectResult); + input.readMessage(miracleSelectResult); bitField0_ |= 0x00000001; } } else { @@ -568,11 +568,11 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } break; } - case 961581898: - case 1097144690: { - if (input.isAtField(FieldNames.miracleSelectResult)) { + case 732920312: + case 396692640: { + if (input.isAtField(FieldNames.bonusSelectResult)) { if (!input.trySkipNullValue()) { - input.readMessage(miracleSelectResult); + input.readMessage(bonusSelectResult); bitField0_ |= 0x00000002; } } else { @@ -659,10 +659,10 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName bonusSelectResult = FieldName.forField("bonusSelectResult", "bonus_select_result"); - static final FieldName miracleSelectResult = FieldName.forField("miracleSelectResult", "miracle_select_result"); + static final FieldName bonusSelectResult = FieldName.forField("bonusSelectResult", "bonus_select_result"); + static final FieldName rollBuff = FieldName.forField("rollBuff", "roll_buff"); static final FieldName buffSelectResult = FieldName.forField("buffSelectResult", "buff_select_result"); diff --git a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java index 34f060c..8243a03 100644 --- a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java @@ -19,25 +19,35 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; - */ - private int retcode; - - /** - * optional uint32 times = 6; + * optional uint32 times = 5; */ private int times; + /** + * optional uint32 retcode = 9; + */ + private int retcode; + /** * 
      * JNFKIKEOCDJ PMKFBIDBNMD = 278;
      * NBBNKDNALML NHMMLPMPOGJ = 1188;
      *
* - * optional .RogueRerollBuff rogue_reroll_buff = 726; + * optional .RogueRerollBuff rogue_reroll_buff = 795; */ private final RogueRerollBuffOuterClass.RogueRerollBuff rogueRerollBuff = RogueRerollBuffOuterClass.RogueRerollBuff.newInstance(); + /** + * optional .RogueBuffSelect rogue_buff_select = 803; + */ + private final RogueBuffSelectOuterClass.RogueBuffSelect rogueBuffSelect = RogueBuffSelectOuterClass.RogueBuffSelect.newInstance(); + + /** + * optional .RogueMiracleSelect miracle_select = 830; + */ + private final RogueMiracleSelectOuterClass.RogueMiracleSelect miracleSelect = RogueMiracleSelectOuterClass.RogueMiracleSelect.newInstance(); + /** * 
      * CAJPKNLHPKI EDNKJDKBFBK = 1063;
@@ -46,20 +56,10 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
      * IAAPDOPPHGN NIMIHAMIMDC = 283;
      *
* - * optional .RogueBonusSelect bonus_select = 1149; + * optional .RogueBonusSelect bonus_select = 1544; */ private final RogueBonusSelectOuterClass.RogueBonusSelect bonusSelect = RogueBonusSelectOuterClass.RogueBonusSelect.newInstance(); - /** - * optional .RogueBuffSelect rogue_buff_select = 1258; - */ - private final RogueBuffSelectOuterClass.RogueBuffSelect rogueBuffSelect = RogueBuffSelectOuterClass.RogueBuffSelect.newInstance(); - - /** - * optional .RogueMiracleSelect miracle_select = 1655; - */ - private final RogueMiracleSelectOuterClass.RogueMiracleSelect miracleSelect = RogueMiracleSelectOuterClass.RogueMiracleSelect.newInstance(); - private HandleRogueCommonPendingActionScRsp() { } @@ -71,62 +71,25 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional uint32 retcode = 3; - * @return whether the retcode field is set + * optional uint32 times = 5; + * @return whether the times field is set */ - public boolean hasRetcode() { + public boolean hasTimes() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 3; - * @return this - */ - public HandleRogueCommonPendingActionScRsp 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 HandleRogueCommonPendingActionScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 times = 6; - * @return whether the times field is set - */ - public boolean hasTimes() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 times = 6; + * optional uint32 times = 5; * @return this */ public HandleRogueCommonPendingActionScRsp clearTimes() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; times = 0; return this; } /** - * optional uint32 times = 6; + * optional uint32 times = 5; * @return the times */ public int getTimes() { @@ -134,23 +97,60 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional uint32 times = 6; + * optional uint32 times = 5; * @param value the times to set * @return this */ public HandleRogueCommonPendingActionScRsp setTimes(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; times = 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 HandleRogueCommonPendingActionScRsp 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 HandleRogueCommonPendingActionScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + /** * 
      * JNFKIKEOCDJ PMKFBIDBNMD = 278;
      * NBBNKDNALML NHMMLPMPOGJ = 1188;
      *
* - * optional .RogueRerollBuff rogue_reroll_buff = 726; + * optional .RogueRerollBuff rogue_reroll_buff = 795; * @return whether the rogueRerollBuff field is set */ public boolean hasRogueRerollBuff() { @@ -163,7 +163,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { * NBBNKDNALML NHMMLPMPOGJ = 1188; * * - * optional .RogueRerollBuff rogue_reroll_buff = 726; + * optional .RogueRerollBuff rogue_reroll_buff = 795; * @return this */ public HandleRogueCommonPendingActionScRsp clearRogueRerollBuff() { @@ -178,7 +178,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { * NBBNKDNALML NHMMLPMPOGJ = 1188; * * - * optional .RogueRerollBuff rogue_reroll_buff = 726; + * optional .RogueRerollBuff rogue_reroll_buff = 795; * * This 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 HandleRogueCommonPendingActionScRspOuterClass { * NBBNKDNALML NHMMLPMPOGJ = 1188; * * - * optional .RogueRerollBuff rogue_reroll_buff = 726; + * optional .RogueRerollBuff rogue_reroll_buff = 795; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -216,7 +216,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { * NBBNKDNALML NHMMLPMPOGJ = 1188; * * - * optional .RogueRerollBuff rogue_reroll_buff = 726; + * optional .RogueRerollBuff rogue_reroll_buff = 795; * @param value the rogueRerollBuff to set * @return this */ @@ -228,20 +228,121 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * 
-     * CAJPKNLHPKI EDNKJDKBFBK = 1063;
-     * HAAFONHLFGK LMMCDOMELIG = 703;
-     * CFEFNJGJLMO CLLEHKCPKPF = 337;
-     * IAAPDOPPHGN NIMIHAMIMDC = 283;
-     *
- * - * optional .RogueBonusSelect bonus_select = 1149; - * @return whether the bonusSelect field is set + * optional .RogueBuffSelect rogue_buff_select = 803; + * @return whether the rogueBuffSelect field is set */ - public boolean hasBonusSelect() { + public boolean hasRogueBuffSelect() { return (bitField0_ & 0x00000008) != 0; } + /** + * optional .RogueBuffSelect rogue_buff_select = 803; + * @return this + */ + public HandleRogueCommonPendingActionScRsp clearRogueBuffSelect() { + bitField0_ &= ~0x00000008; + rogueBuffSelect.clear(); + return this; + } + + /** + * optional .RogueBuffSelect rogue_buff_select = 803; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableRogueBuffSelect()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueBuffSelectOuterClass.RogueBuffSelect getRogueBuffSelect() { + return rogueBuffSelect; + } + + /** + * optional .RogueBuffSelect rogue_buff_select = 803; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueBuffSelectOuterClass.RogueBuffSelect getMutableRogueBuffSelect() { + bitField0_ |= 0x00000008; + return rogueBuffSelect; + } + + /** + * optional .RogueBuffSelect rogue_buff_select = 803; + * @param value the rogueBuffSelect to set + * @return this + */ + public HandleRogueCommonPendingActionScRsp setRogueBuffSelect( + final RogueBuffSelectOuterClass.RogueBuffSelect value) { + bitField0_ |= 0x00000008; + rogueBuffSelect.copyFrom(value); + return this; + } + + /** + * optional .RogueMiracleSelect miracle_select = 830; + * @return whether the miracleSelect field is set + */ + public boolean hasMiracleSelect() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .RogueMiracleSelect miracle_select = 830; + * @return this + */ + public HandleRogueCommonPendingActionScRsp clearMiracleSelect() { + bitField0_ &= ~0x00000010; + miracleSelect.clear(); + return this; + } + + /** + * optional .RogueMiracleSelect miracle_select = 830; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableMiracleSelect()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueMiracleSelectOuterClass.RogueMiracleSelect getMiracleSelect() { + return miracleSelect; + } + + /** + * optional .RogueMiracleSelect miracle_select = 830; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueMiracleSelectOuterClass.RogueMiracleSelect getMutableMiracleSelect() { + bitField0_ |= 0x00000010; + return miracleSelect; + } + + /** + * optional .RogueMiracleSelect miracle_select = 830; + * @param value the miracleSelect to set + * @return this + */ + public HandleRogueCommonPendingActionScRsp setMiracleSelect( + final RogueMiracleSelectOuterClass.RogueMiracleSelect value) { + bitField0_ |= 0x00000010; + miracleSelect.copyFrom(value); + return this; + } + /** * 
      * CAJPKNLHPKI EDNKJDKBFBK = 1063;
@@ -250,11 +351,26 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
      * IAAPDOPPHGN NIMIHAMIMDC = 283;
      *
* - * optional .RogueBonusSelect bonus_select = 1149; + * optional .RogueBonusSelect bonus_select = 1544; + * @return whether the bonusSelect field is set + */ + public boolean hasBonusSelect() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * 
+     * CAJPKNLHPKI EDNKJDKBFBK = 1063;
+     * HAAFONHLFGK LMMCDOMELIG = 703;
+     * CFEFNJGJLMO CLLEHKCPKPF = 337;
+     * IAAPDOPPHGN NIMIHAMIMDC = 283;
+     *
+ * + * optional .RogueBonusSelect bonus_select = 1544; * @return this */ public HandleRogueCommonPendingActionScRsp clearBonusSelect() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000020; bonusSelect.clear(); return this; } @@ -267,7 +383,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { * IAAPDOPPHGN NIMIHAMIMDC = 283; * * - * optional .RogueBonusSelect bonus_select = 1149; + * optional .RogueBonusSelect bonus_select = 1544; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -288,7 +404,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { * IAAPDOPPHGN NIMIHAMIMDC = 283; * * - * optional .RogueBonusSelect bonus_select = 1149; + * optional .RogueBonusSelect bonus_select = 1544; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -297,7 +413,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { * @return internal storage object for modifications */ public RogueBonusSelectOuterClass.RogueBonusSelect getMutableBonusSelect() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000020; return bonusSelect; } @@ -309,145 +425,29 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { * IAAPDOPPHGN NIMIHAMIMDC = 283; * * - * optional .RogueBonusSelect bonus_select = 1149; + * optional .RogueBonusSelect bonus_select = 1544; * @param value the bonusSelect to set * @return this */ public HandleRogueCommonPendingActionScRsp setBonusSelect( final RogueBonusSelectOuterClass.RogueBonusSelect value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000020; bonusSelect.copyFrom(value); return this; } - /** - * optional .RogueBuffSelect rogue_buff_select = 1258; - * @return whether the rogueBuffSelect field is set - */ - public boolean hasRogueBuffSelect() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .RogueBuffSelect rogue_buff_select = 1258; - * @return this - */ - public HandleRogueCommonPendingActionScRsp clearRogueBuffSelect() { - bitField0_ &= ~0x00000010; - rogueBuffSelect.clear(); - return this; - } - - /** - * optional .RogueBuffSelect rogue_buff_select = 1258; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRogueBuffSelect()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueBuffSelectOuterClass.RogueBuffSelect getRogueBuffSelect() { - return rogueBuffSelect; - } - - /** - * optional .RogueBuffSelect rogue_buff_select = 1258; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueBuffSelectOuterClass.RogueBuffSelect getMutableRogueBuffSelect() { - bitField0_ |= 0x00000010; - return rogueBuffSelect; - } - - /** - * optional .RogueBuffSelect rogue_buff_select = 1258; - * @param value the rogueBuffSelect to set - * @return this - */ - public HandleRogueCommonPendingActionScRsp setRogueBuffSelect( - final RogueBuffSelectOuterClass.RogueBuffSelect value) { - bitField0_ |= 0x00000010; - rogueBuffSelect.copyFrom(value); - return this; - } - - /** - * optional .RogueMiracleSelect miracle_select = 1655; - * @return whether the miracleSelect field is set - */ - public boolean hasMiracleSelect() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional .RogueMiracleSelect miracle_select = 1655; - * @return this - */ - public HandleRogueCommonPendingActionScRsp clearMiracleSelect() { - bitField0_ &= ~0x00000020; - miracleSelect.clear(); - return this; - } - - /** - * optional .RogueMiracleSelect miracle_select = 1655; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableMiracleSelect()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueMiracleSelectOuterClass.RogueMiracleSelect getMiracleSelect() { - return miracleSelect; - } - - /** - * optional .RogueMiracleSelect miracle_select = 1655; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueMiracleSelectOuterClass.RogueMiracleSelect getMutableMiracleSelect() { - bitField0_ |= 0x00000020; - return miracleSelect; - } - - /** - * optional .RogueMiracleSelect miracle_select = 1655; - * @param value the miracleSelect to set - * @return this - */ - public HandleRogueCommonPendingActionScRsp setMiracleSelect( - final RogueMiracleSelectOuterClass.RogueMiracleSelect value) { - bitField0_ |= 0x00000020; - miracleSelect.copyFrom(value); - return this; - } - @Override public HandleRogueCommonPendingActionScRsp copyFrom( final HandleRogueCommonPendingActionScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; times = other.times; + retcode = other.retcode; rogueRerollBuff.copyFrom(other.rogueRerollBuff); - bonusSelect.copyFrom(other.bonusSelect); rogueBuffSelect.copyFrom(other.rogueBuffSelect); miracleSelect.copyFrom(other.miracleSelect); + bonusSelect.copyFrom(other.bonusSelect); } return this; } @@ -459,24 +459,24 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasTimes()) { setTimes(other.times); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasRogueRerollBuff()) { getMutableRogueRerollBuff().mergeFrom(other.rogueRerollBuff); } - if (other.hasBonusSelect()) { - getMutableBonusSelect().mergeFrom(other.bonusSelect); - } if (other.hasRogueBuffSelect()) { getMutableRogueBuffSelect().mergeFrom(other.rogueBuffSelect); } if (other.hasMiracleSelect()) { getMutableMiracleSelect().mergeFrom(other.miracleSelect); } + if (other.hasBonusSelect()) { + getMutableBonusSelect().mergeFrom(other.bonusSelect); + } return this; } @@ -487,12 +487,12 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; times = 0; + retcode = 0; rogueRerollBuff.clear(); - bonusSelect.clear(); rogueBuffSelect.clear(); miracleSelect.clear(); + bonusSelect.clear(); return this; } @@ -504,9 +504,9 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { cachedSize = -1; bitField0_ = 0; rogueRerollBuff.clearQuick(); - bonusSelect.clearQuick(); rogueBuffSelect.clearQuick(); miracleSelect.clearQuick(); + bonusSelect.clearQuick(); return this; } @@ -520,63 +520,63 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } HandleRogueCommonPendingActionScRsp other = (HandleRogueCommonPendingActionScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasTimes() || times == other.times) + && (!hasRetcode() || retcode == other.retcode) && (!hasRogueRerollBuff() || rogueRerollBuff.equals(other.rogueRerollBuff)) - && (!hasBonusSelect() || bonusSelect.equals(other.bonusSelect)) && (!hasRogueBuffSelect() || rogueBuffSelect.equals(other.rogueBuffSelect)) - && (!hasMiracleSelect() || miracleSelect.equals(other.miracleSelect)); + && (!hasMiracleSelect() || miracleSelect.equals(other.miracleSelect)) + && (!hasBonusSelect() || bonusSelect.equals(other.bonusSelect)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(times); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 11698); + output.writeRawLittleEndian16((short) 12762); output.writeMessageNoTag(rogueRerollBuff); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 18410); - output.writeMessageNoTag(bonusSelect); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 20178); + output.writeRawLittleEndian16((short) 12954); output.writeMessageNoTag(rogueBuffSelect); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawLittleEndian16((short) 26554); + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawLittleEndian16((short) 13298); output.writeMessageNoTag(miracleSelect); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawLittleEndian16((short) 24770); + output.writeMessageNoTag(bonusSelect); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(times); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(times); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(rogueRerollBuff); } if ((bitField0_ & 0x00000008) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelect); - } - if ((bitField0_ & 0x00000010) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(rogueBuffSelect); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelect); } + if ((bitField0_ & 0x00000020) != 0) { + size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelect); + } return size; } @@ -588,54 +588,54 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { + case 40: { // times times = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 5810) { + if (tag != 72) { break; } } - case 5810: { + case 72: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 6362) { + break; + } + } + case 6362: { // rogueRerollBuff input.readMessage(rogueRerollBuff); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 9194) { + if (tag != 6426) { break; } } - case 9194: { - // bonusSelect - input.readMessage(bonusSelect); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 10066) { - break; - } - } - case 10066: { + case 6426: { // rogueBuffSelect input.readMessage(rogueBuffSelect); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 13242) { + if (tag != 6642) { break; } } - case 13242: { + case 6642: { // miracleSelect input.readMessage(miracleSelect); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 12354) { + break; + } + } + case 12354: { + // bonusSelect + input.readMessage(bonusSelect); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 0) { @@ -660,23 +660,23 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.times, times); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.times, times); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.rogueRerollBuff, rogueRerollBuff); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.bonusSelect, bonusSelect); - } - if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.rogueBuffSelect, rogueBuffSelect); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.miracleSelect, miracleSelect); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeMessage(FieldNames.bonusSelect, bonusSelect); + } output.endObject(); } @@ -688,10 +688,10 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 110364486: { + if (input.isAtField(FieldNames.times)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + times = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -699,10 +699,10 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } break; } - case 110364486: { - if (input.isAtField(FieldNames.times)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - times = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -722,24 +722,12 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } break; } - case 1904635387: - case 1368817948: { - if (input.isAtField(FieldNames.bonusSelect)) { - if (!input.trySkipNullValue()) { - input.readMessage(bonusSelect); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case -183502679: case -1750117501: { if (input.isAtField(FieldNames.rogueBuffSelect)) { if (!input.trySkipNullValue()) { input.readMessage(rogueBuffSelect); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -751,6 +739,18 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { if (input.isAtField(FieldNames.miracleSelect)) { if (!input.trySkipNullValue()) { input.readMessage(miracleSelect); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1904635387: + case 1368817948: { + if (input.isAtField(FieldNames.bonusSelect)) { + if (!input.trySkipNullValue()) { + input.readMessage(bonusSelect); bitField0_ |= 0x00000020; } } else { @@ -813,17 +813,17 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName times = FieldName.forField("times"); - static final FieldName rogueRerollBuff = FieldName.forField("rogueRerollBuff", "rogue_reroll_buff"); + static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName bonusSelect = FieldName.forField("bonusSelect", "bonus_select"); + static final FieldName rogueRerollBuff = FieldName.forField("rogueRerollBuff", "rogue_reroll_buff"); static final FieldName rogueBuffSelect = FieldName.forField("rogueBuffSelect", "rogue_buff_select"); static final FieldName miracleSelect = FieldName.forField("miracleSelect", "miracle_select"); + + static final FieldName bonusSelect = FieldName.forField("bonusSelect", "bonus_select"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java b/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java index e1076e7..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 = 10; + * optional uint32 id = 15; */ private int id; @@ -34,7 +34,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 10; + * 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 = 10; + * optional uint32 id = 15; * @return this */ public HeadIcon clearId() { @@ -52,7 +52,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 10; + * optional uint32 id = 15; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 10; + * 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) 80); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public final class HeadIconOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 120: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java index 3a54907..80269e1 100644 --- a/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java @@ -20,7 +20,7 @@ public final class HeroBasicTypeInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 rank = 11; + * optional uint32 rank = 14; */ private int rank; @@ -30,7 +30,7 @@ public final class HeroBasicTypeInfoOuterClass { private int basicType; /** - * repeated .AvatarSkillTree skill_tree_list = 12; + * repeated .AvatarSkillTree skill_tree_list = 15; */ private final RepeatedMessage skillTreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); @@ -45,7 +45,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional uint32 rank = 11; + * optional uint32 rank = 14; * @return whether the rank field is set */ public boolean hasRank() { @@ -53,7 +53,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional uint32 rank = 11; + * optional uint32 rank = 14; * @return this */ public HeroBasicTypeInfo clearRank() { @@ -63,7 +63,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional uint32 rank = 11; + * optional uint32 rank = 14; * @return the rank */ public int getRank() { @@ -71,7 +71,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional uint32 rank = 11; + * optional uint32 rank = 14; * @param value the rank to set * @return this */ @@ -144,7 +144,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 12; + * repeated .AvatarSkillTree skill_tree_list = 15; * @return whether the skillTreeList field is set */ public boolean hasSkillTreeList() { @@ -152,7 +152,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 12; + * repeated .AvatarSkillTree skill_tree_list = 15; * @return this */ public HeroBasicTypeInfo clearSkillTreeList() { @@ -162,7 +162,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 12; + * repeated .AvatarSkillTree skill_tree_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. @@ -176,7 +176,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 12; + * repeated .AvatarSkillTree skill_tree_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 @@ -190,7 +190,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 12; + * repeated .AvatarSkillTree skill_tree_list = 15; * @param value the skillTreeList to add * @return this */ @@ -202,7 +202,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 12; + * repeated .AvatarSkillTree skill_tree_list = 15; * @param values the skillTreeList to add * @return this */ @@ -285,7 +285,7 @@ public final class HeroBasicTypeInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000002) != 0) { @@ -294,7 +294,7 @@ public final class HeroBasicTypeInfoOuterClass { } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < skillTreeList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 122); output.writeMessageNoTag(skillTreeList.get(i)); } } @@ -322,7 +322,7 @@ public final class HeroBasicTypeInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 112: { // rank rank = input.readUInt32(); bitField0_ |= 0x00000001; @@ -339,11 +339,11 @@ public final class HeroBasicTypeInfoOuterClass { bitField0_ |= 0x00000002; } tag = input.readTag(); - if (tag != 98) { + if (tag != 122) { break; } } - case 98: { + case 122: { // skillTreeList tag = input.readRepeatedMessage(skillTreeList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/InteractChargerCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractChargerCsReqOuterClass.java index ab212f7..2b2d7d5 100644 --- a/src/generated/main/emu/lunarcore/proto/InteractChargerCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/InteractChargerCsReqOuterClass.java @@ -19,11 +19,7 @@ public final class InteractChargerCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     *  obf: GLOGIAFNKHA
-     *
- * - * optional .ChargerInfo charger_info = 8; + * optional .ChargerInfo charger_info = 7; */ private final ChargerInfoOuterClass.ChargerInfo chargerInfo = ChargerInfoOuterClass.ChargerInfo.newInstance(); @@ -38,11 +34,7 @@ public final class InteractChargerCsReqOuterClass { } /** - * 
-     *  obf: GLOGIAFNKHA
-     *
- * - * optional .ChargerInfo charger_info = 8; + * optional .ChargerInfo charger_info = 7; * @return whether the chargerInfo field is set */ public boolean hasChargerInfo() { @@ -50,11 +42,7 @@ public final class InteractChargerCsReqOuterClass { } /** - * 
-     *  obf: GLOGIAFNKHA
-     *
- * - * optional .ChargerInfo charger_info = 8; + * optional .ChargerInfo charger_info = 7; * @return this */ public InteractChargerCsReq clearChargerInfo() { @@ -64,11 +52,7 @@ public final class InteractChargerCsReqOuterClass { } /** - * 
-     *  obf: GLOGIAFNKHA
-     *
- * - * optional .ChargerInfo charger_info = 8; + * optional .ChargerInfo charger_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. @@ -82,11 +66,7 @@ public final class InteractChargerCsReqOuterClass { } /** - * 
-     *  obf: GLOGIAFNKHA
-     *
- * - * optional .ChargerInfo charger_info = 8; + * optional .ChargerInfo charger_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 @@ -100,11 +80,7 @@ public final class InteractChargerCsReqOuterClass { } /** - * 
-     *  obf: GLOGIAFNKHA
-     *
- * - * optional .ChargerInfo charger_info = 8; + * optional .ChargerInfo charger_info = 7; * @param value the chargerInfo to set * @return this */ @@ -174,7 +150,7 @@ public final class InteractChargerCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 58); output.writeMessageNoTag(chargerInfo); } } @@ -195,7 +171,7 @@ public final class InteractChargerCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 58: { // 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 c064da0..f674f54 100644 --- a/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java @@ -19,12 +19,16 @@ public final class InteractChargerScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; */ private int retcode; /** - * optional .ChargerInfo charger_info = 13; + * 
+     *  RotatorEnergyInfo energy_info = 6;
+     *
+ * + * optional .ChargerInfo charger_info = 1; */ private final ChargerInfoOuterClass.ChargerInfo chargerInfo = ChargerInfoOuterClass.ChargerInfo.newInstance(); @@ -39,7 +43,7 @@ public final class InteractChargerScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +51,7 @@ public final class InteractChargerScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @return this */ public InteractChargerScRsp clearRetcode() { @@ -57,7 +61,7 @@ public final class InteractChargerScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -65,7 +69,7 @@ public final class InteractChargerScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -76,7 +80,11 @@ public final class InteractChargerScRspOuterClass { } /** - * optional .ChargerInfo charger_info = 13; + * 
+     *  RotatorEnergyInfo energy_info = 6;
+     *
+ * + * optional .ChargerInfo charger_info = 1; * @return whether the chargerInfo field is set */ public boolean hasChargerInfo() { @@ -84,7 +92,11 @@ public final class InteractChargerScRspOuterClass { } /** - * optional .ChargerInfo charger_info = 13; + * 
+     *  RotatorEnergyInfo energy_info = 6;
+     *
+ * + * optional .ChargerInfo charger_info = 1; * @return this */ public InteractChargerScRsp clearChargerInfo() { @@ -94,7 +106,11 @@ public final class InteractChargerScRspOuterClass { } /** - * optional .ChargerInfo charger_info = 13; + * 
+     *  RotatorEnergyInfo energy_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. @@ -108,7 +124,11 @@ public final class InteractChargerScRspOuterClass { } /** - * optional .ChargerInfo charger_info = 13; + * 
+     *  RotatorEnergyInfo energy_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 @@ -122,7 +142,11 @@ public final class InteractChargerScRspOuterClass { } /** - * optional .ChargerInfo charger_info = 13; + * 
+     *  RotatorEnergyInfo energy_info = 6;
+     *
+ * + * optional .ChargerInfo charger_info = 1; * @param value the chargerInfo to set * @return this */ @@ -198,11 +222,11 @@ public final class InteractChargerScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 10); output.writeMessageNoTag(chargerInfo); } } @@ -226,16 +250,16 @@ public final class InteractChargerScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 10) { break; } } - case 106: { + case 10: { // chargerInfo input.readMessage(chargerInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java index b458dca..d6d1862 100644 --- a/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java @@ -19,15 +19,15 @@ public final class InteractPropCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 prop_entity_id = 5; - */ - private int propEntityId; - - /** - * optional uint32 interact_id = 15; + * optional uint32 interact_id = 7; */ private int interactId; + /** + * optional uint32 prop_entity_id = 15; + */ + private int propEntityId; + private InteractPropCsReq() { } @@ -39,62 +39,25 @@ public final class InteractPropCsReqOuterClass { } /** - * optional uint32 prop_entity_id = 5; - * @return whether the propEntityId field is set + * optional uint32 interact_id = 7; + * @return whether the interactId field is set */ - public boolean hasPropEntityId() { + public boolean hasInteractId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 prop_entity_id = 5; - * @return this - */ - public InteractPropCsReq clearPropEntityId() { - bitField0_ &= ~0x00000001; - propEntityId = 0; - return this; - } - - /** - * optional uint32 prop_entity_id = 5; - * @return the propEntityId - */ - public int getPropEntityId() { - return propEntityId; - } - - /** - * optional uint32 prop_entity_id = 5; - * @param value the propEntityId to set - * @return this - */ - public InteractPropCsReq setPropEntityId(final int value) { - bitField0_ |= 0x00000001; - propEntityId = value; - return this; - } - - /** - * optional uint32 interact_id = 15; - * @return whether the interactId field is set - */ - public boolean hasInteractId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 interact_id = 15; + * optional uint32 interact_id = 7; * @return this */ public InteractPropCsReq clearInteractId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; interactId = 0; return this; } /** - * optional uint32 interact_id = 15; + * optional uint32 interact_id = 7; * @return the interactId */ public int getInteractId() { @@ -102,23 +65,60 @@ public final class InteractPropCsReqOuterClass { } /** - * optional uint32 interact_id = 15; + * optional uint32 interact_id = 7; * @param value the interactId to set * @return this */ public InteractPropCsReq setInteractId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; interactId = value; return this; } + /** + * optional uint32 prop_entity_id = 15; + * @return whether the propEntityId field is set + */ + public boolean hasPropEntityId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 prop_entity_id = 15; + * @return this + */ + public InteractPropCsReq clearPropEntityId() { + bitField0_ &= ~0x00000002; + propEntityId = 0; + return this; + } + + /** + * optional uint32 prop_entity_id = 15; + * @return the propEntityId + */ + public int getPropEntityId() { + return propEntityId; + } + + /** + * optional uint32 prop_entity_id = 15; + * @param value the propEntityId to set + * @return this + */ + public InteractPropCsReq setPropEntityId(final int value) { + bitField0_ |= 0x00000002; + propEntityId = value; + return this; + } + @Override public InteractPropCsReq copyFrom(final InteractPropCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - propEntityId = other.propEntityId; interactId = other.interactId; + propEntityId = other.propEntityId; } return this; } @@ -129,12 +129,12 @@ public final class InteractPropCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasPropEntityId()) { - setPropEntityId(other.propEntityId); - } if (other.hasInteractId()) { setInteractId(other.interactId); } + if (other.hasPropEntityId()) { + setPropEntityId(other.propEntityId); + } return this; } @@ -145,8 +145,8 @@ public final class InteractPropCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - propEntityId = 0; interactId = 0; + propEntityId = 0; return this; } @@ -170,19 +170,19 @@ public final class InteractPropCsReqOuterClass { } InteractPropCsReq other = (InteractPropCsReq) o; return bitField0_ == other.bitField0_ - && (!hasPropEntityId() || propEntityId == other.propEntityId) - && (!hasInteractId() || interactId == other.interactId); + && (!hasInteractId() || interactId == other.interactId) + && (!hasPropEntityId() || propEntityId == other.propEntityId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(propEntityId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(interactId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(interactId); + output.writeUInt32NoTag(propEntityId); } } @@ -190,10 +190,10 @@ public final class InteractPropCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(interactId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(interactId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } return size; } @@ -205,9 +205,9 @@ public final class InteractPropCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // propEntityId - propEntityId = input.readUInt32(); + case 56: { + // interactId + interactId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 120) { @@ -215,8 +215,8 @@ public final class InteractPropCsReqOuterClass { } } case 120: { - // interactId - interactId = input.readUInt32(); + // propEntityId + propEntityId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class InteractPropCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.interactId, interactId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.interactId, interactId); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class InteractPropCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -68717343: - case -57484005: { - if (input.isAtField(FieldNames.propEntityId)) { + case -1603081743: + case 1844094916: { + if (input.isAtField(FieldNames.interactId)) { if (!input.trySkipNullValue()) { - propEntityId = input.readUInt32(); + interactId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class InteractPropCsReqOuterClass { } break; } - case -1603081743: - case 1844094916: { - if (input.isAtField(FieldNames.interactId)) { + case -68717343: + case -57484005: { + if (input.isAtField(FieldNames.propEntityId)) { if (!input.trySkipNullValue()) { - interactId = input.readUInt32(); + propEntityId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class InteractPropCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); - static final FieldName interactId = FieldName.forField("interactId", "interact_id"); + + static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java index f9ecac2..0a8cc94 100644 --- a/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java @@ -19,20 +19,20 @@ public final class InteractPropScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 prop_state = 2; + * optional uint32 prop_entity_id = 10; + */ + private int propEntityId; + + /** + * optional uint32 prop_state = 14; */ private int propState; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 15; */ private int retcode; - /** - * optional uint32 prop_entity_id = 9; - */ - private int propEntityId; - private InteractPropScRsp() { } @@ -44,99 +44,25 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 prop_state = 2; - * @return whether the propState field is set + * optional uint32 prop_entity_id = 10; + * @return whether the propEntityId field is set */ - public boolean hasPropState() { + public boolean hasPropEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 prop_state = 2; - * @return this - */ - public InteractPropScRsp clearPropState() { - bitField0_ &= ~0x00000001; - propState = 0; - return this; - } - - /** - * optional uint32 prop_state = 2; - * @return the propState - */ - public int getPropState() { - return propState; - } - - /** - * optional uint32 prop_state = 2; - * @param value the propState to set - * @return this - */ - public InteractPropScRsp setPropState(final int value) { - bitField0_ |= 0x00000001; - propState = 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 InteractPropScRsp 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 InteractPropScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; - retcode = value; - return this; - } - - /** - * optional uint32 prop_entity_id = 9; - * @return whether the propEntityId field is set - */ - public boolean hasPropEntityId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 prop_entity_id = 9; + * optional uint32 prop_entity_id = 10; * @return this */ public InteractPropScRsp clearPropEntityId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; propEntityId = 0; return this; } /** - * optional uint32 prop_entity_id = 9; + * optional uint32 prop_entity_id = 10; * @return the propEntityId */ public int getPropEntityId() { @@ -144,24 +70,98 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 prop_entity_id = 9; + * optional uint32 prop_entity_id = 10; * @param value the propEntityId to set * @return this */ public InteractPropScRsp setPropEntityId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; propEntityId = value; return this; } + /** + * optional uint32 prop_state = 14; + * @return whether the propState field is set + */ + public boolean hasPropState() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 prop_state = 14; + * @return this + */ + public InteractPropScRsp clearPropState() { + bitField0_ &= ~0x00000002; + propState = 0; + return this; + } + + /** + * optional uint32 prop_state = 14; + * @return the propState + */ + public int getPropState() { + return propState; + } + + /** + * optional uint32 prop_state = 14; + * @param value the propState to set + * @return this + */ + public InteractPropScRsp setPropState(final int value) { + bitField0_ |= 0x00000002; + propState = 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 InteractPropScRsp 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 InteractPropScRsp setRetcode(final int value) { + bitField0_ |= 0x00000004; + retcode = value; + return this; + } + @Override public InteractPropScRsp copyFrom(final InteractPropScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + propEntityId = other.propEntityId; propState = other.propState; retcode = other.retcode; - propEntityId = other.propEntityId; } return this; } @@ -172,15 +172,15 @@ public final class InteractPropScRspOuterClass { return this; } cachedSize = -1; + if (other.hasPropEntityId()) { + setPropEntityId(other.propEntityId); + } if (other.hasPropState()) { setPropState(other.propState); } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasPropEntityId()) { - setPropEntityId(other.propEntityId); - } return this; } @@ -191,9 +191,9 @@ public final class InteractPropScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + propEntityId = 0; propState = 0; retcode = 0; - propEntityId = 0; return this; } @@ -217,24 +217,24 @@ public final class InteractPropScRspOuterClass { } InteractPropScRsp other = (InteractPropScRsp) o; return bitField0_ == other.bitField0_ + && (!hasPropEntityId() || propEntityId == other.propEntityId) && (!hasPropState() || propState == other.propState) - && (!hasRetcode() || retcode == other.retcode) - && (!hasPropEntityId() || propEntityId == other.propEntityId); + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(propState); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(propState); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(propEntityId); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(retcode); } } @@ -242,13 +242,13 @@ public final class InteractPropScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -260,27 +260,27 @@ public final class InteractPropScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // propState - propState = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 80: { // propEntityId propEntityId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // propState + propState = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public final class InteractPropScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.propState, propState); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.propState, propState); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -323,12 +323,24 @@ public final class InteractPropScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -68717343: + case -57484005: { + if (input.isAtField(FieldNames.propEntityId)) { + if (!input.trySkipNullValue()) { + propEntityId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case -739191058: case -1096911691: { if (input.isAtField(FieldNames.propState)) { if (!input.trySkipNullValue()) { propState = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -339,18 +351,6 @@ public final class InteractPropScRspOuterClass { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -68717343: - case -57484005: { - if (input.isAtField(FieldNames.propEntityId)) { - if (!input.trySkipNullValue()) { - propEntityId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -411,11 +411,11 @@ public final class InteractPropScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); + static final FieldName propState = FieldName.forField("propState", "prop_state"); static final FieldName retcode = FieldName.forField("retcode"); - - static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java index 7baa989..7fd5846 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 = 15; + * repeated .ItemCost item_list = 14; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory()); @@ -35,7 +35,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 15; + * repeated .ItemCost item_list = 14; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -43,7 +43,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 15; + * repeated .ItemCost item_list = 14; * @return this */ public ItemCostList clearItemList() { @@ -53,7 +53,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 15; + * repeated .ItemCost item_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 15; + * repeated .ItemCost item_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 15; + * repeated .ItemCost item_list = 14; * @param value the itemList to add * @return this */ @@ -92,7 +92,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 15; + * repeated .ItemCost item_list = 14; * @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) 122); + output.writeRawByte((byte) 114); output.writeMessageNoTag(itemList.get(i)); } } @@ -185,7 +185,7 @@ public final class ItemCostListOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 122: { + case 114: { // 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 7e678fe..4d80e8a 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 relic_unique_id = 3; - */ - private int relicUniqueId; - - /** - * optional uint32 equipment_unique_id = 13; + * optional uint32 equipment_unique_id = 8; */ private int equipmentUniqueId; /** - * optional .PileItem pile_item = 12; + * optional uint32 relic_unique_id = 9; + */ + private int relicUniqueId; + + /** + * optional .PileItem pile_item = 2; */ private final PileItemOuterClass.PileItem pileItem = PileItemOuterClass.PileItem.newInstance(); @@ -44,62 +44,25 @@ public final class ItemCostOuterClass { } /** - * optional uint32 relic_unique_id = 3; - * @return whether the relicUniqueId field is set + * optional uint32 equipment_unique_id = 8; + * @return whether the equipmentUniqueId field is set */ - public boolean hasRelicUniqueId() { + public boolean hasEquipmentUniqueId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 relic_unique_id = 3; - * @return this - */ - public ItemCost clearRelicUniqueId() { - bitField0_ &= ~0x00000001; - relicUniqueId = 0; - return this; - } - - /** - * optional uint32 relic_unique_id = 3; - * @return the relicUniqueId - */ - public int getRelicUniqueId() { - return relicUniqueId; - } - - /** - * optional uint32 relic_unique_id = 3; - * @param value the relicUniqueId to set - * @return this - */ - public ItemCost setRelicUniqueId(final int value) { - bitField0_ |= 0x00000001; - relicUniqueId = value; - return this; - } - - /** - * optional uint32 equipment_unique_id = 13; - * @return whether the equipmentUniqueId field is set - */ - public boolean hasEquipmentUniqueId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 equipment_unique_id = 13; + * optional uint32 equipment_unique_id = 8; * @return this */ public ItemCost clearEquipmentUniqueId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; equipmentUniqueId = 0; return this; } /** - * optional uint32 equipment_unique_id = 13; + * optional uint32 equipment_unique_id = 8; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -107,18 +70,55 @@ public final class ItemCostOuterClass { } /** - * optional uint32 equipment_unique_id = 13; + * optional uint32 equipment_unique_id = 8; * @param value the equipmentUniqueId to set * @return this */ public ItemCost setEquipmentUniqueId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; equipmentUniqueId = value; return this; } /** - * optional .PileItem pile_item = 12; + * optional uint32 relic_unique_id = 9; + * @return whether the relicUniqueId field is set + */ + public boolean hasRelicUniqueId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 relic_unique_id = 9; + * @return this + */ + public ItemCost clearRelicUniqueId() { + bitField0_ &= ~0x00000002; + relicUniqueId = 0; + return this; + } + + /** + * optional uint32 relic_unique_id = 9; + * @return the relicUniqueId + */ + public int getRelicUniqueId() { + return relicUniqueId; + } + + /** + * optional uint32 relic_unique_id = 9; + * @param value the relicUniqueId to set + * @return this + */ + public ItemCost setRelicUniqueId(final int value) { + bitField0_ |= 0x00000002; + relicUniqueId = value; + return this; + } + + /** + * optional .PileItem pile_item = 2; * @return whether the pileItem field is set */ public boolean hasPileItem() { @@ -126,7 +126,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 12; + * optional .PileItem pile_item = 2; * @return this */ public ItemCost clearPileItem() { @@ -136,7 +136,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 12; + * optional .PileItem pile_item = 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. @@ -150,7 +150,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 12; + * optional .PileItem pile_item = 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 @@ -164,7 +164,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 12; + * optional .PileItem pile_item = 2; * @param value the pileItem to set * @return this */ @@ -179,8 +179,8 @@ public final class ItemCostOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - relicUniqueId = other.relicUniqueId; equipmentUniqueId = other.equipmentUniqueId; + relicUniqueId = other.relicUniqueId; pileItem.copyFrom(other.pileItem); } return this; @@ -192,12 +192,12 @@ public final class ItemCostOuterClass { return this; } cachedSize = -1; - if (other.hasRelicUniqueId()) { - setRelicUniqueId(other.relicUniqueId); - } if (other.hasEquipmentUniqueId()) { setEquipmentUniqueId(other.equipmentUniqueId); } + if (other.hasRelicUniqueId()) { + setRelicUniqueId(other.relicUniqueId); + } if (other.hasPileItem()) { getMutablePileItem().mergeFrom(other.pileItem); } @@ -211,8 +211,8 @@ public final class ItemCostOuterClass { } cachedSize = -1; bitField0_ = 0; - relicUniqueId = 0; equipmentUniqueId = 0; + relicUniqueId = 0; pileItem.clear(); return this; } @@ -238,23 +238,23 @@ public final class ItemCostOuterClass { } ItemCost other = (ItemCost) o; return bitField0_ == other.bitField0_ - && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId) && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) + && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId) && (!hasPileItem() || pileItem.equals(other.pileItem)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(relicUniqueId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(equipmentUniqueId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(relicUniqueId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 18); output.writeMessageNoTag(pileItem); } } @@ -263,10 +263,10 @@ public final class ItemCostOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(pileItem); @@ -281,25 +281,25 @@ public final class ItemCostOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // relicUniqueId - relicUniqueId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 64: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 72) { break; } } - case 98: { + case 72: { + // relicUniqueId + relicUniqueId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { // pileItem input.readMessage(pileItem); bitField0_ |= 0x00000004; @@ -326,10 +326,10 @@ public final class ItemCostOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId); + output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); + output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.pileItem, pileItem); @@ -344,11 +344,11 @@ public final class ItemCostOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1966200481: - case 49648253: { - if (input.isAtField(FieldNames.relicUniqueId)) { + case -1867136902: + case 760467160: { + if (input.isAtField(FieldNames.equipmentUniqueId)) { if (!input.trySkipNullValue()) { - relicUniqueId = input.readUInt32(); + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -356,11 +356,11 @@ public final class ItemCostOuterClass { } break; } - case -1867136902: - case 760467160: { - if (input.isAtField(FieldNames.equipmentUniqueId)) { + case -1966200481: + case 49648253: { + if (input.isAtField(FieldNames.relicUniqueId)) { if (!input.trySkipNullValue()) { - equipmentUniqueId = input.readUInt32(); + relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -432,10 +432,10 @@ public final class ItemCostOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName relicUniqueId = FieldName.forField("relicUniqueId", "relic_unique_id"); - static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); + static final FieldName relicUniqueId = FieldName.forField("relicUniqueId", "relic_unique_id"); + static final FieldName pileItem = FieldName.forField("pileItem", "pile_item"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java index 09de411..84e6d19 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 = 14; + * repeated .Item item_list = 3; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemOuterClass.Item.getFactory()); @@ -35,7 +35,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 14; + * repeated .Item item_list = 3; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -43,7 +43,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 14; + * repeated .Item item_list = 3; * @return this */ public ItemList clearItemList() { @@ -53,7 +53,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 14; + * repeated .Item 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. @@ -67,7 +67,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 14; + * repeated .Item 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 @@ -81,7 +81,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 14; + * repeated .Item item_list = 3; * @param value the itemList to add * @return this */ @@ -92,7 +92,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 14; + * repeated .Item item_list = 3; * @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) 114); + output.writeRawByte((byte) 26); output.writeMessageNoTag(itemList.get(i)); } } @@ -185,7 +185,7 @@ public final class ItemListOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 26: { // 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 c55300c..11559e1 100644 --- a/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java @@ -19,39 +19,39 @@ public final class ItemOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 main_affix_id = 4; + * optional uint32 promotion = 1; */ - private int mainAffixId; + private int promotion; /** - * optional uint32 unique_id = 5; - */ - private int uniqueId; - - /** - * optional uint32 item_id = 6; - */ - private int itemId; - - /** - * optional uint32 num = 11; - */ - private int num; - - /** - * optional uint32 level = 13; - */ - private int level; - - /** - * optional uint32 rank = 14; + * optional uint32 rank = 2; */ private int rank; /** - * optional uint32 promotion = 15; + * optional uint32 level = 7; */ - private int promotion; + private int level; + + /** + * optional uint32 num = 9; + */ + private int num; + + /** + * optional uint32 main_affix_id = 10; + */ + private int mainAffixId; + + /** + * optional uint32 item_id = 12; + */ + private int itemId; + + /** + * optional uint32 unique_id = 14; + */ + private int uniqueId; private Item() { } @@ -64,118 +64,118 @@ public final class ItemOuterClass { } /** - * optional uint32 main_affix_id = 4; - * @return whether the mainAffixId field is set + * optional uint32 promotion = 1; + * @return whether the promotion field is set */ - public boolean hasMainAffixId() { + public boolean hasPromotion() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 main_affix_id = 4; + * optional uint32 promotion = 1; * @return this */ - public Item clearMainAffixId() { + public Item clearPromotion() { bitField0_ &= ~0x00000001; - mainAffixId = 0; + promotion = 0; return this; } /** - * optional uint32 main_affix_id = 4; - * @return the mainAffixId + * optional uint32 promotion = 1; + * @return the promotion */ - public int getMainAffixId() { - return mainAffixId; + public int getPromotion() { + return promotion; } /** - * optional uint32 main_affix_id = 4; - * @param value the mainAffixId to set + * optional uint32 promotion = 1; + * @param value the promotion to set * @return this */ - public Item setMainAffixId(final int value) { + public Item setPromotion(final int value) { bitField0_ |= 0x00000001; - mainAffixId = value; + promotion = value; return this; } /** - * optional uint32 unique_id = 5; - * @return whether the uniqueId field is set + * optional uint32 rank = 2; + * @return whether the rank field is set */ - public boolean hasUniqueId() { + public boolean hasRank() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 unique_id = 5; + * optional uint32 rank = 2; * @return this */ - public Item clearUniqueId() { + public Item clearRank() { bitField0_ &= ~0x00000002; - uniqueId = 0; + rank = 0; return this; } /** - * optional uint32 unique_id = 5; - * @return the uniqueId + * optional uint32 rank = 2; + * @return the rank */ - public int getUniqueId() { - return uniqueId; + public int getRank() { + return rank; } /** - * optional uint32 unique_id = 5; - * @param value the uniqueId to set + * optional uint32 rank = 2; + * @param value the rank to set * @return this */ - public Item setUniqueId(final int value) { + public Item setRank(final int value) { bitField0_ |= 0x00000002; - uniqueId = value; + rank = value; return this; } /** - * optional uint32 item_id = 6; - * @return whether the itemId field is set + * optional uint32 level = 7; + * @return whether the level field is set */ - public boolean hasItemId() { + public boolean hasLevel() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 item_id = 6; + * optional uint32 level = 7; * @return this */ - public Item clearItemId() { + public Item clearLevel() { bitField0_ &= ~0x00000004; - itemId = 0; + level = 0; return this; } /** - * optional uint32 item_id = 6; - * @return the itemId + * optional uint32 level = 7; + * @return the level */ - public int getItemId() { - return itemId; + public int getLevel() { + return level; } /** - * optional uint32 item_id = 6; - * @param value the itemId to set + * optional uint32 level = 7; + * @param value the level to set * @return this */ - public Item setItemId(final int value) { + public Item setLevel(final int value) { bitField0_ |= 0x00000004; - itemId = value; + level = value; return this; } /** - * optional uint32 num = 11; + * optional uint32 num = 9; * @return whether the num field is set */ public boolean hasNum() { @@ -183,7 +183,7 @@ public final class ItemOuterClass { } /** - * optional uint32 num = 11; + * optional uint32 num = 9; * @return this */ public Item clearNum() { @@ -193,7 +193,7 @@ public final class ItemOuterClass { } /** - * optional uint32 num = 11; + * optional uint32 num = 9; * @return the num */ public int getNum() { @@ -201,7 +201,7 @@ public final class ItemOuterClass { } /** - * optional uint32 num = 11; + * optional uint32 num = 9; * @param value the num to set * @return this */ @@ -212,113 +212,113 @@ public final class ItemOuterClass { } /** - * optional uint32 level = 13; - * @return whether the level field is set + * optional uint32 main_affix_id = 10; + * @return whether the mainAffixId field is set */ - public boolean hasLevel() { + public boolean hasMainAffixId() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 level = 13; + * optional uint32 main_affix_id = 10; * @return this */ - public Item clearLevel() { + public Item clearMainAffixId() { bitField0_ &= ~0x00000010; - level = 0; + mainAffixId = 0; return this; } /** - * optional uint32 level = 13; - * @return the level + * optional uint32 main_affix_id = 10; + * @return the mainAffixId */ - public int getLevel() { - return level; + public int getMainAffixId() { + return mainAffixId; } /** - * optional uint32 level = 13; - * @param value the level to set + * optional uint32 main_affix_id = 10; + * @param value the mainAffixId to set * @return this */ - public Item setLevel(final int value) { + public Item setMainAffixId(final int value) { bitField0_ |= 0x00000010; - level = value; + mainAffixId = value; return this; } /** - * optional uint32 rank = 14; - * @return whether the rank field is set + * optional uint32 item_id = 12; + * @return whether the itemId field is set */ - public boolean hasRank() { + public boolean hasItemId() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 rank = 14; + * optional uint32 item_id = 12; * @return this */ - public Item clearRank() { + public Item clearItemId() { bitField0_ &= ~0x00000020; - rank = 0; + itemId = 0; return this; } /** - * optional uint32 rank = 14; - * @return the rank + * optional uint32 item_id = 12; + * @return the itemId */ - public int getRank() { - return rank; + public int getItemId() { + return itemId; } /** - * optional uint32 rank = 14; - * @param value the rank to set + * optional uint32 item_id = 12; + * @param value the itemId to set * @return this */ - public Item setRank(final int value) { + public Item setItemId(final int value) { bitField0_ |= 0x00000020; - rank = value; + itemId = value; return this; } /** - * optional uint32 promotion = 15; - * @return whether the promotion field is set + * optional uint32 unique_id = 14; + * @return whether the uniqueId field is set */ - public boolean hasPromotion() { + public boolean hasUniqueId() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 promotion = 15; + * optional uint32 unique_id = 14; * @return this */ - public Item clearPromotion() { + public Item clearUniqueId() { bitField0_ &= ~0x00000040; - promotion = 0; + uniqueId = 0; return this; } /** - * optional uint32 promotion = 15; - * @return the promotion + * optional uint32 unique_id = 14; + * @return the uniqueId */ - public int getPromotion() { - return promotion; + public int getUniqueId() { + return uniqueId; } /** - * optional uint32 promotion = 15; - * @param value the promotion to set + * optional uint32 unique_id = 14; + * @param value the uniqueId to set * @return this */ - public Item setPromotion(final int value) { + public Item setUniqueId(final int value) { bitField0_ |= 0x00000040; - promotion = value; + uniqueId = value; return this; } @@ -327,13 +327,13 @@ public final class ItemOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - mainAffixId = other.mainAffixId; - uniqueId = other.uniqueId; - itemId = other.itemId; - num = other.num; - level = other.level; - rank = other.rank; promotion = other.promotion; + rank = other.rank; + level = other.level; + num = other.num; + mainAffixId = other.mainAffixId; + itemId = other.itemId; + uniqueId = other.uniqueId; } return this; } @@ -344,26 +344,26 @@ public final class ItemOuterClass { return this; } cachedSize = -1; - if (other.hasMainAffixId()) { - setMainAffixId(other.mainAffixId); - } - if (other.hasUniqueId()) { - setUniqueId(other.uniqueId); - } - if (other.hasItemId()) { - setItemId(other.itemId); - } - if (other.hasNum()) { - setNum(other.num); - } - if (other.hasLevel()) { - setLevel(other.level); + if (other.hasPromotion()) { + setPromotion(other.promotion); } if (other.hasRank()) { setRank(other.rank); } - if (other.hasPromotion()) { - setPromotion(other.promotion); + if (other.hasLevel()) { + setLevel(other.level); + } + if (other.hasNum()) { + setNum(other.num); + } + if (other.hasMainAffixId()) { + setMainAffixId(other.mainAffixId); + } + 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; - mainAffixId = 0; - uniqueId = 0; - itemId = 0; - num = 0; - level = 0; - rank = 0; promotion = 0; + rank = 0; + level = 0; + num = 0; + mainAffixId = 0; + itemId = 0; + uniqueId = 0; return this; } @@ -405,44 +405,44 @@ public final class ItemOuterClass { } Item other = (Item) o; return bitField0_ == other.bitField0_ - && (!hasMainAffixId() || mainAffixId == other.mainAffixId) - && (!hasUniqueId() || uniqueId == other.uniqueId) - && (!hasItemId() || itemId == other.itemId) - && (!hasNum() || num == other.num) - && (!hasLevel() || level == other.level) + && (!hasPromotion() || promotion == other.promotion) && (!hasRank() || rank == other.rank) - && (!hasPromotion() || promotion == other.promotion); + && (!hasLevel() || level == other.level) + && (!hasNum() || num == other.num) + && (!hasMainAffixId() || mainAffixId == other.mainAffixId) + && (!hasItemId() || itemId == other.itemId) + && (!hasUniqueId() || uniqueId == other.uniqueId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(mainAffixId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(uniqueId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(itemId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(num); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(mainAffixId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(rank); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(itemId); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(promotion); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(uniqueId); } } @@ -450,25 +450,25 @@ public final class ItemOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(num); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); } return size; } @@ -480,63 +480,63 @@ public final class ItemOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // mainAffixId - mainAffixId = input.readUInt32(); + case 8: { + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 16) { break; } } - case 40: { - // uniqueId - uniqueId = input.readUInt32(); + case 16: { + // rank + rank = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 56) { break; } } - case 48: { - // itemId - itemId = input.readUInt32(); + case 56: { + // level + level = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 88) { + if (tag != 72) { break; } } - case 88: { + case 72: { // num num = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 104) { + if (tag != 80) { break; } } - case 104: { - // level - level = input.readUInt32(); + case 80: { + // mainAffixId + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // itemId + itemId = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); if (tag != 112) { break; } } case 112: { - // rank - rank = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // promotion - promotion = input.readUInt32(); + // 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.mainAffixId, mainAffixId); + output.writeUInt32(FieldNames.promotion, promotion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.uniqueId, uniqueId); + output.writeUInt32(FieldNames.rank, rank); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.num, num); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.mainAffixId, mainAffixId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.rank, rank); + output.writeUInt32(FieldNames.itemId, itemId); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); + output.writeUInt32(FieldNames.uniqueId, uniqueId); } output.endObject(); } @@ -591,11 +591,10 @@ public final class ItemOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1973876974: - case -1426712144: { - if (input.isAtField(FieldNames.mainAffixId)) { + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { if (!input.trySkipNullValue()) { - mainAffixId = input.readUInt32(); + promotion = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -603,11 +602,10 @@ public final class ItemOuterClass { } break; } - case -294460212: - case -538310583: { - if (input.isAtField(FieldNames.uniqueId)) { + case 3492908: { + if (input.isAtField(FieldNames.rank)) { if (!input.trySkipNullValue()) { - uniqueId = input.readUInt32(); + rank = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -615,11 +613,10 @@ public final class ItemOuterClass { } break; } - case -1178662002: - case 2116204999: { - if (input.isAtField(FieldNames.itemId)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - itemId = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -638,10 +635,11 @@ public final class ItemOuterClass { } 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_ |= 0x00000010; } } else { @@ -649,10 +647,11 @@ public final class ItemOuterClass { } break; } - case 3492908: { - if (input.isAtField(FieldNames.rank)) { + case -1178662002: + case 2116204999: { + if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { - rank = input.readUInt32(); + itemId = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -660,10 +659,11 @@ public final class ItemOuterClass { } break; } - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { + case -294460212: + case -538310583: { + if (input.isAtField(FieldNames.uniqueId)) { if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); + uniqueId = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -723,19 +723,19 @@ public final class ItemOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); - - static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); - - static final FieldName itemId = FieldName.forField("itemId", "item_id"); - - static final FieldName num = FieldName.forField("num"); - - static final FieldName level = FieldName.forField("level"); + static final FieldName promotion = FieldName.forField("promotion"); static final FieldName rank = FieldName.forField("rank"); - static final FieldName promotion = FieldName.forField("promotion"); + static final FieldName level = FieldName.forField("level"); + + static final FieldName num = FieldName.forField("num"); + + static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); + + 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 0957b1f..3e12701 100644 --- a/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java @@ -19,37 +19,37 @@ public final class JoinLineupCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 index = 1; - */ - private int index; - - /** - * optional uint32 slot = 7; + * optional uint32 slot = 3; */ private int slot; /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 8; */ private int planeId; /** - * optional uint32 base_avatar_id = 11; + * optional uint32 index = 11; + */ + private int index; + + /** + * optional uint32 base_avatar_id = 12; */ private int baseAvatarId; /** - * optional .ExtraLineupType extra_lineup_type = 3; + * optional .ExtraLineupType extra_lineup_type = 9; */ private int extraLineupType; /** - * optional .AvatarType avatar_type = 14; + * optional .AvatarType avatar_type = 13; */ private int avatarType; /** - * optional bool is_virtual = 15; + * optional bool is_virtual = 4; */ private boolean isVirtual; @@ -64,62 +64,25 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 index = 1; - * @return whether the index field is set + * optional uint32 slot = 3; + * @return whether the slot field is set */ - public boolean hasIndex() { + public boolean hasSlot() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 index = 1; - * @return this - */ - public JoinLineupCsReq clearIndex() { - bitField0_ &= ~0x00000001; - index = 0; - return this; - } - - /** - * optional uint32 index = 1; - * @return the index - */ - public int getIndex() { - return index; - } - - /** - * optional uint32 index = 1; - * @param value the index to set - * @return this - */ - public JoinLineupCsReq setIndex(final int value) { - bitField0_ |= 0x00000001; - index = value; - return this; - } - - /** - * optional uint32 slot = 7; - * @return whether the slot field is set - */ - public boolean hasSlot() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 slot = 7; + * optional uint32 slot = 3; * @return this */ public JoinLineupCsReq clearSlot() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; slot = 0; return this; } /** - * optional uint32 slot = 7; + * optional uint32 slot = 3; * @return the slot */ public int getSlot() { @@ -127,36 +90,36 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 slot = 7; + * optional uint32 slot = 3; * @param value the slot to set * @return this */ public JoinLineupCsReq setSlot(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; slot = value; return this; } /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 8; * @return whether the planeId field is set */ public boolean hasPlaneId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 8; * @return this */ public JoinLineupCsReq clearPlaneId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; planeId = 0; return this; } /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 8; * @return the planeId */ public int getPlaneId() { @@ -164,18 +127,55 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 8; * @param value the planeId to set * @return this */ public JoinLineupCsReq setPlaneId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; planeId = value; return this; } /** - * optional uint32 base_avatar_id = 11; + * optional uint32 index = 11; + * @return whether the index field is set + */ + public boolean hasIndex() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 index = 11; + * @return this + */ + public JoinLineupCsReq clearIndex() { + bitField0_ &= ~0x00000004; + index = 0; + return this; + } + + /** + * optional uint32 index = 11; + * @return the index + */ + public int getIndex() { + return index; + } + + /** + * optional uint32 index = 11; + * @param value the index to set + * @return this + */ + public JoinLineupCsReq setIndex(final int value) { + bitField0_ |= 0x00000004; + index = value; + return this; + } + + /** + * optional uint32 base_avatar_id = 12; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -183,7 +183,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 11; + * optional uint32 base_avatar_id = 12; * @return this */ public JoinLineupCsReq clearBaseAvatarId() { @@ -193,7 +193,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 11; + * optional uint32 base_avatar_id = 12; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -201,7 +201,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 11; + * optional uint32 base_avatar_id = 12; * @param value the baseAvatarId to set * @return this */ @@ -212,7 +212,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 3; + * optional .ExtraLineupType extra_lineup_type = 9; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -220,7 +220,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 3; + * optional .ExtraLineupType extra_lineup_type = 9; * @return this */ public JoinLineupCsReq clearExtraLineupType() { @@ -230,7 +230,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 3; + * optional .ExtraLineupType extra_lineup_type = 9; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -263,7 +263,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 3; + * optional .ExtraLineupType extra_lineup_type = 9; * @param value the extraLineupType to set * @return this */ @@ -275,7 +275,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 14; + * optional .AvatarType avatar_type = 13; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -283,7 +283,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 14; + * optional .AvatarType avatar_type = 13; * @return this */ public JoinLineupCsReq clearAvatarType() { @@ -293,7 +293,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 14; + * optional .AvatarType avatar_type = 13; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -326,7 +326,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 14; + * optional .AvatarType avatar_type = 13; * @param value the avatarType to set * @return this */ @@ -337,7 +337,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional bool is_virtual = 15; + * optional bool is_virtual = 4; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -345,7 +345,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional bool is_virtual = 15; + * optional bool is_virtual = 4; * @return this */ public JoinLineupCsReq clearIsVirtual() { @@ -355,7 +355,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional bool is_virtual = 15; + * optional bool is_virtual = 4; * @return the isVirtual */ public boolean getIsVirtual() { @@ -363,7 +363,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional bool is_virtual = 15; + * optional bool is_virtual = 4; * @param value the isVirtual to set * @return this */ @@ -378,9 +378,9 @@ public final class JoinLineupCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - index = other.index; slot = other.slot; planeId = other.planeId; + index = other.index; baseAvatarId = other.baseAvatarId; extraLineupType = other.extraLineupType; avatarType = other.avatarType; @@ -395,15 +395,15 @@ public final class JoinLineupCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasIndex()) { - setIndex(other.index); - } if (other.hasSlot()) { setSlot(other.slot); } if (other.hasPlaneId()) { setPlaneId(other.planeId); } + if (other.hasIndex()) { + setIndex(other.index); + } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } @@ -426,9 +426,9 @@ public final class JoinLineupCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - index = 0; slot = 0; planeId = 0; + index = 0; baseAvatarId = 0; extraLineupType = 0; avatarType = 0; @@ -456,9 +456,9 @@ public final class JoinLineupCsReqOuterClass { } JoinLineupCsReq other = (JoinLineupCsReq) o; return bitField0_ == other.bitField0_ - && (!hasIndex() || index == other.index) && (!hasSlot() || slot == other.slot) && (!hasPlaneId() || planeId == other.planeId) + && (!hasIndex() || index == other.index) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasAvatarType() || avatarType == other.avatarType) @@ -468,31 +468,31 @@ public final class JoinLineupCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(index); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(slot); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); output.writeUInt32NoTag(planeId); } - if ((bitField0_ & 0x00000008) != 0) { + 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) 24); + output.writeRawByte((byte) 72); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeEnumNoTag(avatarType); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeBoolNoTag(isVirtual); } } @@ -501,14 +501,14 @@ public final class JoinLineupCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } @@ -531,43 +531,43 @@ public final class JoinLineupCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // index - index = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 24: { // slot slot = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 64) { break; } } - case 80: { + case 64: { // planeId planeId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 88) { break; } } case 88: { + // index + index = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 24) { + if (tag != 72) { break; } } - case 24: { + case 72: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { @@ -575,11 +575,11 @@ public final class JoinLineupCsReqOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { + case 104: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -587,11 +587,11 @@ public final class JoinLineupCsReqOuterClass { bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 120) { + if (tag != 32) { break; } } - case 120: { + case 32: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000040; @@ -618,14 +618,14 @@ public final class JoinLineupCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.index, index); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.slot, slot); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.planeId, planeId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.index, index); + } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } @@ -648,22 +648,11 @@ public final class JoinLineupCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 100346066: { - if (input.isAtField(FieldNames.index)) { - if (!input.trySkipNullValue()) { - index = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 3533310: { if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { slot = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -675,6 +664,17 @@ public final class JoinLineupCsReqOuterClass { if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { planeId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 100346066: { + if (input.isAtField(FieldNames.index)) { + if (!input.trySkipNullValue()) { + index = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -793,12 +793,12 @@ public final class JoinLineupCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName index = FieldName.forField("index"); - static final FieldName slot = FieldName.forField("slot"); static final FieldName planeId = FieldName.forField("planeId", "plane_id"); + static final FieldName index = FieldName.forField("index"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); diff --git a/src/generated/main/emu/lunarcore/proto/LMDFPHAHJGLOuterClass.java b/src/generated/main/emu/lunarcore/proto/LMDFPHAHJGLOuterClass.java deleted file mode 100644 index 5031c02..0000000 --- a/src/generated/main/emu/lunarcore/proto/LMDFPHAHJGLOuterClass.java +++ /dev/null @@ -1,299 +0,0 @@ -// 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 LMDFPHAHJGLOuterClass { - /** - * Protobuf type {@code LMDFPHAHJGL} - */ - public static final class LMDFPHAHJGL extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * repeated uint32 PFOIMEJPCIP = 12; - */ - private final RepeatedInt pFOIMEJPCIP = RepeatedInt.newEmptyInstance(); - - private LMDFPHAHJGL() { - } - - /** - * @return a new empty instance of {@code LMDFPHAHJGL} - */ - public static LMDFPHAHJGL newInstance() { - return new LMDFPHAHJGL(); - } - - /** - * repeated uint32 PFOIMEJPCIP = 12; - * @return whether the pFOIMEJPCIP field is set - */ - public boolean hasPFOIMEJPCIP() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * repeated uint32 PFOIMEJPCIP = 12; - * @return this - */ - public LMDFPHAHJGL clearPFOIMEJPCIP() { - bitField0_ &= ~0x00000001; - pFOIMEJPCIP.clear(); - return this; - } - - /** - * repeated uint32 PFOIMEJPCIP = 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 #getMutablePFOIMEJPCIP()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getPFOIMEJPCIP() { - return pFOIMEJPCIP; - } - - /** - * repeated uint32 PFOIMEJPCIP = 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 getMutablePFOIMEJPCIP() { - bitField0_ |= 0x00000001; - return pFOIMEJPCIP; - } - - /** - * repeated uint32 PFOIMEJPCIP = 12; - * @param value the pFOIMEJPCIP to add - * @return this - */ - public LMDFPHAHJGL addPFOIMEJPCIP(final int value) { - bitField0_ |= 0x00000001; - pFOIMEJPCIP.add(value); - return this; - } - - /** - * repeated uint32 PFOIMEJPCIP = 12; - * @param values the pFOIMEJPCIP to add - * @return this - */ - public LMDFPHAHJGL addAllPFOIMEJPCIP(final int... values) { - bitField0_ |= 0x00000001; - pFOIMEJPCIP.addAll(values); - return this; - } - - @Override - public LMDFPHAHJGL copyFrom(final LMDFPHAHJGL other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - pFOIMEJPCIP.copyFrom(other.pFOIMEJPCIP); - } - return this; - } - - @Override - public LMDFPHAHJGL mergeFrom(final LMDFPHAHJGL other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasPFOIMEJPCIP()) { - getMutablePFOIMEJPCIP().addAll(other.pFOIMEJPCIP); - } - return this; - } - - @Override - public LMDFPHAHJGL clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - pFOIMEJPCIP.clear(); - return this; - } - - @Override - public LMDFPHAHJGL clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - pFOIMEJPCIP.clear(); - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof LMDFPHAHJGL)) { - return false; - } - LMDFPHAHJGL other = (LMDFPHAHJGL) o; - return bitField0_ == other.bitField0_ - && (!hasPFOIMEJPCIP() || pFOIMEJPCIP.equals(other.pFOIMEJPCIP)); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - for (int i = 0; i < pFOIMEJPCIP.length(); i++) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(pFOIMEJPCIP.array()[i]); - } - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += (1 * pFOIMEJPCIP.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(pFOIMEJPCIP); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public LMDFPHAHJGL mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 98: { - // pFOIMEJPCIP [packed=true] - input.readPackedUInt32(pFOIMEJPCIP, tag); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - case 96: { - // pFOIMEJPCIP [packed=false] - tag = input.readRepeatedUInt32(pFOIMEJPCIP, tag); - bitField0_ |= 0x00000001; - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeRepeatedUInt32(FieldNames.pFOIMEJPCIP, pFOIMEJPCIP); - } - output.endObject(); - } - - @Override - public LMDFPHAHJGL mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case 387398332: { - if (input.isAtField(FieldNames.pFOIMEJPCIP)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(pFOIMEJPCIP); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public LMDFPHAHJGL clone() { - return new LMDFPHAHJGL().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static LMDFPHAHJGL parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new LMDFPHAHJGL(), data).checkInitialized(); - } - - public static LMDFPHAHJGL parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new LMDFPHAHJGL(), input).checkInitialized(); - } - - public static LMDFPHAHJGL parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new LMDFPHAHJGL(), input).checkInitialized(); - } - - /** - * @return factory for creating LMDFPHAHJGL messages - */ - public static MessageFactory getFactory() { - return LMDFPHAHJGLFactory.INSTANCE; - } - - private enum LMDFPHAHJGLFactory implements MessageFactory { - INSTANCE; - - @Override - public LMDFPHAHJGL create() { - return LMDFPHAHJGL.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName pFOIMEJPCIP = FieldName.forField("PFOIMEJPCIP"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java index ca9575d..d27cfa2 100644 --- a/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java @@ -19,25 +19,25 @@ public final class LeaveRogueScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 5; */ private int retcode; /** - * optional .RogueInfo rogue_info = 6; + * optional .RogueInfo rogue_info = 8; */ private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance(); /** - * optional .LineupInfo lineup = 12; - */ - private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); - - /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 10; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); + /** + * optional .LineupInfo lineup = 15; + */ + private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); + private LeaveRogueScRsp() { } @@ -49,7 +49,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -57,7 +57,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 5; * @return this */ public LeaveRogueScRsp clearRetcode() { @@ -67,7 +67,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -75,7 +75,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -86,7 +86,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 6; + * optional .RogueInfo rogue_info = 8; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { @@ -94,7 +94,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 6; + * optional .RogueInfo rogue_info = 8; * @return this */ public LeaveRogueScRsp clearRogueInfo() { @@ -104,7 +104,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 6; + * optional .RogueInfo rogue_info = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -118,7 +118,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 6; + * optional .RogueInfo rogue_info = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -132,7 +132,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 6; + * optional .RogueInfo rogue_info = 8; * @param value the rogueInfo to set * @return this */ @@ -143,82 +143,25 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional .LineupInfo lineup = 12; - * @return whether the lineup field is set + * optional .SceneInfo scene = 10; + * @return whether the scene field is set */ - public boolean hasLineup() { + public boolean hasScene() { return (bitField0_ & 0x00000004) != 0; } /** - * optional .LineupInfo lineup = 12; - * @return this - */ - public LeaveRogueScRsp clearLineup() { - bitField0_ &= ~0x00000004; - lineup.clear(); - return this; - } - - /** - * optional .LineupInfo lineup = 12; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableLineup()} if you want to modify it. - * - * @return internal storage object for reading - */ - public LineupInfoOuterClass.LineupInfo getLineup() { - return lineup; - } - - /** - * optional .LineupInfo lineup = 12; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * 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 = 12; - * @param value the lineup to set - * @return this - */ - public LeaveRogueScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { - bitField0_ |= 0x00000004; - lineup.copyFrom(value); - return this; - } - - /** - * optional .SceneInfo scene = 15; - * @return whether the scene field is set - */ - public boolean hasScene() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 10; * @return this */ public LeaveRogueScRsp clearScene() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; scene.clear(); return this; } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -232,7 +175,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -241,21 +184,78 @@ public final class LeaveRogueScRspOuterClass { * @return internal storage object for modifications */ public SceneInfoOuterClass.SceneInfo getMutableScene() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return scene; } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 10; * @param value the scene to set * @return this */ public LeaveRogueScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; scene.copyFrom(value); return this; } + /** + * optional .LineupInfo lineup = 15; + * @return whether the lineup field is set + */ + public boolean hasLineup() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .LineupInfo lineup = 15; + * @return this + */ + public LeaveRogueScRsp clearLineup() { + bitField0_ &= ~0x00000008; + lineup.clear(); + return this; + } + + /** + * optional .LineupInfo lineup = 15; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableLineup()} if you want to modify it. + * + * @return internal storage object for reading + */ + public LineupInfoOuterClass.LineupInfo getLineup() { + return lineup; + } + + /** + * optional .LineupInfo lineup = 15; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public LineupInfoOuterClass.LineupInfo getMutableLineup() { + bitField0_ |= 0x00000008; + return lineup; + } + + /** + * optional .LineupInfo lineup = 15; + * @param value the lineup to set + * @return this + */ + public LeaveRogueScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { + bitField0_ |= 0x00000008; + lineup.copyFrom(value); + return this; + } + @Override public LeaveRogueScRsp copyFrom(final LeaveRogueScRsp other) { cachedSize = other.cachedSize; @@ -263,8 +263,8 @@ public final class LeaveRogueScRspOuterClass { bitField0_ = other.bitField0_; retcode = other.retcode; rogueInfo.copyFrom(other.rogueInfo); - lineup.copyFrom(other.lineup); scene.copyFrom(other.scene); + lineup.copyFrom(other.lineup); } return this; } @@ -281,12 +281,12 @@ public final class LeaveRogueScRspOuterClass { if (other.hasRogueInfo()) { getMutableRogueInfo().mergeFrom(other.rogueInfo); } - if (other.hasLineup()) { - getMutableLineup().mergeFrom(other.lineup); - } if (other.hasScene()) { getMutableScene().mergeFrom(other.scene); } + if (other.hasLineup()) { + getMutableLineup().mergeFrom(other.lineup); + } return this; } @@ -299,8 +299,8 @@ public final class LeaveRogueScRspOuterClass { bitField0_ = 0; retcode = 0; rogueInfo.clear(); - lineup.clear(); scene.clear(); + lineup.clear(); return this; } @@ -312,8 +312,8 @@ public final class LeaveRogueScRspOuterClass { cachedSize = -1; bitField0_ = 0; rogueInfo.clearQuick(); - lineup.clearQuick(); scene.clearQuick(); + lineup.clearQuick(); return this; } @@ -329,27 +329,27 @@ public final class LeaveRogueScRspOuterClass { return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) && (!hasRogueInfo() || rogueInfo.equals(other.rogueInfo)) - && (!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) 16); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 66); output.writeMessageNoTag(rogueInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(lineup); + output.writeRawByte((byte) 82); + output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 122); - output.writeMessageNoTag(scene); + output.writeMessageNoTag(lineup); } } @@ -363,10 +363,10 @@ public final class LeaveRogueScRspOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); + size += 1 + ProtoSink.computeMessageSizeNoTag(scene); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(scene); + size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); } return size; } @@ -378,27 +378,27 @@ public final class LeaveRogueScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 66) { break; } } - case 50: { + case 66: { // rogueInfo input.readMessage(rogueInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 98) { + if (tag != 82) { break; } } - case 98: { - // lineup - input.readMessage(lineup); + case 82: { + // scene + input.readMessage(scene); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 122) { @@ -406,8 +406,8 @@ public final class LeaveRogueScRspOuterClass { } } case 122: { - // scene - input.readMessage(scene); + // lineup + input.readMessage(lineup); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -438,10 +438,10 @@ public final class LeaveRogueScRspOuterClass { output.writeMessage(FieldNames.rogueInfo, rogueInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.lineup, lineup); + output.writeMessage(FieldNames.scene, scene); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.scene, scene); + output.writeMessage(FieldNames.lineup, lineup); } output.endObject(); } @@ -476,10 +476,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_ |= 0x00000004; } } 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 { @@ -555,9 +555,9 @@ public final class LeaveRogueScRspOuterClass { static final FieldName rogueInfo = FieldName.forField("rogueInfo", "rogue_info"); - 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/LineupAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java index db290eb..faf85b8 100644 --- a/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java @@ -19,14 +19,14 @@ public final class LineupAvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 id = 3; + * optional uint32 id = 2; */ private int id; /** - * optional uint32 slot = 6; + * optional uint32 hp = 6; */ - private int slot; + private int hp; /** * optional uint32 satiety = 7; @@ -34,9 +34,9 @@ public final class LineupAvatarOuterClass { private int satiety; /** - * optional uint32 hp = 15; + * optional uint32 slot = 14; */ - private int hp; + private int slot; /** * optional .AvatarType avatar_type = 12; @@ -44,7 +44,7 @@ public final class LineupAvatarOuterClass { private int avatarType; /** - * optional .SpBarInfo sp_bar = 9; + * optional .SpBarInfo sp_bar = 13; */ private final SpBarInfoOuterClass.SpBarInfo spBar = SpBarInfoOuterClass.SpBarInfo.newInstance(); @@ -59,7 +59,7 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 id = 3; + * optional uint32 id = 2; * @return whether the id field is set */ public boolean hasId() { @@ -67,7 +67,7 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 id = 3; + * optional uint32 id = 2; * @return this */ public LineupAvatar clearId() { @@ -77,7 +77,7 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 id = 3; + * optional uint32 id = 2; * @return the id */ public int getId() { @@ -85,7 +85,7 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 id = 3; + * optional uint32 id = 2; * @param value the id to set * @return this */ @@ -96,39 +96,39 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 slot = 6; - * @return whether the slot field is set + * optional uint32 hp = 6; + * @return whether the hp field is set */ - public boolean hasSlot() { + public boolean hasHp() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 slot = 6; + * optional uint32 hp = 6; * @return this */ - public LineupAvatar clearSlot() { + public LineupAvatar clearHp() { bitField0_ &= ~0x00000002; - slot = 0; + hp = 0; return this; } /** - * optional uint32 slot = 6; - * @return the slot + * optional uint32 hp = 6; + * @return the hp */ - public int getSlot() { - return slot; + public int getHp() { + return hp; } /** - * optional uint32 slot = 6; - * @param value the slot to set + * optional uint32 hp = 6; + * @param value the hp to set * @return this */ - public LineupAvatar setSlot(final int value) { + public LineupAvatar setHp(final int value) { bitField0_ |= 0x00000002; - slot = value; + hp = value; return this; } @@ -170,39 +170,39 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 hp = 15; - * @return whether the hp field is set + * optional uint32 slot = 14; + * @return whether the slot field is set */ - public boolean hasHp() { + public boolean hasSlot() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 hp = 15; + * optional uint32 slot = 14; * @return this */ - public LineupAvatar clearHp() { + public LineupAvatar clearSlot() { bitField0_ &= ~0x00000008; - hp = 0; + slot = 0; return this; } /** - * optional uint32 hp = 15; - * @return the hp + * optional uint32 slot = 14; + * @return the slot */ - public int getHp() { - return hp; + public int getSlot() { + return slot; } /** - * optional uint32 hp = 15; - * @param value the hp to set + * optional uint32 slot = 14; + * @param value the slot to set * @return this */ - public LineupAvatar setHp(final int value) { + public LineupAvatar setSlot(final int value) { bitField0_ |= 0x00000008; - hp = value; + slot = value; return this; } @@ -269,7 +269,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 9; + * optional .SpBarInfo sp_bar = 13; * @return whether the spBar field is set */ public boolean hasSpBar() { @@ -277,7 +277,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 9; + * optional .SpBarInfo sp_bar = 13; * @return this */ public LineupAvatar clearSpBar() { @@ -287,7 +287,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 9; + * optional .SpBarInfo sp_bar = 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. @@ -301,7 +301,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 9; + * optional .SpBarInfo sp_bar = 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 @@ -315,7 +315,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 9; + * optional .SpBarInfo sp_bar = 13; * @param value the spBar to set * @return this */ @@ -331,9 +331,9 @@ public final class LineupAvatarOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; id = other.id; - slot = other.slot; - satiety = other.satiety; hp = other.hp; + satiety = other.satiety; + slot = other.slot; avatarType = other.avatarType; spBar.copyFrom(other.spBar); } @@ -349,14 +349,14 @@ public final class LineupAvatarOuterClass { if (other.hasId()) { setId(other.id); } - if (other.hasSlot()) { - setSlot(other.slot); + if (other.hasHp()) { + setHp(other.hp); } if (other.hasSatiety()) { setSatiety(other.satiety); } - if (other.hasHp()) { - setHp(other.hp); + if (other.hasSlot()) { + setSlot(other.slot); } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); @@ -375,9 +375,9 @@ public final class LineupAvatarOuterClass { cachedSize = -1; bitField0_ = 0; id = 0; - slot = 0; - satiety = 0; hp = 0; + satiety = 0; + slot = 0; avatarType = 0; spBar.clear(); return this; @@ -405,9 +405,9 @@ public final class LineupAvatarOuterClass { LineupAvatar other = (LineupAvatar) o; return bitField0_ == other.bitField0_ && (!hasId() || id == other.id) - && (!hasSlot() || slot == other.slot) - && (!hasSatiety() || satiety == other.satiety) && (!hasHp() || hp == other.hp) + && (!hasSatiety() || satiety == other.satiety) + && (!hasSlot() || slot == other.slot) && (!hasAvatarType() || avatarType == other.avatarType) && (!hasSpBar() || spBar.equals(other.spBar)); } @@ -415,27 +415,27 @@ public final class LineupAvatarOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 48); - output.writeUInt32NoTag(slot); + output.writeUInt32NoTag(hp); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 56); output.writeUInt32NoTag(satiety); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(hp); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 96); output.writeEnumNoTag(avatarType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 106); output.writeMessageNoTag(spBar); } } @@ -447,13 +447,13 @@ public final class LineupAvatarOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(hp); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(satiety); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(hp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); @@ -471,7 +471,7 @@ public final class LineupAvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 16: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; @@ -481,8 +481,8 @@ public final class LineupAvatarOuterClass { } } case 48: { - // slot - slot = input.readUInt32(); + // hp + hp = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 56) { @@ -494,13 +494,13 @@ public final class LineupAvatarOuterClass { satiety = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { - // hp - hp = input.readUInt32(); + case 112: { + // slot + slot = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 96) { @@ -515,11 +515,11 @@ public final class LineupAvatarOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 74) { + if (tag != 106) { break; } } - case 74: { + case 106: { // spBar input.readMessage(spBar); bitField0_ |= 0x00000020; @@ -549,13 +549,13 @@ public final class LineupAvatarOuterClass { output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.hp, hp); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.satiety, satiety); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.hp, hp); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); @@ -584,10 +584,10 @@ public final class LineupAvatarOuterClass { } break; } - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case 3336: { + if (input.isAtField(FieldNames.hp)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + hp = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -606,10 +606,10 @@ public final class LineupAvatarOuterClass { } break; } - case 3336: { - if (input.isAtField(FieldNames.hp)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - hp = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -700,11 +700,11 @@ public final class LineupAvatarOuterClass { static class FieldNames { static final FieldName id = FieldName.forField("id"); - static final FieldName slot = FieldName.forField("slot"); + static final FieldName hp = FieldName.forField("hp"); static final FieldName satiety = FieldName.forField("satiety"); - static final FieldName hp = FieldName.forField("hp"); + static final FieldName slot = FieldName.forField("slot"); static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); diff --git a/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java index 9f2eb18..5f9c804 100644 --- a/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java @@ -21,29 +21,29 @@ public final class LineupInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 mp = 7; - */ - private int mp; - - /** - * optional uint32 max_mp = 8; - */ - private int maxMp; - - /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 1; */ private int planeId; /** - * optional uint32 index = 12; + * optional uint32 leader_slot = 3; + */ + private int leaderSlot; + + /** + * optional uint32 index = 7; */ private int index; /** - * optional uint32 leader_slot = 13; + * optional uint32 mp = 8; */ - private int leaderSlot; + private int mp; + + /** + * optional uint32 max_mp = 9; + */ + private int maxMp; /** * optional .ExtraLineupType extra_lineup_type = 6; @@ -56,12 +56,12 @@ public final class LineupInfoOuterClass { private boolean isVirtual; /** - * optional string name = 5; + * optional string name = 15; */ private final Utf8String name = Utf8String.newEmptyInstance(); /** - * repeated .LineupAvatar avatar_list = 15; + * repeated .LineupAvatar avatar_list = 11; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(LineupAvatarOuterClass.LineupAvatar.getFactory()); @@ -76,99 +76,25 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 mp = 7; - * @return whether the mp field is set + * optional uint32 plane_id = 1; + * @return whether the planeId field is set */ - public boolean hasMp() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 mp = 7; - * @return this - */ - public LineupInfo clearMp() { - bitField0_ &= ~0x00000001; - mp = 0; - return this; - } - - /** - * optional uint32 mp = 7; - * @return the mp - */ - public int getMp() { - return mp; - } - - /** - * optional uint32 mp = 7; - * @param value the mp to set - * @return this - */ - public LineupInfo setMp(final int value) { - bitField0_ |= 0x00000001; - mp = value; - return this; - } - - /** - * optional uint32 max_mp = 8; - * @return whether the maxMp field is set - */ - public boolean hasMaxMp() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 max_mp = 8; - * @return this - */ - public LineupInfo clearMaxMp() { - bitField0_ &= ~0x00000002; - maxMp = 0; - return this; - } - - /** - * optional uint32 max_mp = 8; - * @return the maxMp - */ - public int getMaxMp() { - return maxMp; - } - - /** - * optional uint32 max_mp = 8; - * @param value the maxMp to set - * @return this - */ - public LineupInfo setMaxMp(final int value) { - bitField0_ |= 0x00000002; - maxMp = value; - return this; - } - - /** - * optional uint32 plane_id = 10; - * @return whether the planeId field is set - */ - public boolean hasPlaneId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 1; * @return this */ public LineupInfo clearPlaneId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; planeId = 0; return this; } /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 1; * @return the planeId */ public int getPlaneId() { @@ -176,73 +102,36 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 1; * @param value the planeId to set * @return this */ public LineupInfo setPlaneId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; planeId = value; return this; } /** - * optional uint32 index = 12; - * @return whether the index field is set - */ - public boolean hasIndex() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 index = 12; - * @return this - */ - public LineupInfo clearIndex() { - bitField0_ &= ~0x00000008; - index = 0; - return this; - } - - /** - * optional uint32 index = 12; - * @return the index - */ - public int getIndex() { - return index; - } - - /** - * optional uint32 index = 12; - * @param value the index to set - * @return this - */ - public LineupInfo setIndex(final int value) { - bitField0_ |= 0x00000008; - index = value; - return this; - } - - /** - * optional uint32 leader_slot = 13; + * optional uint32 leader_slot = 3; * @return whether the leaderSlot field is set */ public boolean hasLeaderSlot() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 leader_slot = 13; + * optional uint32 leader_slot = 3; * @return this */ public LineupInfo clearLeaderSlot() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000002; leaderSlot = 0; return this; } /** - * optional uint32 leader_slot = 13; + * optional uint32 leader_slot = 3; * @return the leaderSlot */ public int getLeaderSlot() { @@ -250,16 +139,127 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 leader_slot = 13; + * optional uint32 leader_slot = 3; * @param value the leaderSlot to set * @return this */ public LineupInfo setLeaderSlot(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; leaderSlot = value; return this; } + /** + * optional uint32 index = 7; + * @return whether the index field is set + */ + public boolean hasIndex() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 index = 7; + * @return this + */ + public LineupInfo clearIndex() { + bitField0_ &= ~0x00000004; + index = 0; + return this; + } + + /** + * optional uint32 index = 7; + * @return the index + */ + public int getIndex() { + return index; + } + + /** + * optional uint32 index = 7; + * @param value the index to set + * @return this + */ + public LineupInfo setIndex(final int value) { + bitField0_ |= 0x00000004; + index = value; + return this; + } + + /** + * optional uint32 mp = 8; + * @return whether the mp field is set + */ + public boolean hasMp() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 mp = 8; + * @return this + */ + public LineupInfo clearMp() { + bitField0_ &= ~0x00000008; + mp = 0; + return this; + } + + /** + * optional uint32 mp = 8; + * @return the mp + */ + public int getMp() { + return mp; + } + + /** + * optional uint32 mp = 8; + * @param value the mp to set + * @return this + */ + public LineupInfo setMp(final int value) { + bitField0_ |= 0x00000008; + mp = value; + return this; + } + + /** + * optional uint32 max_mp = 9; + * @return whether the maxMp field is set + */ + public boolean hasMaxMp() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 max_mp = 9; + * @return this + */ + public LineupInfo clearMaxMp() { + bitField0_ &= ~0x00000010; + maxMp = 0; + return this; + } + + /** + * optional uint32 max_mp = 9; + * @return the maxMp + */ + public int getMaxMp() { + return maxMp; + } + + /** + * optional uint32 max_mp = 9; + * @param value the maxMp to set + * @return this + */ + public LineupInfo setMaxMp(final int value) { + bitField0_ |= 0x00000010; + maxMp = value; + return this; + } + /** * optional .ExtraLineupType extra_lineup_type = 6; * @return whether the extraLineupType field is set @@ -360,7 +360,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 5; + * optional string name = 15; * @return whether the name field is set */ public boolean hasName() { @@ -368,7 +368,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 5; + * optional string name = 15; * @return this */ public LineupInfo clearName() { @@ -378,7 +378,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 5; + * optional string name = 15; * @return the name */ public String getName() { @@ -386,7 +386,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 5; + * optional string name = 15; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -394,7 +394,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 5; + * optional string name = 15; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -403,7 +403,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 5; + * optional string name = 15; * @param value the name to set * @return this */ @@ -414,7 +414,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 5; + * optional string name = 15; * @param value the name to set * @return this */ @@ -425,7 +425,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 15; + * repeated .LineupAvatar avatar_list = 11; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -433,7 +433,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 15; + * repeated .LineupAvatar avatar_list = 11; * @return this */ public LineupInfo clearAvatarList() { @@ -443,7 +443,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 15; + * repeated .LineupAvatar 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. @@ -457,7 +457,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 15; + * repeated .LineupAvatar 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 @@ -471,7 +471,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 15; + * repeated .LineupAvatar avatar_list = 11; * @param value the avatarList to add * @return this */ @@ -482,7 +482,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 15; + * repeated .LineupAvatar avatar_list = 11; * @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; + leaderSlot = other.leaderSlot; + index = other.index; mp = other.mp; maxMp = other.maxMp; - planeId = other.planeId; - index = other.index; - 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.hasLeaderSlot()) { + setLeaderSlot(other.leaderSlot); + } + if (other.hasIndex()) { + setIndex(other.index); + } if (other.hasMp()) { setMp(other.mp); } if (other.hasMaxMp()) { setMaxMp(other.maxMp); } - if (other.hasPlaneId()) { - setPlaneId(other.planeId); - } - if (other.hasIndex()) { - setIndex(other.index); - } - if (other.hasLeaderSlot()) { - setLeaderSlot(other.leaderSlot); - } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); } @@ -553,11 +553,11 @@ public final class LineupInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + planeId = 0; + leaderSlot = 0; + index = 0; mp = 0; maxMp = 0; - planeId = 0; - index = 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) + && (!hasLeaderSlot() || leaderSlot == other.leaderSlot) + && (!hasIndex() || index == other.index) && (!hasMp() || mp == other.mp) && (!hasMaxMp() || maxMp == other.maxMp) - && (!hasPlaneId() || planeId == other.planeId) - && (!hasIndex() || index == other.index) - && (!hasLeaderSlot() || leaderSlot == other.leaderSlot) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual) && (!hasName() || name.equals(other.name)) @@ -601,24 +601,24 @@ public final class LineupInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(mp); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(maxMp); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(planeId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(leaderSlot); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); output.writeUInt32NoTag(index); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(mp); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(leaderSlot); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(maxMp); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 48); @@ -629,12 +629,12 @@ public final class LineupInfoOuterClass { output.writeBoolNoTag(isVirtual); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 122); output.writeStringNoTag(name); } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 90); 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(mp); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(maxMp); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); + } + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(mp); + } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(maxMp); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); @@ -680,45 +680,45 @@ public final class LineupInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // mp - mp = input.readUInt32(); + case 8: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { + // leaderSlot + leaderSlot = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // index + index = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 64) { break; } } case 64: { - // maxMp - maxMp = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // planeId - planeId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // index - index = input.readUInt32(); + // mp + mp = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { - // leaderSlot - leaderSlot = input.readUInt32(); + case 72: { + // maxMp + maxMp = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 48) { @@ -742,20 +742,20 @@ public final class LineupInfoOuterClass { isVirtual = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 42) { - break; - } - } - case 42: { - // name - input.readString(name); - bitField0_ |= 0x00000080; - tag = input.readTag(); if (tag != 122) { break; } } case 122: { + // name + input.readString(name); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { // 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.mp, mp); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.maxMp, maxMp); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.planeId, planeId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.leaderSlot, leaderSlot); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.index, index); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.mp, mp); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.leaderSlot, leaderSlot); + output.writeUInt32(FieldNames.maxMp, maxMp); } if ((bitField0_ & 0x00000020) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); @@ -817,46 +817,12 @@ public final class LineupInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3491: { - if (input.isAtField(FieldNames.mp)) { - if (!input.trySkipNullValue()) { - mp = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 103671335: - case -1081138594: { - if (input.isAtField(FieldNames.maxMp)) { - if (!input.trySkipNullValue()) { - maxMp = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -493896553: case 1869097438: { if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { planeId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 100346066: { - if (input.isAtField(FieldNames.index)) { - if (!input.trySkipNullValue()) { - index = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -868,6 +834,40 @@ public final class LineupInfoOuterClass { if (input.isAtField(FieldNames.leaderSlot)) { if (!input.trySkipNullValue()) { leaderSlot = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 100346066: { + if (input.isAtField(FieldNames.index)) { + if (!input.trySkipNullValue()) { + index = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 3491: { + if (input.isAtField(FieldNames.mp)) { + if (!input.trySkipNullValue()) { + mp = 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,15 +979,15 @@ public final class LineupInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName mp = FieldName.forField("mp"); - - 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 index = FieldName.forField("index"); - static final FieldName leaderSlot = FieldName.forField("leaderSlot", "leader_slot"); + static final FieldName mp = FieldName.forField("mp"); + + static final FieldName maxMp = FieldName.forField("maxMp", "max_mp"); static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); diff --git a/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java index e981cca..a9fd5ee 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 = 6; + * optional uint32 id = 4; */ private int id; /** - * optional uint32 slot = 8; + * optional uint32 slot = 11; */ private int slot; /** - * optional .AvatarType avatar_type = 15; + * optional .AvatarType avatar_type = 1; */ private int avatarType; @@ -44,7 +44,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional uint32 id = 6; + * optional uint32 id = 4; * @return whether the id field is set */ public boolean hasId() { @@ -52,7 +52,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional uint32 id = 6; + * optional uint32 id = 4; * @return this */ public LineupSlotData clearId() { @@ -62,7 +62,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional uint32 id = 6; + * optional uint32 id = 4; * @return the id */ public int getId() { @@ -70,7 +70,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional uint32 id = 6; + * optional uint32 id = 4; * @param value the id to set * @return this */ @@ -81,7 +81,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional uint32 slot = 8; + * optional uint32 slot = 11; * @return whether the slot field is set */ public boolean hasSlot() { @@ -89,7 +89,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional uint32 slot = 8; + * optional uint32 slot = 11; * @return this */ public LineupSlotData clearSlot() { @@ -99,7 +99,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional uint32 slot = 8; + * optional uint32 slot = 11; * @return the slot */ public int getSlot() { @@ -107,7 +107,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional uint32 slot = 8; + * optional uint32 slot = 11; * @param value the slot to set * @return this */ @@ -118,7 +118,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional .AvatarType avatar_type = 15; + * optional .AvatarType avatar_type = 1; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -126,7 +126,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional .AvatarType avatar_type = 15; + * optional .AvatarType avatar_type = 1; * @return this */ public LineupSlotData clearAvatarType() { @@ -136,7 +136,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional .AvatarType avatar_type = 15; + * optional .AvatarType avatar_type = 1; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -169,7 +169,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional .AvatarType avatar_type = 15; + * optional .AvatarType avatar_type = 1; * @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) 48); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 8); output.writeEnumNoTag(avatarType); } } @@ -285,25 +285,25 @@ public final class LineupSlotDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 32: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 88) { break; } } - case 64: { + case 88: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 120) { + if (tag != 8) { break; } } - case 120: { + case 8: { // 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 ce771b0..8597fbb 100644 --- a/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class LockEquipmentCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 8; */ private int equipmentUniqueId; /** - * optional bool is_protected = 11; + * optional bool is_protected = 1; */ private boolean isProtected; @@ -39,7 +39,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 8; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 8; * @return this */ public LockEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 8; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 8; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 11; + * optional bool is_protected = 1; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -84,7 +84,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 11; + * optional bool is_protected = 1; * @return this */ public LockEquipmentCsReq clearIsProtected() { @@ -94,7 +94,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 11; + * optional bool is_protected = 1; * @return the isProtected */ public boolean getIsProtected() { @@ -102,7 +102,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 11; + * optional bool is_protected = 1; * @param value the isProtected to set * @return this */ @@ -177,11 +177,11 @@ public final class LockEquipmentCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 8); output.writeBoolNoTag(isProtected); } } @@ -205,16 +205,16 @@ public final class LockEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 64: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 8) { break; } } - case 88: { + case 8: { // isProtected isProtected = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java index 7be68e1..030c99e 100644 --- a/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java @@ -19,12 +19,7 @@ public final class LockEquipmentScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 equipment_unique_id = 3; - */ - private int equipmentUniqueId; - - /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 12; */ private int retcode; @@ -39,62 +34,25 @@ public final class LockEquipmentScRspOuterClass { } /** - * optional uint32 equipment_unique_id = 3; - * @return whether the equipmentUniqueId field is set + * optional uint32 retcode = 12; + * @return whether the retcode field is set */ - public boolean hasEquipmentUniqueId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 equipment_unique_id = 3; - * @return this - */ - public LockEquipmentScRsp clearEquipmentUniqueId() { - bitField0_ &= ~0x00000001; - equipmentUniqueId = 0; - return this; - } - - /** - * optional uint32 equipment_unique_id = 3; - * @return the equipmentUniqueId - */ - public int getEquipmentUniqueId() { - return equipmentUniqueId; - } - - /** - * optional uint32 equipment_unique_id = 3; - * @param value the equipmentUniqueId to set - * @return this - */ - public LockEquipmentScRsp setEquipmentUniqueId(final int value) { - bitField0_ |= 0x00000001; - equipmentUniqueId = value; - return this; - } - - /** - * optional uint32 retcode = 13; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 12; * @return this */ public LockEquipmentScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -102,12 +60,12 @@ public final class LockEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ public LockEquipmentScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } @@ -117,7 +75,6 @@ public final class LockEquipmentScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - equipmentUniqueId = other.equipmentUniqueId; retcode = other.retcode; } return this; @@ -129,9 +86,6 @@ public final class LockEquipmentScRspOuterClass { return this; } cachedSize = -1; - if (other.hasEquipmentUniqueId()) { - setEquipmentUniqueId(other.equipmentUniqueId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } @@ -145,7 +99,6 @@ public final class LockEquipmentScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - equipmentUniqueId = 0; retcode = 0; return this; } @@ -170,18 +123,13 @@ public final class LockEquipmentScRspOuterClass { } LockEquipmentScRsp other = (LockEquipmentScRsp) o; return bitField0_ == other.bitField0_ - && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(equipmentUniqueId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } } @@ -190,9 +138,6 @@ public final class LockEquipmentScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; @@ -205,19 +150,10 @@ public final class LockEquipmentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // equipmentUniqueId - equipmentUniqueId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 96: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { break; @@ -241,9 +177,6 @@ public final class LockEquipmentScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); @@ -256,23 +189,11 @@ public final class LockEquipmentScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1867136902: - case 760467160: { - if (input.isAtField(FieldNames.equipmentUniqueId)) { - if (!input.trySkipNullValue()) { - equipmentUniqueId = 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(); @@ -332,8 +253,6 @@ public final class LockEquipmentScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); - static final FieldName retcode = FieldName.forField("retcode"); } } diff --git a/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java index 5994778..43d8023 100644 --- a/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class LockRelicCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 relic_unique_id = 1; + * optional uint32 relic_unique_id = 2; */ private int relicUniqueId; /** - * optional bool is_protected = 10; + * optional bool is_protected = 11; */ private boolean isProtected; @@ -39,7 +39,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 1; + * optional uint32 relic_unique_id = 2; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -47,7 +47,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 1; + * optional uint32 relic_unique_id = 2; * @return this */ public LockRelicCsReq clearRelicUniqueId() { @@ -57,7 +57,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 1; + * optional uint32 relic_unique_id = 2; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -65,7 +65,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 1; + * optional uint32 relic_unique_id = 2; * @param value the relicUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 10; + * optional bool is_protected = 11; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -84,7 +84,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 10; + * optional bool is_protected = 11; * @return this */ public LockRelicCsReq clearIsProtected() { @@ -94,7 +94,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 10; + * optional bool is_protected = 11; * @return the isProtected */ public boolean getIsProtected() { @@ -102,7 +102,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 10; + * optional bool is_protected = 11; * @param value the isProtected to set * @return this */ @@ -177,11 +177,11 @@ public final class LockRelicCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 88); output.writeBoolNoTag(isProtected); } } @@ -205,16 +205,16 @@ public final class LockRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 16: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 88) { break; } } - case 80: { + case 88: { // isProtected isProtected = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java index 8b168ea..2072f64 100644 --- a/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java @@ -19,12 +19,12 @@ public final class LockRelicScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 relic_unique_id = 4; + * optional uint32 relic_unique_id = 3; */ private int relicUniqueId; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; */ private int retcode; @@ -39,7 +39,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 relic_unique_id = 4; + * optional uint32 relic_unique_id = 3; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -47,7 +47,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 relic_unique_id = 4; + * optional uint32 relic_unique_id = 3; * @return this */ public LockRelicScRsp clearRelicUniqueId() { @@ -57,7 +57,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 relic_unique_id = 4; + * optional uint32 relic_unique_id = 3; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -65,7 +65,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 relic_unique_id = 4; + * optional uint32 relic_unique_id = 3; * @param value the relicUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -84,7 +84,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; * @return this */ public LockRelicScRsp clearRetcode() { @@ -94,7 +94,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -102,7 +102,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -177,11 +177,11 @@ public final class LockRelicScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } } @@ -205,16 +205,16 @@ public final class LockRelicScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 24: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 32) { break; } } - case 56: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/MECNPEEJJDEOuterClass.java b/src/generated/main/emu/lunarcore/proto/MECNPEEJJDEOuterClass.java index 5a4b7c5..424019b 100644 --- a/src/generated/main/emu/lunarcore/proto/MECNPEEJJDEOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MECNPEEJJDEOuterClass.java @@ -20,7 +20,7 @@ public final class MECNPEEJJDEOuterClass { /** * 
-     *  idk
+     * LJABGHIILFI DHJPHJOBLLB = 7;
      *
* * optional uint32 GLFDHAJPJDF = 3; @@ -39,7 +39,7 @@ public final class MECNPEEJJDEOuterClass { /** * 
-     *  idk
+     * LJABGHIILFI DHJPHJOBLLB = 7;
      *
* * optional uint32 GLFDHAJPJDF = 3; @@ -51,7 +51,7 @@ public final class MECNPEEJJDEOuterClass { /** * 
-     *  idk
+     * LJABGHIILFI DHJPHJOBLLB = 7;
      *
* * optional uint32 GLFDHAJPJDF = 3; @@ -65,7 +65,7 @@ public final class MECNPEEJJDEOuterClass { /** * 
-     *  idk
+     * LJABGHIILFI DHJPHJOBLLB = 7;
      *
* * optional uint32 GLFDHAJPJDF = 3; @@ -77,7 +77,7 @@ public final class MECNPEEJJDEOuterClass { /** * 
-     *  idk
+     * LJABGHIILFI DHJPHJOBLLB = 7;
      *
* * optional uint32 GLFDHAJPJDF = 3; diff --git a/src/generated/main/emu/lunarcore/proto/MarkReadMailCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/MarkReadMailCsReqOuterClass.java index 2cb1cf3..1df62d7 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 = 6; + * optional uint32 id = 12; */ private int id; @@ -34,7 +34,7 @@ public final class MarkReadMailCsReqOuterClass { } /** - * optional uint32 id = 6; + * optional uint32 id = 12; * @return whether the id field is set */ public boolean hasId() { @@ -42,7 +42,7 @@ public final class MarkReadMailCsReqOuterClass { } /** - * optional uint32 id = 6; + * optional uint32 id = 12; * @return this */ public MarkReadMailCsReq clearId() { @@ -52,7 +52,7 @@ public final class MarkReadMailCsReqOuterClass { } /** - * optional uint32 id = 6; + * optional uint32 id = 12; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public final class MarkReadMailCsReqOuterClass { } /** - * optional uint32 id = 6; + * optional uint32 id = 12; * @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) 48); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public final class MarkReadMailCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 96: { // 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 db6c884..e6aa069 100644 --- a/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java @@ -19,12 +19,12 @@ public final class MarkReadMailScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional uint32 id = 5; + * optional uint32 id = 9; */ private int id; @@ -39,7 +39,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; * @return this */ public MarkReadMailScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 9; * @return whether the id field is set */ public boolean hasId() { @@ -84,7 +84,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 9; * @return this */ public MarkReadMailScRsp clearId() { @@ -94,7 +94,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 9; * @return the id */ public int getId() { @@ -102,7 +102,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 9; * @param value the id to set * @return this */ @@ -177,11 +177,11 @@ public final class MarkReadMailScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(id); } } @@ -205,16 +205,16 @@ public final class MarkReadMailScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 72) { break; } } - case 40: { + case 72: { // id id = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java b/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java index 653c231..560c7fc 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 = 4; - */ - private int num; - - /** - * optional uint32 tid = 10; + * optional uint32 tid = 2; */ private int tid; + /** + * optional uint32 num = 6; + */ + private int num; + private Material() { } @@ -39,62 +39,25 @@ public final class MaterialOuterClass { } /** - * optional uint32 num = 4; - * @return whether the num field is set + * optional uint32 tid = 2; + * @return whether the tid field is set */ - public boolean hasNum() { + public boolean hasTid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 num = 4; - * @return this - */ - public Material clearNum() { - bitField0_ &= ~0x00000001; - num = 0; - return this; - } - - /** - * optional uint32 num = 4; - * @return the num - */ - public int getNum() { - return num; - } - - /** - * optional uint32 num = 4; - * @param value the num to set - * @return this - */ - public Material setNum(final int value) { - bitField0_ |= 0x00000001; - num = value; - return this; - } - - /** - * optional uint32 tid = 10; - * @return whether the tid field is set - */ - public boolean hasTid() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 tid = 10; + * optional uint32 tid = 2; * @return this */ public Material clearTid() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; tid = 0; return this; } /** - * optional uint32 tid = 10; + * optional uint32 tid = 2; * @return the tid */ public int getTid() { @@ -102,23 +65,60 @@ public final class MaterialOuterClass { } /** - * optional uint32 tid = 10; + * optional uint32 tid = 2; * @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 = 6; + * @return whether the num field is set + */ + public boolean hasNum() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 num = 6; + * @return this + */ + public Material clearNum() { + bitField0_ &= ~0x00000002; + num = 0; + return this; + } + + /** + * optional uint32 num = 6; + * @return the num + */ + public int getNum() { + return num; + } + + /** + * optional uint32 num = 6; + * @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) 32); - output.writeUInt32NoTag(num); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(tid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(tid); + output.writeRawByte((byte) 48); + 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 32: { - // num - num = input.readUInt32(); + case 16: { + // tid + tid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 48) { break; } } - case 80: { - // tid - tid = input.readUInt32(); + case 48: { + // 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 cf00ac3..6705e8b 100644 --- a/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java @@ -19,17 +19,17 @@ public final class MazeChestOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 unlocked_amount_list = 1; + * optional uint32 unlocked_amount_list = 2; */ private int unlockedAmountList; /** - * optional uint32 total_amount_list = 4; + * optional uint32 total_amount_list = 7; */ private int totalAmountList; /** - * optional .MapInfoChestType map_info_chest_type = 14; + * optional .MapInfoChestType map_info_chest_type = 1; */ private int mapInfoChestType; @@ -44,7 +44,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 unlocked_amount_list = 1; + * optional uint32 unlocked_amount_list = 2; * @return whether the unlockedAmountList field is set */ public boolean hasUnlockedAmountList() { @@ -52,7 +52,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 unlocked_amount_list = 1; + * optional uint32 unlocked_amount_list = 2; * @return this */ public MazeChest clearUnlockedAmountList() { @@ -62,7 +62,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 unlocked_amount_list = 1; + * optional uint32 unlocked_amount_list = 2; * @return the unlockedAmountList */ public int getUnlockedAmountList() { @@ -70,7 +70,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 unlocked_amount_list = 1; + * optional uint32 unlocked_amount_list = 2; * @param value the unlockedAmountList to set * @return this */ @@ -81,7 +81,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 total_amount_list = 4; + * optional uint32 total_amount_list = 7; * @return whether the totalAmountList field is set */ public boolean hasTotalAmountList() { @@ -89,7 +89,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 total_amount_list = 4; + * optional uint32 total_amount_list = 7; * @return this */ public MazeChest clearTotalAmountList() { @@ -99,7 +99,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 total_amount_list = 4; + * optional uint32 total_amount_list = 7; * @return the totalAmountList */ public int getTotalAmountList() { @@ -107,7 +107,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 total_amount_list = 4; + * optional uint32 total_amount_list = 7; * @param value the totalAmountList to set * @return this */ @@ -118,7 +118,7 @@ public final class MazeChestOuterClass { } /** - * optional .MapInfoChestType map_info_chest_type = 14; + * optional .MapInfoChestType map_info_chest_type = 1; * @return whether the mapInfoChestType field is set */ public boolean hasMapInfoChestType() { @@ -126,7 +126,7 @@ public final class MazeChestOuterClass { } /** - * optional .MapInfoChestType map_info_chest_type = 14; + * optional .MapInfoChestType map_info_chest_type = 1; * @return this */ public MazeChest clearMapInfoChestType() { @@ -136,7 +136,7 @@ public final class MazeChestOuterClass { } /** - * optional .MapInfoChestType map_info_chest_type = 14; + * optional .MapInfoChestType map_info_chest_type = 1; * @return the mapInfoChestType */ public MapInfoChestTypeOuterClass.MapInfoChestType getMapInfoChestType() { @@ -169,7 +169,7 @@ public final class MazeChestOuterClass { } /** - * optional .MapInfoChestType map_info_chest_type = 14; + * optional .MapInfoChestType map_info_chest_type = 1; * @param value the mapInfoChestType to set * @return this */ @@ -250,15 +250,15 @@ public final class MazeChestOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(unlockedAmountList); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(totalAmountList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 8); output.writeEnumNoTag(mapInfoChestType); } } @@ -285,25 +285,25 @@ public final class MazeChestOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 16: { // unlockedAmountList unlockedAmountList = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 56) { break; } } - case 32: { + case 56: { // totalAmountList totalAmountList = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 8) { break; } } - case 112: { + case 8: { // mapInfoChestType final int value = input.readInt32(); if (MapInfoChestTypeOuterClass.MapInfoChestType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java index 9a538df..039e8d0 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 = 2; + * optional int64 modify_time = 3; */ private long modifyTime; /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 8; */ private int groupId; @@ -39,7 +39,7 @@ public final class MazeGroupOuterClass { } /** - * optional int64 modify_time = 2; + * optional int64 modify_time = 3; * @return whether the modifyTime field is set */ public boolean hasModifyTime() { @@ -47,7 +47,7 @@ public final class MazeGroupOuterClass { } /** - * optional int64 modify_time = 2; + * optional int64 modify_time = 3; * @return this */ public MazeGroup clearModifyTime() { @@ -57,7 +57,7 @@ public final class MazeGroupOuterClass { } /** - * optional int64 modify_time = 2; + * optional int64 modify_time = 3; * @return the modifyTime */ public long getModifyTime() { @@ -65,7 +65,7 @@ public final class MazeGroupOuterClass { } /** - * optional int64 modify_time = 2; + * optional int64 modify_time = 3; * @param value the modifyTime to set * @return this */ @@ -76,7 +76,7 @@ public final class MazeGroupOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 8; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -84,7 +84,7 @@ public final class MazeGroupOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 8; * @return this */ public MazeGroup clearGroupId() { @@ -94,7 +94,7 @@ public final class MazeGroupOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 8; * @return the groupId */ public int getGroupId() { @@ -102,7 +102,7 @@ public final class MazeGroupOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 8; * @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) 16); + output.writeRawByte((byte) 24); output.writeInt64NoTag(modifyTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(groupId); } } @@ -205,16 +205,16 @@ public final class MazeGroupOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 24: { // modifyTime modifyTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 64) { break; } } - case 48: { + case 64: { // 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 72b4d2e..497f1ff 100644 --- a/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java @@ -21,22 +21,22 @@ public final class MazeMapDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 11; */ private int retcode; /** - * optional uint32 entry_id = 7; - */ - private int entryId; - - /** - * optional uint32 cur_map_entry_id = 8; + * optional uint32 cur_map_entry_id = 14; */ private int curMapEntryId; /** - * repeated uint32 unlocked_teleport_list = 5; + * optional uint32 entry_id = 15; + */ + private int entryId; + + /** + * repeated uint32 unlocked_teleport_list = 2; */ private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); @@ -46,20 +46,20 @@ public final class MazeMapDataOuterClass { private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); /** - * repeated .MazeChest unlocked_chest_list = 2; - */ - private final RepeatedMessage unlockedChestList = RepeatedMessage.newEmptyInstance(MazeChestOuterClass.MazeChest.getFactory()); - - /** - * repeated .MazeGroup maze_group_list = 12; + * repeated .MazeGroup maze_group_list = 1; */ private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory()); /** - * repeated .MazeProp maze_prop_list = 14; + * repeated .MazeProp maze_prop_list = 10; */ private final RepeatedMessage mazePropList = RepeatedMessage.newEmptyInstance(MazePropOuterClass.MazeProp.getFactory()); + /** + * repeated .MazeChest unlocked_chest_list = 13; + */ + private final RepeatedMessage unlockedChestList = RepeatedMessage.newEmptyInstance(MazeChestOuterClass.MazeChest.getFactory()); + private MazeMapData() { } @@ -71,7 +71,7 @@ public final class MazeMapDataOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -79,7 +79,7 @@ public final class MazeMapDataOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 11; * @return this */ public MazeMapData clearRetcode() { @@ -89,7 +89,7 @@ public final class MazeMapDataOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -97,7 +97,7 @@ public final class MazeMapDataOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -108,62 +108,25 @@ public final class MazeMapDataOuterClass { } /** - * optional uint32 entry_id = 7; - * @return whether the entryId field is set + * optional uint32 cur_map_entry_id = 14; + * @return whether the curMapEntryId field is set */ - public boolean hasEntryId() { + public boolean hasCurMapEntryId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 entry_id = 7; - * @return this - */ - public MazeMapData 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 MazeMapData setEntryId(final int value) { - bitField0_ |= 0x00000002; - entryId = value; - return this; - } - - /** - * optional uint32 cur_map_entry_id = 8; - * @return whether the curMapEntryId field is set - */ - public boolean hasCurMapEntryId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 cur_map_entry_id = 8; + * optional uint32 cur_map_entry_id = 14; * @return this */ public MazeMapData clearCurMapEntryId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; curMapEntryId = 0; return this; } /** - * optional uint32 cur_map_entry_id = 8; + * optional uint32 cur_map_entry_id = 14; * @return the curMapEntryId */ public int getCurMapEntryId() { @@ -171,18 +134,55 @@ public final class MazeMapDataOuterClass { } /** - * optional uint32 cur_map_entry_id = 8; + * optional uint32 cur_map_entry_id = 14; * @param value the curMapEntryId to set * @return this */ public MazeMapData setCurMapEntryId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; curMapEntryId = value; return this; } /** - * repeated uint32 unlocked_teleport_list = 5; + * optional uint32 entry_id = 15; + * @return whether the entryId field is set + */ + public boolean hasEntryId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 entry_id = 15; + * @return this + */ + public MazeMapData clearEntryId() { + bitField0_ &= ~0x00000004; + entryId = 0; + return this; + } + + /** + * optional uint32 entry_id = 15; + * @return the entryId + */ + public int getEntryId() { + return entryId; + } + + /** + * optional uint32 entry_id = 15; + * @param value the entryId to set + * @return this + */ + public MazeMapData setEntryId(final int value) { + bitField0_ |= 0x00000004; + entryId = value; + return this; + } + + /** + * repeated uint32 unlocked_teleport_list = 2; * @return whether the unlockedTeleportList field is set */ public boolean hasUnlockedTeleportList() { @@ -190,7 +190,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 5; + * repeated uint32 unlocked_teleport_list = 2; * @return this */ public MazeMapData clearUnlockedTeleportList() { @@ -200,7 +200,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 5; + * repeated uint32 unlocked_teleport_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. @@ -214,7 +214,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 5; + * repeated uint32 unlocked_teleport_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 @@ -228,7 +228,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 5; + * repeated uint32 unlocked_teleport_list = 2; * @param value the unlockedTeleportList to add * @return this */ @@ -239,7 +239,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 5; + * repeated uint32 unlocked_teleport_list = 2; * @param values the unlockedTeleportList to add * @return this */ @@ -318,93 +318,25 @@ public final class MazeMapDataOuterClass { } /** - * repeated .MazeChest unlocked_chest_list = 2; - * @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 = 2; - * @return this - */ - public MazeMapData clearUnlockedChestList() { - bitField0_ &= ~0x00000020; - unlockedChestList.clear(); - return this; - } - - /** - * repeated .MazeChest unlocked_chest_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 #getMutableUnlockedChestList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getUnlockedChestList() { - return unlockedChestList; - } - - /** - * repeated .MazeChest unlocked_chest_list = 2; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableUnlockedChestList() { - bitField0_ |= 0x00000020; - return unlockedChestList; - } - - /** - * repeated .MazeChest unlocked_chest_list = 2; - * @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 = 2; - * @param values the unlockedChestList to add - * @return this - */ - public MazeMapData addAllUnlockedChestList(final MazeChestOuterClass.MazeChest... values) { - bitField0_ |= 0x00000020; - unlockedChestList.addAll(values); - return this; - } - - /** - * repeated .MazeGroup maze_group_list = 12; - * @return whether the mazeGroupList field is set - */ - public boolean hasMazeGroupList() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * repeated .MazeGroup maze_group_list = 12; + * repeated .MazeGroup maze_group_list = 1; * @return this */ public MazeMapData clearMazeGroupList() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000020; mazeGroupList.clear(); return this; } /** - * repeated .MazeGroup maze_group_list = 12; + * 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. @@ -418,7 +350,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated .MazeGroup maze_group_list = 12; + * 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 @@ -427,52 +359,52 @@ public final class MazeMapDataOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMazeGroupList() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; return mazeGroupList; } /** - * repeated .MazeGroup maze_group_list = 12; + * repeated .MazeGroup maze_group_list = 1; * @param value the mazeGroupList to add * @return this */ public MazeMapData addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; mazeGroupList.add(value); return this; } /** - * repeated .MazeGroup maze_group_list = 12; + * repeated .MazeGroup maze_group_list = 1; * @param values the mazeGroupList to add * @return this */ public MazeMapData addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; mazeGroupList.addAll(values); return this; } /** - * repeated .MazeProp maze_prop_list = 14; + * repeated .MazeProp maze_prop_list = 10; * @return whether the mazePropList field is set */ public boolean hasMazePropList() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000040) != 0; } /** - * repeated .MazeProp maze_prop_list = 14; + * repeated .MazeProp maze_prop_list = 10; * @return this */ public MazeMapData clearMazePropList() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; mazePropList.clear(); return this; } /** - * repeated .MazeProp maze_prop_list = 14; + * repeated .MazeProp maze_prop_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. @@ -486,7 +418,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated .MazeProp maze_prop_list = 14; + * repeated .MazeProp maze_prop_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 @@ -495,45 +427,113 @@ public final class MazeMapDataOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMazePropList() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; return mazePropList; } /** - * repeated .MazeProp maze_prop_list = 14; + * repeated .MazeProp maze_prop_list = 10; * @param value the mazePropList to add * @return this */ public MazeMapData addMazePropList(final MazePropOuterClass.MazeProp value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; mazePropList.add(value); return this; } /** - * repeated .MazeProp maze_prop_list = 14; + * repeated .MazeProp maze_prop_list = 10; * @param values the mazePropList to add * @return this */ public MazeMapData addAllMazePropList(final MazePropOuterClass.MazeProp... values) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; mazePropList.addAll(values); return this; } + /** + * repeated .MazeChest unlocked_chest_list = 13; + * @return whether the unlockedChestList field is set + */ + public boolean hasUnlockedChestList() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * repeated .MazeChest unlocked_chest_list = 13; + * @return this + */ + public MazeMapData clearUnlockedChestList() { + bitField0_ &= ~0x00000080; + unlockedChestList.clear(); + return this; + } + + /** + * repeated .MazeChest unlocked_chest_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 #getMutableUnlockedChestList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getUnlockedChestList() { + return unlockedChestList; + } + + /** + * repeated .MazeChest unlocked_chest_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 getMutableUnlockedChestList() { + bitField0_ |= 0x00000080; + return unlockedChestList; + } + + /** + * repeated .MazeChest unlocked_chest_list = 13; + * @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 = 13; + * @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_; retcode = other.retcode; - entryId = other.entryId; curMapEntryId = other.curMapEntryId; + entryId = other.entryId; unlockedTeleportList.copyFrom(other.unlockedTeleportList); lightenSectionList.copyFrom(other.lightenSectionList); - unlockedChestList.copyFrom(other.unlockedChestList); mazeGroupList.copyFrom(other.mazeGroupList); mazePropList.copyFrom(other.mazePropList); + unlockedChestList.copyFrom(other.unlockedChestList); } return this; } @@ -547,27 +547,27 @@ public final class MazeMapDataOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasEntryId()) { - setEntryId(other.entryId); - } if (other.hasCurMapEntryId()) { setCurMapEntryId(other.curMapEntryId); } + if (other.hasEntryId()) { + setEntryId(other.entryId); + } if (other.hasUnlockedTeleportList()) { getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList); } if (other.hasLightenSectionList()) { getMutableLightenSectionList().addAll(other.lightenSectionList); } - if (other.hasUnlockedChestList()) { - getMutableUnlockedChestList().addAll(other.unlockedChestList); - } if (other.hasMazeGroupList()) { getMutableMazeGroupList().addAll(other.mazeGroupList); } if (other.hasMazePropList()) { getMutableMazePropList().addAll(other.mazePropList); } + if (other.hasUnlockedChestList()) { + getMutableUnlockedChestList().addAll(other.unlockedChestList); + } return this; } @@ -579,13 +579,13 @@ public final class MazeMapDataOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - entryId = 0; curMapEntryId = 0; + entryId = 0; unlockedTeleportList.clear(); lightenSectionList.clear(); - unlockedChestList.clear(); mazeGroupList.clear(); mazePropList.clear(); + unlockedChestList.clear(); return this; } @@ -598,9 +598,9 @@ public final class MazeMapDataOuterClass { bitField0_ = 0; unlockedTeleportList.clear(); lightenSectionList.clear(); - unlockedChestList.clearQuick(); mazeGroupList.clearQuick(); mazePropList.clearQuick(); + unlockedChestList.clearQuick(); return this; } @@ -615,32 +615,32 @@ public final class MazeMapDataOuterClass { MazeMapData other = (MazeMapData) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasEntryId() || entryId == other.entryId) && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId) + && (!hasEntryId() || entryId == other.entryId) && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList)) && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) - && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList)) && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)) - && (!hasMazePropList() || mazePropList.equals(other.mazePropList)); + && (!hasMazePropList() || mazePropList.equals(other.mazePropList)) + && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(entryId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(curMapEntryId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(curMapEntryId); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < unlockedTeleportList.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(unlockedTeleportList.array()[i]); } } @@ -651,23 +651,23 @@ public final class MazeMapDataOuterClass { } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < unlockedChestList.length(); i++) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(unlockedChestList.get(i)); - } - } - if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < mazeGroupList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 10); output.writeMessageNoTag(mazeGroupList.get(i)); } } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < mazePropList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 82); output.writeMessageNoTag(mazePropList.get(i)); } } + if ((bitField0_ & 0x00000080) != 0) { + for (int i = 0; i < unlockedChestList.length(); i++) { + output.writeRawByte((byte) 106); + output.writeMessageNoTag(unlockedChestList.get(i)); + } + } } @Override @@ -677,10 +677,10 @@ public final class MazeMapDataOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } if ((bitField0_ & 0x00000008) != 0) { size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList); @@ -689,14 +689,14 @@ public final class MazeMapDataOuterClass { size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); - } - if ((bitField0_ & 0x00000040) != 0) { size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000040) != 0) { size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); } + if ((bitField0_ & 0x00000080) != 0) { + size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); + } return size; } @@ -707,34 +707,34 @@ public final class MazeMapDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 112) { break; } } - case 56: { - // entryId - entryId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 112: { // curMapEntryId curMapEntryId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 120) { break; } } - case 42: { + case 120: { + // entryId + entryId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { // unlockedTeleportList [packed=true] input.readPackedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000008; @@ -748,29 +748,29 @@ public final class MazeMapDataOuterClass { input.readPackedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 18) { + if (tag != 10) { break; } } - case 18: { - // unlockedChestList - tag = input.readRepeatedMessage(unlockedChestList, tag); - bitField0_ |= 0x00000020; - if (tag != 98) { - break; - } - } - case 98: { + case 10: { // mazeGroupList tag = input.readRepeatedMessage(mazeGroupList, tag); - bitField0_ |= 0x00000040; - if (tag != 114) { + bitField0_ |= 0x00000020; + if (tag != 82) { break; } } - case 114: { + case 82: { // mazePropList tag = input.readRepeatedMessage(mazePropList, tag); + bitField0_ |= 0x00000040; + if (tag != 106) { + break; + } + } + case 106: { + // unlockedChestList + tag = input.readRepeatedMessage(unlockedChestList, tag); bitField0_ |= 0x00000080; if (tag != 0) { break; @@ -786,7 +786,7 @@ public final class MazeMapDataOuterClass { tag = input.readTag(); break; } - case 40: { + case 16: { // unlockedTeleportList [packed=false] tag = input.readRepeatedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000008; @@ -809,10 +809,10 @@ public final class MazeMapDataOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); + output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId); + output.writeUInt32(FieldNames.entryId, entryId); } if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList); @@ -821,14 +821,14 @@ public final class MazeMapDataOuterClass { output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); - } - if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); } + if ((bitField0_ & 0x00000080) != 0) { + output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); + } output.endObject(); } @@ -850,11 +850,11 @@ public final class MazeMapDataOuterClass { } break; } - case -1591558867: - case -2093663224: { - if (input.isAtField(FieldNames.entryId)) { + case 764919441: + case 2115673898: { + if (input.isAtField(FieldNames.curMapEntryId)) { if (!input.trySkipNullValue()) { - entryId = input.readUInt32(); + curMapEntryId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -862,11 +862,11 @@ public final class MazeMapDataOuterClass { } break; } - case 764919441: - case 2115673898: { - if (input.isAtField(FieldNames.curMapEntryId)) { + case -1591558867: + case -2093663224: { + if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { - curMapEntryId = input.readUInt32(); + entryId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -898,24 +898,12 @@ public final class MazeMapDataOuterClass { } break; } - case -337762404: - case 231688696: { - if (input.isAtField(FieldNames.unlockedChestList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(unlockedChestList); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } case -317054274: case 407435998: { if (input.isAtField(FieldNames.mazeGroupList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(mazeGroupList); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -927,6 +915,18 @@ public final class MazeMapDataOuterClass { if (input.isAtField(FieldNames.mazePropList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(mazePropList); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } + case -337762404: + case 231688696: { + if (input.isAtField(FieldNames.unlockedChestList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(unlockedChestList); bitField0_ |= 0x00000080; } } else { @@ -988,19 +988,19 @@ public final class MazeMapDataOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id"); + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + static final FieldName unlockedTeleportList = FieldName.forField("unlockedTeleportList", "unlocked_teleport_list"); static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_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 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 2672e70..12997d4 100644 --- a/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java @@ -19,20 +19,20 @@ public final class MazePropOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 config_id = 8; + * optional uint32 group_id = 1; + */ + private int groupId; + + /** + * optional uint32 config_id = 4; */ private int configId; /** - * optional uint32 state = 14; + * optional uint32 state = 7; */ private int state; - /** - * optional uint32 group_id = 15; - */ - private int groupId; - private MazeProp() { } @@ -44,99 +44,25 @@ public final class MazePropOuterClass { } /** - * optional uint32 config_id = 8; - * @return whether the configId field is set + * optional uint32 group_id = 1; + * @return whether the groupId field is set */ - public boolean hasConfigId() { + public boolean hasGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 config_id = 8; - * @return this - */ - public MazeProp clearConfigId() { - bitField0_ &= ~0x00000001; - configId = 0; - return this; - } - - /** - * optional uint32 config_id = 8; - * @return the configId - */ - public int getConfigId() { - return configId; - } - - /** - * optional uint32 config_id = 8; - * @param value the configId to set - * @return this - */ - public MazeProp setConfigId(final int value) { - bitField0_ |= 0x00000001; - configId = value; - return this; - } - - /** - * optional uint32 state = 14; - * @return whether the state field is set - */ - public boolean hasState() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 state = 14; - * @return this - */ - public MazeProp clearState() { - bitField0_ &= ~0x00000002; - state = 0; - return this; - } - - /** - * optional uint32 state = 14; - * @return the state - */ - public int getState() { - return state; - } - - /** - * optional uint32 state = 14; - * @param value the state to set - * @return this - */ - public MazeProp setState(final int value) { - bitField0_ |= 0x00000002; - state = 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; + * optional uint32 group_id = 1; * @return this */ public MazeProp clearGroupId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; groupId = 0; return this; } /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 1; * @return the groupId */ public int getGroupId() { @@ -144,24 +70,98 @@ public final class MazePropOuterClass { } /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 1; * @param value the groupId to set * @return this */ public MazeProp setGroupId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; groupId = value; return this; } + /** + * optional uint32 config_id = 4; + * @return whether the configId field is set + */ + public boolean hasConfigId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 config_id = 4; + * @return this + */ + public MazeProp clearConfigId() { + bitField0_ &= ~0x00000002; + configId = 0; + return this; + } + + /** + * optional uint32 config_id = 4; + * @return the configId + */ + public int getConfigId() { + return configId; + } + + /** + * optional uint32 config_id = 4; + * @param value the configId to set + * @return this + */ + public MazeProp setConfigId(final int value) { + bitField0_ |= 0x00000002; + configId = value; + return this; + } + + /** + * optional uint32 state = 7; + * @return whether the state field is set + */ + public boolean hasState() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 state = 7; + * @return this + */ + public MazeProp clearState() { + bitField0_ &= ~0x00000004; + state = 0; + return this; + } + + /** + * optional uint32 state = 7; + * @return the state + */ + public int getState() { + return state; + } + + /** + * optional uint32 state = 7; + * @param value the state to set + * @return this + */ + public MazeProp setState(final int value) { + bitField0_ |= 0x00000004; + state = value; + return this; + } + @Override public MazeProp copyFrom(final MazeProp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + groupId = other.groupId; configId = other.configId; state = other.state; - groupId = other.groupId; } return this; } @@ -172,15 +172,15 @@ public final class MazePropOuterClass { return this; } cachedSize = -1; + if (other.hasGroupId()) { + setGroupId(other.groupId); + } if (other.hasConfigId()) { setConfigId(other.configId); } if (other.hasState()) { setState(other.state); } - if (other.hasGroupId()) { - setGroupId(other.groupId); - } return this; } @@ -191,9 +191,9 @@ public final class MazePropOuterClass { } cachedSize = -1; bitField0_ = 0; + groupId = 0; configId = 0; state = 0; - groupId = 0; return this; } @@ -217,24 +217,24 @@ public final class MazePropOuterClass { } MazeProp other = (MazeProp) o; return bitField0_ == other.bitField0_ + && (!hasGroupId() || groupId == other.groupId) && (!hasConfigId() || configId == other.configId) - && (!hasState() || state == other.state) - && (!hasGroupId() || groupId == other.groupId); + && (!hasState() || state == other.state); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(configId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(state); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(configId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(state); } } @@ -242,13 +242,13 @@ public final class MazePropOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(configId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(state); + size += 1 + ProtoSink.computeUInt32SizeNoTag(configId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(state); } return size; } @@ -260,27 +260,27 @@ public final class MazePropOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // configId - configId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // state - state = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 8: { // groupId groupId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // configId + configId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // state + state = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public final class MazePropOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.configId, configId); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.state, state); + output.writeUInt32(FieldNames.configId, configId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.state, state); } output.endObject(); } @@ -323,12 +323,24 @@ public final class MazePropOuterClass { } 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 -580140035: case -804450504: { if (input.isAtField(FieldNames.configId)) { if (!input.trySkipNullValue()) { configId = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -339,18 +351,6 @@ public final class MazePropOuterClass { if (input.isAtField(FieldNames.state)) { if (!input.trySkipNullValue()) { state = 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 { @@ -410,11 +410,11 @@ public final class MazePropOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName configId = FieldName.forField("configId", "config_id"); static final FieldName state = FieldName.forField("state"); - - static final FieldName groupId = FieldName.forField("groupId", "group_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java b/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java index bcc45df..5fcd3cb 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 progress = 4; + * optional uint32 progress = 3; */ private int progress; /** - * optional uint32 id = 14; + * optional uint32 id = 4; */ private int id; /** - * optional .MissionStatus status = 8; + * optional .MissionStatus status = 1; */ private int status; @@ -44,7 +44,7 @@ public final class MissionOuterClass { } /** - * optional uint32 progress = 4; + * optional uint32 progress = 3; * @return whether the progress field is set */ public boolean hasProgress() { @@ -52,7 +52,7 @@ public final class MissionOuterClass { } /** - * optional uint32 progress = 4; + * optional uint32 progress = 3; * @return this */ public Mission clearProgress() { @@ -62,7 +62,7 @@ public final class MissionOuterClass { } /** - * optional uint32 progress = 4; + * optional uint32 progress = 3; * @return the progress */ public int getProgress() { @@ -70,7 +70,7 @@ public final class MissionOuterClass { } /** - * optional uint32 progress = 4; + * optional uint32 progress = 3; * @param value the progress to set * @return this */ @@ -81,7 +81,7 @@ public final class MissionOuterClass { } /** - * optional uint32 id = 14; + * optional uint32 id = 4; * @return whether the id field is set */ public boolean hasId() { @@ -89,7 +89,7 @@ public final class MissionOuterClass { } /** - * optional uint32 id = 14; + * optional uint32 id = 4; * @return this */ public Mission clearId() { @@ -99,7 +99,7 @@ public final class MissionOuterClass { } /** - * optional uint32 id = 14; + * optional uint32 id = 4; * @return the id */ public int getId() { @@ -107,7 +107,7 @@ public final class MissionOuterClass { } /** - * optional uint32 id = 14; + * optional uint32 id = 4; * @param value the id to set * @return this */ @@ -118,7 +118,7 @@ public final class MissionOuterClass { } /** - * optional .MissionStatus status = 8; + * optional .MissionStatus status = 1; * @return whether the status field is set */ public boolean hasStatus() { @@ -126,7 +126,7 @@ public final class MissionOuterClass { } /** - * optional .MissionStatus status = 8; + * optional .MissionStatus status = 1; * @return this */ public Mission clearStatus() { @@ -136,7 +136,7 @@ public final class MissionOuterClass { } /** - * optional .MissionStatus status = 8; + * optional .MissionStatus status = 1; * @return the status */ public MissionStatusOuterClass.MissionStatus getStatus() { @@ -169,7 +169,7 @@ public final class MissionOuterClass { } /** - * optional .MissionStatus status = 8; + * optional .MissionStatus status = 1; * @param value the status to set * @return this */ @@ -250,15 +250,15 @@ public final class MissionOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(progress); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 8); output.writeEnumNoTag(status); } } @@ -285,25 +285,25 @@ public final class MissionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 24: { // progress progress = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 32) { break; } } - case 112: { + case 32: { // id id = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 8) { break; } } - case 64: { + case 8: { // status final int value = input.readInt32(); if (MissionStatusOuterClass.MissionStatus.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java b/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java index 960da9f..27e09e5 100644 --- a/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java @@ -19,12 +19,12 @@ public final class MonsterArchiveOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 monster_id = 1; + * optional uint32 monster_id = 2; */ private int monsterId; /** - * optional uint32 num = 13; + * optional uint32 num = 9; */ private int num; @@ -39,7 +39,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 monster_id = 1; + * optional uint32 monster_id = 2; * @return whether the monsterId field is set */ public boolean hasMonsterId() { @@ -47,7 +47,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 monster_id = 1; + * optional uint32 monster_id = 2; * @return this */ public MonsterArchive clearMonsterId() { @@ -57,7 +57,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 monster_id = 1; + * optional uint32 monster_id = 2; * @return the monsterId */ public int getMonsterId() { @@ -65,7 +65,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 monster_id = 1; + * optional uint32 monster_id = 2; * @param value the monsterId to set * @return this */ @@ -76,7 +76,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 num = 13; + * optional uint32 num = 9; * @return whether the num field is set */ public boolean hasNum() { @@ -84,7 +84,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 num = 13; + * optional uint32 num = 9; * @return this */ public MonsterArchive clearNum() { @@ -94,7 +94,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 num = 13; + * optional uint32 num = 9; * @return the num */ public int getNum() { @@ -102,7 +102,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 num = 13; + * optional uint32 num = 9; * @param value the num to set * @return this */ @@ -177,11 +177,11 @@ public final class MonsterArchiveOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(monsterId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(num); } } @@ -205,16 +205,16 @@ public final class MonsterArchiveOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 16: { // monsterId monsterId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { + case 72: { // num num = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java index 0cff53a..0305f02 100644 --- a/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java @@ -19,12 +19,12 @@ public final class MotionInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .Vector rot = 9; + * optional .Vector rot = 2; */ private final VectorOuterClass.Vector rot = VectorOuterClass.Vector.newInstance(); /** - * optional .Vector pos = 13; + * optional .Vector pos = 6; */ private final VectorOuterClass.Vector pos = VectorOuterClass.Vector.newInstance(); @@ -39,7 +39,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector rot = 9; + * optional .Vector rot = 2; * @return whether the rot field is set */ public boolean hasRot() { @@ -47,7 +47,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector rot = 9; + * optional .Vector rot = 2; * @return this */ public MotionInfo clearRot() { @@ -57,7 +57,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector rot = 9; + * optional .Vector rot = 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. @@ -71,7 +71,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector rot = 9; + * optional .Vector rot = 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 @@ -85,7 +85,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector rot = 9; + * optional .Vector rot = 2; * @param value the rot to set * @return this */ @@ -96,7 +96,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector pos = 13; + * optional .Vector pos = 6; * @return whether the pos field is set */ public boolean hasPos() { @@ -104,7 +104,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector pos = 13; + * optional .Vector pos = 6; * @return this */ public MotionInfo clearPos() { @@ -114,7 +114,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector pos = 13; + * optional .Vector pos = 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. @@ -128,7 +128,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector pos = 13; + * optional .Vector pos = 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 @@ -142,7 +142,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector pos = 13; + * optional .Vector pos = 6; * @param value the pos to set * @return this */ @@ -219,11 +219,11 @@ public final class MotionInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 18); output.writeMessageNoTag(rot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 50); output.writeMessageNoTag(pos); } } @@ -247,16 +247,16 @@ public final class MotionInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 18: { // rot input.readMessage(rot); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 50) { break; } } - case 106: { + case 50: { // pos input.readMessage(pos); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java index d8888d0..87c4577 100644 --- a/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java @@ -20,7 +20,7 @@ public final class NewMailScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 mail_id_list = 1; + * repeated uint32 mail_id_list = 5; */ private final RepeatedInt mailIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 1; + * repeated uint32 mail_id_list = 5; * @return whether the mailIdList field is set */ public boolean hasMailIdList() { @@ -43,7 +43,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 1; + * repeated uint32 mail_id_list = 5; * @return this */ public NewMailScNotify clearMailIdList() { @@ -53,7 +53,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 1; + * repeated uint32 mail_id_list = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 1; + * repeated uint32 mail_id_list = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 1; + * repeated uint32 mail_id_list = 5; * @param value the mailIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 1; + * repeated uint32 mail_id_list = 5; * @param values the mailIdList to add * @return this */ @@ -163,7 +163,7 @@ public final class NewMailScNotifyOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < mailIdList.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(mailIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class NewMailScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 42: { // mailIdList [packed=true] input.readPackedUInt32(mailIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class NewMailScNotifyOuterClass { tag = input.readTag(); break; } - case 8: { + case 40: { // mailIdList [packed=false] tag = input.readRepeatedUInt32(mailIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java index 047ab3a..f21dda3 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 = 8; + * optional .NpcRogueInfo rogue_info = 12; */ private final NpcRogueInfoOuterClass.NpcRogueInfo rogueInfo = NpcRogueInfoOuterClass.NpcRogueInfo.newInstance(); @@ -34,7 +34,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 8; + * optional .NpcRogueInfo rogue_info = 12; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { @@ -42,7 +42,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 8; + * optional .NpcRogueInfo rogue_info = 12; * @return this */ public NpcExtraInfo clearRogueInfo() { @@ -52,7 +52,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 8; + * optional .NpcRogueInfo rogue_info = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 8; + * optional .NpcRogueInfo rogue_info = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 8; + * optional .NpcRogueInfo rogue_info = 12; * @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) 66); + output.writeRawByte((byte) 98); output.writeMessageNoTag(rogueInfo); } } @@ -171,7 +171,7 @@ public final class NpcExtraInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 98: { // 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 a22392b..8fbacd7 100644 --- a/src/generated/main/emu/lunarcore/proto/NpcRogueInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/NpcRogueInfoOuterClass.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.RepeatedMessage; public final class NpcRogueInfoOuterClass { /** @@ -20,48 +19,38 @@ public final class NpcRogueInfoOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     * repeated KELFICDMDDG CEEFGPGODAA = 9;
-     *
- * - * optional uint32 GENMIFOCMJA = 1; + * optional uint32 KKCPLMGIADL = 3; */ - private int gENMIFOCMJA; + private int kKCPLMGIADL; /** - * optional uint32 rogue_npc_id = 6; + * optional uint32 dialogue_group_id = 4; + */ + private int dialogueGroupId; + + /** + * optional uint32 rogue_npc_id = 8; */ private int rogueNpcId; /** - * optional uint32 INJPFALMDHJ = 12; - */ - private int iNJPFALMDHJ; - - /** - * optional uint32 GBMDBBBMBEJ = 14; - */ - private int gBMDBBBMBEJ; - - /** - * optional bool finish_dialogue = 5; + * 
+     *  unk
+     *
+ * + * optional bool finish_dialogue = 1; */ private boolean finishDialogue; /** - * optional bool MNINDBMAJKL = 7; + * optional bool LCKILOCIFJH = 6; */ - private boolean mNINDBMAJKL; + private boolean lCKILOCIFJH; /** - * optional bool AGBFDIIKPKF = 13; + * optional bool AAHKFINCBIL = 13; */ - private boolean aGBFDIIKPKF; - - /** - * repeated .NpcRogueInfo.HCGOEHLPCMDEntry HCGOEHLPCMD = 15; - */ - private final RepeatedMessage hCGOEHLPCMD = RepeatedMessage.newEmptyInstance(HCGOEHLPCMDEntry.getFactory()); + private boolean aAHKFINCBIL; private NpcRogueInfo() { } @@ -74,78 +63,99 @@ public final class NpcRogueInfoOuterClass { } /** - * 
-     * repeated KELFICDMDDG CEEFGPGODAA = 9;
-     *
- * - * optional uint32 GENMIFOCMJA = 1; - * @return whether the gENMIFOCMJA field is set + * optional uint32 KKCPLMGIADL = 3; + * @return whether the kKCPLMGIADL field is set */ - public boolean hasGENMIFOCMJA() { + public boolean hasKKCPLMGIADL() { return (bitField0_ & 0x00000001) != 0; } /** - * 
-     * repeated KELFICDMDDG CEEFGPGODAA = 9;
-     *
- * - * optional uint32 GENMIFOCMJA = 1; + * optional uint32 KKCPLMGIADL = 3; * @return this */ - public NpcRogueInfo clearGENMIFOCMJA() { + public NpcRogueInfo clearKKCPLMGIADL() { bitField0_ &= ~0x00000001; - gENMIFOCMJA = 0; + kKCPLMGIADL = 0; return this; } /** - * 
-     * repeated KELFICDMDDG CEEFGPGODAA = 9;
-     *
- * - * optional uint32 GENMIFOCMJA = 1; - * @return the gENMIFOCMJA + * optional uint32 KKCPLMGIADL = 3; + * @return the kKCPLMGIADL */ - public int getGENMIFOCMJA() { - return gENMIFOCMJA; + public int getKKCPLMGIADL() { + return kKCPLMGIADL; } /** - * 
-     * repeated KELFICDMDDG CEEFGPGODAA = 9;
-     *
- * - * optional uint32 GENMIFOCMJA = 1; - * @param value the gENMIFOCMJA to set + * optional uint32 KKCPLMGIADL = 3; + * @param value the kKCPLMGIADL to set * @return this */ - public NpcRogueInfo setGENMIFOCMJA(final int value) { + public NpcRogueInfo setKKCPLMGIADL(final int value) { bitField0_ |= 0x00000001; - gENMIFOCMJA = value; + kKCPLMGIADL = value; return this; } /** - * optional uint32 rogue_npc_id = 6; - * @return whether the rogueNpcId field is set + * optional uint32 dialogue_group_id = 4; + * @return whether the dialogueGroupId field is set */ - public boolean hasRogueNpcId() { + public boolean hasDialogueGroupId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 rogue_npc_id = 6; + * optional uint32 dialogue_group_id = 4; + * @return this + */ + public NpcRogueInfo clearDialogueGroupId() { + bitField0_ &= ~0x00000002; + dialogueGroupId = 0; + return this; + } + + /** + * optional uint32 dialogue_group_id = 4; + * @return the dialogueGroupId + */ + public int getDialogueGroupId() { + return dialogueGroupId; + } + + /** + * optional uint32 dialogue_group_id = 4; + * @param value the dialogueGroupId to set + * @return this + */ + public NpcRogueInfo setDialogueGroupId(final int value) { + bitField0_ |= 0x00000002; + dialogueGroupId = value; + return this; + } + + /** + * optional uint32 rogue_npc_id = 8; + * @return whether the rogueNpcId field is set + */ + public boolean hasRogueNpcId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 rogue_npc_id = 8; * @return this */ public NpcRogueInfo clearRogueNpcId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; rogueNpcId = 0; return this; } /** - * optional uint32 rogue_npc_id = 6; + * optional uint32 rogue_npc_id = 8; * @return the rogueNpcId */ public int getRogueNpcId() { @@ -153,110 +163,48 @@ public final class NpcRogueInfoOuterClass { } /** - * optional uint32 rogue_npc_id = 6; + * optional uint32 rogue_npc_id = 8; * @param value the rogueNpcId to set * @return this */ public NpcRogueInfo setRogueNpcId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; rogueNpcId = value; return this; } /** - * optional uint32 INJPFALMDHJ = 12; - * @return whether the iNJPFALMDHJ field is set + * 
+     *  unk
+     *
+ * + * optional bool finish_dialogue = 1; + * @return whether the finishDialogue field is set */ - public boolean hasINJPFALMDHJ() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 INJPFALMDHJ = 12; - * @return this - */ - public NpcRogueInfo clearINJPFALMDHJ() { - bitField0_ &= ~0x00000004; - iNJPFALMDHJ = 0; - return this; - } - - /** - * optional uint32 INJPFALMDHJ = 12; - * @return the iNJPFALMDHJ - */ - public int getINJPFALMDHJ() { - return iNJPFALMDHJ; - } - - /** - * optional uint32 INJPFALMDHJ = 12; - * @param value the iNJPFALMDHJ to set - * @return this - */ - public NpcRogueInfo setINJPFALMDHJ(final int value) { - bitField0_ |= 0x00000004; - iNJPFALMDHJ = value; - return this; - } - - /** - * optional uint32 GBMDBBBMBEJ = 14; - * @return whether the gBMDBBBMBEJ field is set - */ - public boolean hasGBMDBBBMBEJ() { + public boolean hasFinishDialogue() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 GBMDBBBMBEJ = 14; - * @return this - */ - public NpcRogueInfo clearGBMDBBBMBEJ() { - bitField0_ &= ~0x00000008; - gBMDBBBMBEJ = 0; - return this; - } - - /** - * optional uint32 GBMDBBBMBEJ = 14; - * @return the gBMDBBBMBEJ - */ - public int getGBMDBBBMBEJ() { - return gBMDBBBMBEJ; - } - - /** - * optional uint32 GBMDBBBMBEJ = 14; - * @param value the gBMDBBBMBEJ to set - * @return this - */ - public NpcRogueInfo setGBMDBBBMBEJ(final int value) { - bitField0_ |= 0x00000008; - gBMDBBBMBEJ = value; - return this; - } - - /** - * optional bool finish_dialogue = 5; - * @return whether the finishDialogue field is set - */ - public boolean hasFinishDialogue() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional bool finish_dialogue = 5; + * 
+     *  unk
+     *
+ * + * optional bool finish_dialogue = 1; * @return this */ public NpcRogueInfo clearFinishDialogue() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; finishDialogue = false; return this; } /** - * optional bool finish_dialogue = 5; + * 
+     *  unk
+     *
+ * + * optional bool finish_dialogue = 1; * @return the finishDialogue */ public boolean getFinishDialogue() { @@ -264,155 +212,91 @@ public final class NpcRogueInfoOuterClass { } /** - * optional bool finish_dialogue = 5; + * 
+     *  unk
+     *
+ * + * optional bool finish_dialogue = 1; * @param value the finishDialogue to set * @return this */ public NpcRogueInfo setFinishDialogue(final boolean value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; finishDialogue = value; return this; } /** - * optional bool MNINDBMAJKL = 7; - * @return whether the mNINDBMAJKL field is set + * optional bool LCKILOCIFJH = 6; + * @return whether the lCKILOCIFJH field is set */ - public boolean hasMNINDBMAJKL() { + public boolean hasLCKILOCIFJH() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional bool LCKILOCIFJH = 6; + * @return this + */ + public NpcRogueInfo clearLCKILOCIFJH() { + bitField0_ &= ~0x00000010; + lCKILOCIFJH = false; + return this; + } + + /** + * optional bool LCKILOCIFJH = 6; + * @return the lCKILOCIFJH + */ + public boolean getLCKILOCIFJH() { + return lCKILOCIFJH; + } + + /** + * optional bool LCKILOCIFJH = 6; + * @param value the lCKILOCIFJH to set + * @return this + */ + public NpcRogueInfo setLCKILOCIFJH(final boolean value) { + bitField0_ |= 0x00000010; + lCKILOCIFJH = value; + return this; + } + + /** + * optional bool AAHKFINCBIL = 13; + * @return whether the aAHKFINCBIL field is set + */ + public boolean hasAAHKFINCBIL() { return (bitField0_ & 0x00000020) != 0; } /** - * optional bool MNINDBMAJKL = 7; + * optional bool AAHKFINCBIL = 13; * @return this */ - public NpcRogueInfo clearMNINDBMAJKL() { + public NpcRogueInfo clearAAHKFINCBIL() { bitField0_ &= ~0x00000020; - mNINDBMAJKL = false; + aAHKFINCBIL = false; return this; } /** - * optional bool MNINDBMAJKL = 7; - * @return the mNINDBMAJKL + * optional bool AAHKFINCBIL = 13; + * @return the aAHKFINCBIL */ - public boolean getMNINDBMAJKL() { - return mNINDBMAJKL; + public boolean getAAHKFINCBIL() { + return aAHKFINCBIL; } /** - * optional bool MNINDBMAJKL = 7; - * @param value the mNINDBMAJKL to set + * optional bool AAHKFINCBIL = 13; + * @param value the aAHKFINCBIL to set * @return this */ - public NpcRogueInfo setMNINDBMAJKL(final boolean value) { + public NpcRogueInfo setAAHKFINCBIL(final boolean value) { bitField0_ |= 0x00000020; - mNINDBMAJKL = value; - return this; - } - - /** - * optional bool AGBFDIIKPKF = 13; - * @return whether the aGBFDIIKPKF field is set - */ - public boolean hasAGBFDIIKPKF() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional bool AGBFDIIKPKF = 13; - * @return this - */ - public NpcRogueInfo clearAGBFDIIKPKF() { - bitField0_ &= ~0x00000040; - aGBFDIIKPKF = false; - return this; - } - - /** - * optional bool AGBFDIIKPKF = 13; - * @return the aGBFDIIKPKF - */ - public boolean getAGBFDIIKPKF() { - return aGBFDIIKPKF; - } - - /** - * optional bool AGBFDIIKPKF = 13; - * @param value the aGBFDIIKPKF to set - * @return this - */ - public NpcRogueInfo setAGBFDIIKPKF(final boolean value) { - bitField0_ |= 0x00000040; - aGBFDIIKPKF = value; - return this; - } - - /** - * repeated .NpcRogueInfo.HCGOEHLPCMDEntry HCGOEHLPCMD = 15; - * @return whether the hCGOEHLPCMD field is set - */ - public boolean hasHCGOEHLPCMD() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated .NpcRogueInfo.HCGOEHLPCMDEntry HCGOEHLPCMD = 15; - * @return this - */ - public NpcRogueInfo clearHCGOEHLPCMD() { - bitField0_ &= ~0x00000080; - hCGOEHLPCMD.clear(); - return this; - } - - /** - * repeated .NpcRogueInfo.HCGOEHLPCMDEntry HCGOEHLPCMD = 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 #getMutableHCGOEHLPCMD()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getHCGOEHLPCMD() { - return hCGOEHLPCMD; - } - - /** - * repeated .NpcRogueInfo.HCGOEHLPCMDEntry HCGOEHLPCMD = 15; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableHCGOEHLPCMD() { - bitField0_ |= 0x00000080; - return hCGOEHLPCMD; - } - - /** - * repeated .NpcRogueInfo.HCGOEHLPCMDEntry HCGOEHLPCMD = 15; - * @param value the hCGOEHLPCMD to add - * @return this - */ - public NpcRogueInfo addHCGOEHLPCMD(final HCGOEHLPCMDEntry value) { - bitField0_ |= 0x00000080; - hCGOEHLPCMD.add(value); - return this; - } - - /** - * repeated .NpcRogueInfo.HCGOEHLPCMDEntry HCGOEHLPCMD = 15; - * @param values the hCGOEHLPCMD to add - * @return this - */ - public NpcRogueInfo addAllHCGOEHLPCMD(final HCGOEHLPCMDEntry... values) { - bitField0_ |= 0x00000080; - hCGOEHLPCMD.addAll(values); + aAHKFINCBIL = value; return this; } @@ -421,14 +305,12 @@ public final class NpcRogueInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - gENMIFOCMJA = other.gENMIFOCMJA; + kKCPLMGIADL = other.kKCPLMGIADL; + dialogueGroupId = other.dialogueGroupId; rogueNpcId = other.rogueNpcId; - iNJPFALMDHJ = other.iNJPFALMDHJ; - gBMDBBBMBEJ = other.gBMDBBBMBEJ; finishDialogue = other.finishDialogue; - mNINDBMAJKL = other.mNINDBMAJKL; - aGBFDIIKPKF = other.aGBFDIIKPKF; - hCGOEHLPCMD.copyFrom(other.hCGOEHLPCMD); + lCKILOCIFJH = other.lCKILOCIFJH; + aAHKFINCBIL = other.aAHKFINCBIL; } return this; } @@ -439,29 +321,23 @@ public final class NpcRogueInfoOuterClass { return this; } cachedSize = -1; - if (other.hasGENMIFOCMJA()) { - setGENMIFOCMJA(other.gENMIFOCMJA); + if (other.hasKKCPLMGIADL()) { + setKKCPLMGIADL(other.kKCPLMGIADL); + } + if (other.hasDialogueGroupId()) { + setDialogueGroupId(other.dialogueGroupId); } if (other.hasRogueNpcId()) { setRogueNpcId(other.rogueNpcId); } - if (other.hasINJPFALMDHJ()) { - setINJPFALMDHJ(other.iNJPFALMDHJ); - } - if (other.hasGBMDBBBMBEJ()) { - setGBMDBBBMBEJ(other.gBMDBBBMBEJ); - } if (other.hasFinishDialogue()) { setFinishDialogue(other.finishDialogue); } - if (other.hasMNINDBMAJKL()) { - setMNINDBMAJKL(other.mNINDBMAJKL); + if (other.hasLCKILOCIFJH()) { + setLCKILOCIFJH(other.lCKILOCIFJH); } - if (other.hasAGBFDIIKPKF()) { - setAGBFDIIKPKF(other.aGBFDIIKPKF); - } - if (other.hasHCGOEHLPCMD()) { - getMutableHCGOEHLPCMD().addAll(other.hCGOEHLPCMD); + if (other.hasAAHKFINCBIL()) { + setAAHKFINCBIL(other.aAHKFINCBIL); } return this; } @@ -473,14 +349,12 @@ public final class NpcRogueInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - gENMIFOCMJA = 0; + kKCPLMGIADL = 0; + dialogueGroupId = 0; rogueNpcId = 0; - iNJPFALMDHJ = 0; - gBMDBBBMBEJ = 0; finishDialogue = false; - mNINDBMAJKL = false; - aGBFDIIKPKF = false; - hCGOEHLPCMD.clear(); + lCKILOCIFJH = false; + aAHKFINCBIL = false; return this; } @@ -491,7 +365,6 @@ public final class NpcRogueInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - hCGOEHLPCMD.clearQuick(); return this; } @@ -505,51 +378,39 @@ public final class NpcRogueInfoOuterClass { } NpcRogueInfo other = (NpcRogueInfo) o; return bitField0_ == other.bitField0_ - && (!hasGENMIFOCMJA() || gENMIFOCMJA == other.gENMIFOCMJA) + && (!hasKKCPLMGIADL() || kKCPLMGIADL == other.kKCPLMGIADL) + && (!hasDialogueGroupId() || dialogueGroupId == other.dialogueGroupId) && (!hasRogueNpcId() || rogueNpcId == other.rogueNpcId) - && (!hasINJPFALMDHJ() || iNJPFALMDHJ == other.iNJPFALMDHJ) - && (!hasGBMDBBBMBEJ() || gBMDBBBMBEJ == other.gBMDBBBMBEJ) && (!hasFinishDialogue() || finishDialogue == other.finishDialogue) - && (!hasMNINDBMAJKL() || mNINDBMAJKL == other.mNINDBMAJKL) - && (!hasAGBFDIIKPKF() || aGBFDIIKPKF == other.aGBFDIIKPKF) - && (!hasHCGOEHLPCMD() || hCGOEHLPCMD.equals(other.hCGOEHLPCMD)); + && (!hasLCKILOCIFJH() || lCKILOCIFJH == other.lCKILOCIFJH) + && (!hasAAHKFINCBIL() || aAHKFINCBIL == other.aAHKFINCBIL); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(gENMIFOCMJA); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(kKCPLMGIADL); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(rogueNpcId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(dialogueGroupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(iNJPFALMDHJ); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(rogueNpcId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(gBMDBBBMBEJ); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeBoolNoTag(finishDialogue); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 48); + output.writeBoolNoTag(lCKILOCIFJH); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 56); - output.writeBoolNoTag(mNINDBMAJKL); - } - if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 104); - output.writeBoolNoTag(aGBFDIIKPKF); - } - if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < hCGOEHLPCMD.length(); i++) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(hCGOEHLPCMD.get(i)); - } + output.writeBoolNoTag(aAHKFINCBIL); } } @@ -557,16 +418,16 @@ public final class NpcRogueInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gENMIFOCMJA); + size += 1 + ProtoSink.computeUInt32SizeNoTag(kKCPLMGIADL); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueNpcId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueGroupId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(iNJPFALMDHJ); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueNpcId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gBMDBBBMBEJ); + size += 2; } if ((bitField0_ & 0x00000010) != 0) { size += 2; @@ -574,12 +435,6 @@ public final class NpcRogueInfoOuterClass { if ((bitField0_ & 0x00000020) != 0) { size += 2; } - if ((bitField0_ & 0x00000040) != 0) { - size += 2; - } - if ((bitField0_ & 0x00000080) != 0) { - size += (1 * hCGOEHLPCMD.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(hCGOEHLPCMD); - } return size; } @@ -590,73 +445,56 @@ public final class NpcRogueInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // gENMIFOCMJA - gENMIFOCMJA = input.readUInt32(); + case 24: { + // kKCPLMGIADL + kKCPLMGIADL = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // dialogueGroupId + dialogueGroupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // rogueNpcId + rogueNpcId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 8) { + break; + } + } + case 8: { + // finishDialogue + finishDialogue = input.readBool(); + bitField0_ |= 0x00000008; + tag = input.readTag(); if (tag != 48) { break; } } case 48: { - // rogueNpcId - rogueNpcId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // iNJPFALMDHJ - iNJPFALMDHJ = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // gBMDBBBMBEJ - gBMDBBBMBEJ = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // finishDialogue - finishDialogue = input.readBool(); + // lCKILOCIFJH + lCKILOCIFJH = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // mNINDBMAJKL - mNINDBMAJKL = input.readBool(); - bitField0_ |= 0x00000020; - tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // aGBFDIIKPKF - aGBFDIIKPKF = input.readBool(); - bitField0_ |= 0x00000040; + // aAHKFINCBIL + aAHKFINCBIL = input.readBool(); + bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { - // hCGOEHLPCMD - tag = input.readRepeatedMessage(hCGOEHLPCMD, tag); - bitField0_ |= 0x00000080; if (tag != 0) { break; } @@ -679,28 +517,22 @@ public final class NpcRogueInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.gENMIFOCMJA, gENMIFOCMJA); + output.writeUInt32(FieldNames.kKCPLMGIADL, kKCPLMGIADL); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.rogueNpcId, rogueNpcId); + output.writeUInt32(FieldNames.dialogueGroupId, dialogueGroupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.iNJPFALMDHJ, iNJPFALMDHJ); + output.writeUInt32(FieldNames.rogueNpcId, rogueNpcId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.gBMDBBBMBEJ, gBMDBBBMBEJ); - } - if ((bitField0_ & 0x00000010) != 0) { output.writeBool(FieldNames.finishDialogue, finishDialogue); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeBool(FieldNames.lCKILOCIFJH, lCKILOCIFJH); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeBool(FieldNames.mNINDBMAJKL, mNINDBMAJKL); - } - if ((bitField0_ & 0x00000040) != 0) { - output.writeBool(FieldNames.aGBFDIIKPKF, aGBFDIIKPKF); - } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.hCGOEHLPCMD, hCGOEHLPCMD); + output.writeBool(FieldNames.aAHKFINCBIL, aAHKFINCBIL); } output.endObject(); } @@ -712,10 +544,10 @@ public final class NpcRogueInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 543187766: { - if (input.isAtField(FieldNames.gENMIFOCMJA)) { + case -1332411111: { + if (input.isAtField(FieldNames.kKCPLMGIADL)) { if (!input.trySkipNullValue()) { - gENMIFOCMJA = input.readUInt32(); + kKCPLMGIADL = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -723,22 +555,23 @@ public final class NpcRogueInfoOuterClass { } break; } + case 1758320386: + case 1899979106: { + if (input.isAtField(FieldNames.dialogueGroupId)) { + if (!input.trySkipNullValue()) { + dialogueGroupId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case -1140086238: case 1751967038: { if (input.isAtField(FieldNames.rogueNpcId)) { if (!input.trySkipNullValue()) { rogueNpcId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 535806911: { - if (input.isAtField(FieldNames.iNJPFALMDHJ)) { - if (!input.trySkipNullValue()) { - iNJPFALMDHJ = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -746,22 +579,22 @@ public final class NpcRogueInfoOuterClass { } break; } - case -1904002038: { - if (input.isAtField(FieldNames.gBMDBBBMBEJ)) { - if (!input.trySkipNullValue()) { - gBMDBBBMBEJ = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case 552830859: case 764736516: { if (input.isAtField(FieldNames.finishDialogue)) { if (!input.trySkipNullValue()) { finishDialogue = input.readBool(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1901777798: { + if (input.isAtField(FieldNames.lCKILOCIFJH)) { + if (!input.trySkipNullValue()) { + lCKILOCIFJH = input.readBool(); bitField0_ |= 0x00000010; } } else { @@ -769,10 +602,10 @@ public final class NpcRogueInfoOuterClass { } break; } - case -1486036461: { - if (input.isAtField(FieldNames.mNINDBMAJKL)) { + case -287370838: { + if (input.isAtField(FieldNames.aAHKFINCBIL)) { if (!input.trySkipNullValue()) { - mNINDBMAJKL = input.readBool(); + aAHKFINCBIL = input.readBool(); bitField0_ |= 0x00000020; } } else { @@ -780,28 +613,6 @@ public final class NpcRogueInfoOuterClass { } break; } - case -1115149894: { - if (input.isAtField(FieldNames.aGBFDIIKPKF)) { - if (!input.trySkipNullValue()) { - aGBFDIIKPKF = input.readBool(); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1102985776: { - if (input.isAtField(FieldNames.hCGOEHLPCMD)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(hCGOEHLPCMD); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } default: { input.skipUnknownField(); break; @@ -841,331 +652,6 @@ public final class NpcRogueInfoOuterClass { return NpcRogueInfoFactory.INSTANCE; } - /** - * Protobuf type {@code HCGOEHLPCMDEntry} - */ - public static final class HCGOEHLPCMDEntry extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 key = 1; - */ - private int key; - - /** - * optional uint32 value = 2; - */ - private int value_; - - private HCGOEHLPCMDEntry() { - } - - /** - * @return a new empty instance of {@code HCGOEHLPCMDEntry} - */ - public static HCGOEHLPCMDEntry newInstance() { - return new HCGOEHLPCMDEntry(); - } - - /** - * optional uint32 key = 1; - * @return whether the key field is set - */ - public boolean hasKey() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 key = 1; - * @return this - */ - public HCGOEHLPCMDEntry clearKey() { - bitField0_ &= ~0x00000001; - key = 0; - return this; - } - - /** - * optional uint32 key = 1; - * @return the key - */ - public int getKey() { - return key; - } - - /** - * optional uint32 key = 1; - * @param value the key to set - * @return this - */ - public HCGOEHLPCMDEntry setKey(final int value) { - bitField0_ |= 0x00000001; - key = value; - return this; - } - - /** - * optional uint32 value = 2; - * @return whether the value_ field is set - */ - public boolean hasValue() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 value = 2; - * @return this - */ - public HCGOEHLPCMDEntry clearValue() { - bitField0_ &= ~0x00000002; - value_ = 0; - return this; - } - - /** - * optional uint32 value = 2; - * @return the value_ - */ - public int getValue() { - return value_; - } - - /** - * optional uint32 value = 2; - * @param value the value_ to set - * @return this - */ - public HCGOEHLPCMDEntry setValue(final int value) { - bitField0_ |= 0x00000002; - value_ = value; - return this; - } - - @Override - public HCGOEHLPCMDEntry copyFrom(final HCGOEHLPCMDEntry other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - key = other.key; - value_ = other.value_; - } - return this; - } - - @Override - public HCGOEHLPCMDEntry mergeFrom(final HCGOEHLPCMDEntry other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasKey()) { - setKey(other.key); - } - if (other.hasValue()) { - setValue(other.value_); - } - return this; - } - - @Override - public HCGOEHLPCMDEntry clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - key = 0; - value_ = 0; - return this; - } - - @Override - public HCGOEHLPCMDEntry 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 HCGOEHLPCMDEntry)) { - return false; - } - HCGOEHLPCMDEntry other = (HCGOEHLPCMDEntry) o; - return bitField0_ == other.bitField0_ - && (!hasKey() || key == other.key) - && (!hasValue() || value_ == other.value_); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(key); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(value_); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(key); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(value_); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public HCGOEHLPCMDEntry mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 8: { - // key - key = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { - // value_ - value_ = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.key, key); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.value_, value_); - } - output.endObject(); - } - - @Override - public HCGOEHLPCMDEntry mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case 106079: { - if (input.isAtField(FieldNames.key)) { - if (!input.trySkipNullValue()) { - key = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 111972721: { - if (input.isAtField(FieldNames.value_)) { - if (!input.trySkipNullValue()) { - value_ = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public HCGOEHLPCMDEntry clone() { - return new HCGOEHLPCMDEntry().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static HCGOEHLPCMDEntry parseFrom(final byte[] data) throws - InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new HCGOEHLPCMDEntry(), data).checkInitialized(); - } - - public static HCGOEHLPCMDEntry parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new HCGOEHLPCMDEntry(), input).checkInitialized(); - } - - public static HCGOEHLPCMDEntry parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new HCGOEHLPCMDEntry(), input).checkInitialized(); - } - - /** - * @return factory for creating HCGOEHLPCMDEntry messages - */ - public static MessageFactory getFactory() { - return HCGOEHLPCMDEntryFactory.INSTANCE; - } - - private enum HCGOEHLPCMDEntryFactory implements MessageFactory { - INSTANCE; - - @Override - public HCGOEHLPCMDEntry create() { - return HCGOEHLPCMDEntry.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName key = FieldName.forField("key"); - - static final FieldName value_ = FieldName.forField("value"); - } - } - private enum NpcRogueInfoFactory implements MessageFactory { INSTANCE; @@ -1179,21 +665,17 @@ public final class NpcRogueInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName gENMIFOCMJA = FieldName.forField("GENMIFOCMJA"); + static final FieldName kKCPLMGIADL = FieldName.forField("KKCPLMGIADL"); + + static final FieldName dialogueGroupId = FieldName.forField("dialogueGroupId", "dialogue_group_id"); static final FieldName rogueNpcId = FieldName.forField("rogueNpcId", "rogue_npc_id"); - static final FieldName iNJPFALMDHJ = FieldName.forField("INJPFALMDHJ"); - - static final FieldName gBMDBBBMBEJ = FieldName.forField("GBMDBBBMBEJ"); - static final FieldName finishDialogue = FieldName.forField("finishDialogue", "finish_dialogue"); - static final FieldName mNINDBMAJKL = FieldName.forField("MNINDBMAJKL"); + static final FieldName lCKILOCIFJH = FieldName.forField("LCKILOCIFJH"); - static final FieldName aGBFDIIKPKF = FieldName.forField("AGBFDIIKPKF"); - - static final FieldName hCGOEHLPCMD = FieldName.forField("HCGOEHLPCMD"); + static final FieldName aAHKFINCBIL = FieldName.forField("AAHKFINCBIL"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java index cc2db5a..2268d27 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 = 15; */ private int npcTalkId; @@ -34,7 +34,7 @@ public final class NpcTalkInfoOuterClass { } /** - * optional uint32 npc_talk_id = 3; + * optional uint32 npc_talk_id = 15; * @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 = 15; * @return this */ public NpcTalkInfo clearNpcTalkId() { @@ -52,7 +52,7 @@ public final class NpcTalkInfoOuterClass { } /** - * optional uint32 npc_talk_id = 3; + * optional uint32 npc_talk_id = 15; * @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 = 15; * @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) 120); output.writeUInt32NoTag(npcTalkId); } } @@ -150,7 +150,7 @@ public final class NpcTalkInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 120: { // 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 1e375b4..7316022 100644 --- a/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java @@ -21,47 +21,47 @@ public final class PVEBattleResultCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 client_res_version = 2; - */ - private int clientResVersion; - - /** - * optional uint32 battle_id = 3; - */ - private int battleId; - - /** - * optional uint32 stage_id = 11; - */ - private int stageId; - - /** - * optional uint32 cost_time = 14; + * optional uint32 cost_time = 8; */ private int costTime; /** - * optional .BattleEndStatus end_status = 12; + * optional uint32 battle_id = 11; + */ + private int battleId; + + /** + * optional uint32 client_res_version = 12; + */ + private int clientResVersion; + + /** + * optional uint32 stage_id = 14; + */ + private int stageId; + + /** + * optional .BattleEndStatus end_status = 6; */ private int endStatus; /** - * optional bool is_ai_consider_ultra_skill = 15; + * optional bool is_ai_consider_ultra_skill = 10; */ private boolean isAiConsiderUltraSkill; /** - * optional .BattleStatistics stt = 8; + * optional .BattleStatistics stt = 3; */ private final BattleStatisticsOuterClass.BattleStatistics stt = BattleStatisticsOuterClass.BattleStatistics.newInstance(); /** - * optional bytes turn_snapshot_hash = 13; + * optional bytes turn_snapshot_hash = 1; */ private final RepeatedByte turnSnapshotHash = RepeatedByte.newEmptyInstance(); /** - * repeated .BattleOp op_list = 1; + * repeated .BattleOp op_list = 5; */ private final RepeatedMessage opList = RepeatedMessage.newEmptyInstance(BattleOpOuterClass.BattleOp.getFactory()); @@ -76,44 +76,44 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 client_res_version = 2; - * @return whether the clientResVersion field is set + * optional uint32 cost_time = 8; + * @return whether the costTime field is set */ - public boolean hasClientResVersion() { + public boolean hasCostTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 client_res_version = 2; + * optional uint32 cost_time = 8; * @return this */ - public PVEBattleResultCsReq clearClientResVersion() { + public PVEBattleResultCsReq clearCostTime() { bitField0_ &= ~0x00000001; - clientResVersion = 0; + costTime = 0; return this; } /** - * optional uint32 client_res_version = 2; - * @return the clientResVersion + * optional uint32 cost_time = 8; + * @return the costTime */ - public int getClientResVersion() { - return clientResVersion; + public int getCostTime() { + return costTime; } /** - * optional uint32 client_res_version = 2; - * @param value the clientResVersion to set + * optional uint32 cost_time = 8; + * @param value the costTime to set * @return this */ - public PVEBattleResultCsReq setClientResVersion(final int value) { + public PVEBattleResultCsReq setCostTime(final int value) { bitField0_ |= 0x00000001; - clientResVersion = value; + costTime = value; return this; } /** - * optional uint32 battle_id = 3; + * optional uint32 battle_id = 11; * @return whether the battleId field is set */ public boolean hasBattleId() { @@ -121,7 +121,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 battle_id = 3; + * optional uint32 battle_id = 11; * @return this */ public PVEBattleResultCsReq clearBattleId() { @@ -131,7 +131,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 battle_id = 3; + * optional uint32 battle_id = 11; * @return the battleId */ public int getBattleId() { @@ -139,7 +139,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 battle_id = 3; + * optional uint32 battle_id = 11; * @param value the battleId to set * @return this */ @@ -150,25 +150,62 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 stage_id = 11; - * @return whether the stageId field is set + * optional uint32 client_res_version = 12; + * @return whether the clientResVersion field is set */ - public boolean hasStageId() { + public boolean hasClientResVersion() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 stage_id = 11; + * optional uint32 client_res_version = 12; + * @return this + */ + public PVEBattleResultCsReq clearClientResVersion() { + bitField0_ &= ~0x00000004; + clientResVersion = 0; + return this; + } + + /** + * optional uint32 client_res_version = 12; + * @return the clientResVersion + */ + public int getClientResVersion() { + return clientResVersion; + } + + /** + * optional uint32 client_res_version = 12; + * @param value the clientResVersion to set + * @return this + */ + public PVEBattleResultCsReq setClientResVersion(final int value) { + bitField0_ |= 0x00000004; + clientResVersion = value; + return this; + } + + /** + * optional uint32 stage_id = 14; + * @return whether the stageId field is set + */ + public boolean hasStageId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 stage_id = 14; * @return this */ public PVEBattleResultCsReq clearStageId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; stageId = 0; return this; } /** - * optional uint32 stage_id = 11; + * optional uint32 stage_id = 14; * @return the stageId */ public int getStageId() { @@ -176,55 +213,18 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 stage_id = 11; + * optional uint32 stage_id = 14; * @param value the stageId to set * @return this */ public PVEBattleResultCsReq setStageId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; stageId = value; return this; } /** - * optional uint32 cost_time = 14; - * @return whether the costTime field is set - */ - public boolean hasCostTime() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 cost_time = 14; - * @return this - */ - public PVEBattleResultCsReq clearCostTime() { - bitField0_ &= ~0x00000008; - costTime = 0; - return this; - } - - /** - * optional uint32 cost_time = 14; - * @return the costTime - */ - public int getCostTime() { - return costTime; - } - - /** - * optional uint32 cost_time = 14; - * @param value the costTime to set - * @return this - */ - public PVEBattleResultCsReq setCostTime(final int value) { - bitField0_ |= 0x00000008; - costTime = value; - return this; - } - - /** - * optional .BattleEndStatus end_status = 12; + * optional .BattleEndStatus end_status = 6; * @return whether the endStatus field is set */ public boolean hasEndStatus() { @@ -232,7 +232,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleEndStatus end_status = 12; + * optional .BattleEndStatus end_status = 6; * @return this */ public PVEBattleResultCsReq clearEndStatus() { @@ -242,7 +242,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleEndStatus end_status = 12; + * optional .BattleEndStatus end_status = 6; * @return the endStatus */ public BattleEndStatusOuterClass.BattleEndStatus getEndStatus() { @@ -275,7 +275,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleEndStatus end_status = 12; + * optional .BattleEndStatus end_status = 6; * @param value the endStatus to set * @return this */ @@ -287,7 +287,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bool is_ai_consider_ultra_skill = 15; + * optional bool is_ai_consider_ultra_skill = 10; * @return whether the isAiConsiderUltraSkill field is set */ public boolean hasIsAiConsiderUltraSkill() { @@ -295,7 +295,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bool is_ai_consider_ultra_skill = 15; + * optional bool is_ai_consider_ultra_skill = 10; * @return this */ public PVEBattleResultCsReq clearIsAiConsiderUltraSkill() { @@ -305,7 +305,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bool is_ai_consider_ultra_skill = 15; + * optional bool is_ai_consider_ultra_skill = 10; * @return the isAiConsiderUltraSkill */ public boolean getIsAiConsiderUltraSkill() { @@ -313,7 +313,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bool is_ai_consider_ultra_skill = 15; + * optional bool is_ai_consider_ultra_skill = 10; * @param value the isAiConsiderUltraSkill to set * @return this */ @@ -324,7 +324,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 8; + * optional .BattleStatistics stt = 3; * @return whether the stt field is set */ public boolean hasStt() { @@ -332,7 +332,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 8; + * optional .BattleStatistics stt = 3; * @return this */ public PVEBattleResultCsReq clearStt() { @@ -342,7 +342,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 8; + * optional .BattleStatistics stt = 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. @@ -356,7 +356,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 8; + * optional .BattleStatistics stt = 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 @@ -370,7 +370,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 8; + * optional .BattleStatistics stt = 3; * @param value the stt to set * @return this */ @@ -381,7 +381,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 13; + * optional bytes turn_snapshot_hash = 1; * @return whether the turnSnapshotHash field is set */ public boolean hasTurnSnapshotHash() { @@ -389,7 +389,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 13; + * optional bytes turn_snapshot_hash = 1; * @return this */ public PVEBattleResultCsReq clearTurnSnapshotHash() { @@ -399,7 +399,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 13; + * optional bytes turn_snapshot_hash = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -413,7 +413,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 13; + * optional bytes turn_snapshot_hash = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -427,7 +427,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 13; + * optional bytes turn_snapshot_hash = 1; * @param value the turnSnapshotHash to add * @return this */ @@ -438,7 +438,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 13; + * optional bytes turn_snapshot_hash = 1; * @param values the turnSnapshotHash to add * @return this */ @@ -449,7 +449,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 13; + * optional bytes turn_snapshot_hash = 1; * @param values the turnSnapshotHash to set * @return this */ @@ -460,7 +460,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 1; + * repeated .BattleOp op_list = 5; * @return whether the opList field is set */ public boolean hasOpList() { @@ -468,7 +468,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 1; + * repeated .BattleOp op_list = 5; * @return this */ public PVEBattleResultCsReq clearOpList() { @@ -478,7 +478,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 1; + * repeated .BattleOp op_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. @@ -492,7 +492,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 1; + * repeated .BattleOp op_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 @@ -506,7 +506,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 1; + * repeated .BattleOp op_list = 5; * @param value the opList to add * @return this */ @@ -517,7 +517,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 1; + * repeated .BattleOp op_list = 5; * @param values the opList to add * @return this */ @@ -532,10 +532,10 @@ public final class PVEBattleResultCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - clientResVersion = other.clientResVersion; - battleId = other.battleId; - stageId = other.stageId; costTime = other.costTime; + battleId = other.battleId; + clientResVersion = other.clientResVersion; + stageId = other.stageId; endStatus = other.endStatus; isAiConsiderUltraSkill = other.isAiConsiderUltraSkill; stt.copyFrom(other.stt); @@ -551,18 +551,18 @@ public final class PVEBattleResultCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasClientResVersion()) { - setClientResVersion(other.clientResVersion); + if (other.hasCostTime()) { + setCostTime(other.costTime); } if (other.hasBattleId()) { setBattleId(other.battleId); } + if (other.hasClientResVersion()) { + setClientResVersion(other.clientResVersion); + } if (other.hasStageId()) { setStageId(other.stageId); } - if (other.hasCostTime()) { - setCostTime(other.costTime); - } if (other.hasEndStatus()) { setEndStatusValue(other.endStatus); } @@ -588,10 +588,10 @@ public final class PVEBattleResultCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - clientResVersion = 0; - battleId = 0; - stageId = 0; costTime = 0; + battleId = 0; + clientResVersion = 0; + stageId = 0; endStatus = 0; isAiConsiderUltraSkill = false; stt.clear(); @@ -623,10 +623,10 @@ public final class PVEBattleResultCsReqOuterClass { } PVEBattleResultCsReq other = (PVEBattleResultCsReq) o; return bitField0_ == other.bitField0_ - && (!hasClientResVersion() || clientResVersion == other.clientResVersion) - && (!hasBattleId() || battleId == other.battleId) - && (!hasStageId() || stageId == other.stageId) && (!hasCostTime() || costTime == other.costTime) + && (!hasBattleId() || battleId == other.battleId) + && (!hasClientResVersion() || clientResVersion == other.clientResVersion) + && (!hasStageId() || stageId == other.stageId) && (!hasEndStatus() || endStatus == other.endStatus) && (!hasIsAiConsiderUltraSkill() || isAiConsiderUltraSkill == other.isAiConsiderUltraSkill) && (!hasStt() || stt.equals(other.stt)) @@ -637,40 +637,40 @@ public final class PVEBattleResultCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(clientResVersion); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(costTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(battleId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(stageId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(clientResVersion); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(costTime); + output.writeUInt32NoTag(stageId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 48); output.writeEnumNoTag(endStatus); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 80); output.writeBoolNoTag(isAiConsiderUltraSkill); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 26); output.writeMessageNoTag(stt); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 10); output.writeBytesNoTag(turnSnapshotHash); } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < opList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 42); output.writeMessageNoTag(opList.get(i)); } } @@ -680,16 +680,16 @@ public final class PVEBattleResultCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(costTime); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(costTime); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(endStatus); @@ -716,27 +716,27 @@ public final class PVEBattleResultCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // clientResVersion - clientResVersion = input.readUInt32(); + case 64: { + // costTime + costTime = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // battleId - battleId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 88) { break; } } case 88: { - // stageId - stageId = input.readUInt32(); + // battleId + battleId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // clientResVersion + clientResVersion = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 112) { @@ -744,15 +744,15 @@ public final class PVEBattleResultCsReqOuterClass { } } case 112: { - // costTime - costTime = input.readUInt32(); + // stageId + stageId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 96) { + if (tag != 48) { break; } } - case 96: { + case 48: { // 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 != 120) { + if (tag != 80) { break; } } - case 120: { + case 80: { // isAiConsiderUltraSkill isAiConsiderUltraSkill = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 66) { + if (tag != 26) { break; } } - case 66: { + case 26: { // stt input.readMessage(stt); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { - // turnSnapshotHash - input.readBytes(turnSnapshotHash); - bitField0_ |= 0x00000080; - tag = input.readTag(); if (tag != 10) { break; } } case 10: { + // turnSnapshotHash + input.readBytes(turnSnapshotHash); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { // opList tag = input.readRepeatedMessage(opList, tag); bitField0_ |= 0x00000100; @@ -817,16 +817,16 @@ public final class PVEBattleResultCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.clientResVersion, clientResVersion); + output.writeUInt32(FieldNames.costTime, costTime); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.battleId, battleId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.stageId, stageId); + output.writeUInt32(FieldNames.clientResVersion, clientResVersion); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.costTime, costTime); + output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.endStatus, endStatus, BattleEndStatusOuterClass.BattleEndStatus.converter()); @@ -853,11 +853,11 @@ public final class PVEBattleResultCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2005674429: - case -349907515: { - if (input.isAtField(FieldNames.clientResVersion)) { + case -424687558: + case -269929473: { + if (input.isAtField(FieldNames.costTime)) { if (!input.trySkipNullValue()) { - clientResVersion = input.readUInt32(); + costTime = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -877,11 +877,11 @@ public final class PVEBattleResultCsReqOuterClass { } break; } - case -1897528135: - case 1306191356: { - if (input.isAtField(FieldNames.stageId)) { + case -2005674429: + case -349907515: { + if (input.isAtField(FieldNames.clientResVersion)) { if (!input.trySkipNullValue()) { - stageId = input.readUInt32(); + clientResVersion = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -889,11 +889,11 @@ public final class PVEBattleResultCsReqOuterClass { } break; } - case -424687558: - case -269929473: { - if (input.isAtField(FieldNames.costTime)) { + case -1897528135: + case 1306191356: { + if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { - costTime = input.readUInt32(); + stageId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -1018,13 +1018,13 @@ public final class PVEBattleResultCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName clientResVersion = FieldName.forField("clientResVersion", "client_res_version"); + static final FieldName costTime = FieldName.forField("costTime", "cost_time"); static final FieldName battleId = FieldName.forField("battleId", "battle_id"); - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + static final FieldName clientResVersion = FieldName.forField("clientResVersion", "client_res_version"); - static final FieldName costTime = FieldName.forField("costTime", "cost_time"); + static final FieldName stageId = FieldName.forField("stageId", "stage_id"); static final FieldName endStatus = FieldName.forField("endStatus", "end_status"); diff --git a/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java index 7f95a8a..d7b78a5 100644 --- a/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java @@ -21,72 +21,76 @@ public final class PVEBattleResultScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 5; */ private int stageId; /** - * optional uint32 event_id = 4; + * optional uint32 event_id = 6; */ private int eventId; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 10; */ private int retcode; /** - * optional uint32 battle_id = 6; + * optional uint32 battle_id = 11; */ private int battleId; /** - * optional uint32 mismatch_turn_count = 15; + * optional uint32 mismatch_turn_count = 13; */ private int mismatchTurnCount; /** - * optional .BattleEndStatus end_status = 7; + * optional .BattleEndStatus end_status = 8; */ private int endStatus; /** - * optional bool check_identical = 12; + * optional bool check_identical = 14; */ private boolean checkIdentical; /** - * optional .ItemList drop_data = 2; + * optional .ItemList drop_data = 1; */ private final ItemListOuterClass.ItemList dropData = ItemListOuterClass.ItemList.newInstance(); /** - * optional .ItemList unk1 = 9; + * optional .ItemList unk1 = 7; */ private final ItemListOuterClass.ItemList unk1 = ItemListOuterClass.ItemList.newInstance(); /** - * optional .ItemList unk2 = 13; + * 
+     *  extra_drop_data
+     *
+ * + * optional .ItemList unk2 = 12; */ private final ItemListOuterClass.ItemList unk2 = ItemListOuterClass.ItemList.newInstance(); /** - * optional .ItemList unk3 = 524; + * optional .ItemList unk3 = 1634; */ private final ItemListOuterClass.ItemList unk3 = ItemListOuterClass.ItemList.newInstance(); /** - * optional string res_version = 3; - */ - private final Utf8String resVersion = Utf8String.newEmptyInstance(); - - /** - * optional string bin_version = 14; + * optional string bin_version = 2; */ private final Utf8String binVersion = Utf8String.newEmptyInstance(); /** - * repeated .BattleAvatar battle_avatar_list = 8; + * optional string res_version = 4; + */ + private final Utf8String resVersion = Utf8String.newEmptyInstance(); + + /** + * repeated .BattleAvatar battle_avatar_list = 15; */ private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory()); @@ -101,7 +105,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 5; * @return whether the stageId field is set */ public boolean hasStageId() { @@ -109,7 +113,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 5; * @return this */ public PVEBattleResultScRsp clearStageId() { @@ -119,7 +123,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 5; * @return the stageId */ public int getStageId() { @@ -127,7 +131,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 5; * @param value the stageId to set * @return this */ @@ -138,7 +142,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 event_id = 4; + * optional uint32 event_id = 6; * @return whether the eventId field is set */ public boolean hasEventId() { @@ -146,7 +150,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 event_id = 4; + * optional uint32 event_id = 6; * @return this */ public PVEBattleResultScRsp clearEventId() { @@ -156,7 +160,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 event_id = 4; + * optional uint32 event_id = 6; * @return the eventId */ public int getEventId() { @@ -164,7 +168,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 event_id = 4; + * optional uint32 event_id = 6; * @param value the eventId to set * @return this */ @@ -175,7 +179,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -183,7 +187,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 10; * @return this */ public PVEBattleResultScRsp clearRetcode() { @@ -193,7 +197,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -201,7 +205,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -212,7 +216,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 battle_id = 6; + * optional uint32 battle_id = 11; * @return whether the battleId field is set */ public boolean hasBattleId() { @@ -220,7 +224,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 battle_id = 6; + * optional uint32 battle_id = 11; * @return this */ public PVEBattleResultScRsp clearBattleId() { @@ -230,7 +234,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 battle_id = 6; + * optional uint32 battle_id = 11; * @return the battleId */ public int getBattleId() { @@ -238,7 +242,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 battle_id = 6; + * optional uint32 battle_id = 11; * @param value the battleId to set * @return this */ @@ -249,7 +253,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 mismatch_turn_count = 15; + * optional uint32 mismatch_turn_count = 13; * @return whether the mismatchTurnCount field is set */ public boolean hasMismatchTurnCount() { @@ -257,7 +261,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 mismatch_turn_count = 15; + * optional uint32 mismatch_turn_count = 13; * @return this */ public PVEBattleResultScRsp clearMismatchTurnCount() { @@ -267,7 +271,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 mismatch_turn_count = 15; + * optional uint32 mismatch_turn_count = 13; * @return the mismatchTurnCount */ public int getMismatchTurnCount() { @@ -275,7 +279,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 mismatch_turn_count = 15; + * optional uint32 mismatch_turn_count = 13; * @param value the mismatchTurnCount to set * @return this */ @@ -286,7 +290,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .BattleEndStatus end_status = 7; + * optional .BattleEndStatus end_status = 8; * @return whether the endStatus field is set */ public boolean hasEndStatus() { @@ -294,7 +298,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .BattleEndStatus end_status = 7; + * optional .BattleEndStatus end_status = 8; * @return this */ public PVEBattleResultScRsp clearEndStatus() { @@ -304,7 +308,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .BattleEndStatus end_status = 7; + * optional .BattleEndStatus end_status = 8; * @return the endStatus */ public BattleEndStatusOuterClass.BattleEndStatus getEndStatus() { @@ -337,7 +341,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .BattleEndStatus end_status = 7; + * optional .BattleEndStatus end_status = 8; * @param value the endStatus to set * @return this */ @@ -349,7 +353,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional bool check_identical = 12; + * optional bool check_identical = 14; * @return whether the checkIdentical field is set */ public boolean hasCheckIdentical() { @@ -357,7 +361,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional bool check_identical = 12; + * optional bool check_identical = 14; * @return this */ public PVEBattleResultScRsp clearCheckIdentical() { @@ -367,7 +371,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional bool check_identical = 12; + * optional bool check_identical = 14; * @return the checkIdentical */ public boolean getCheckIdentical() { @@ -375,7 +379,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional bool check_identical = 12; + * optional bool check_identical = 14; * @param value the checkIdentical to set * @return this */ @@ -386,7 +390,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList drop_data = 2; + * optional .ItemList drop_data = 1; * @return whether the dropData field is set */ public boolean hasDropData() { @@ -394,7 +398,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList drop_data = 2; + * optional .ItemList drop_data = 1; * @return this */ public PVEBattleResultScRsp clearDropData() { @@ -404,7 +408,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList drop_data = 2; + * optional .ItemList drop_data = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -418,7 +422,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList drop_data = 2; + * optional .ItemList drop_data = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -432,7 +436,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList drop_data = 2; + * optional .ItemList drop_data = 1; * @param value the dropData to set * @return this */ @@ -443,7 +447,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk1 = 9; + * optional .ItemList unk1 = 7; * @return whether the unk1 field is set */ public boolean hasUnk1() { @@ -451,7 +455,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk1 = 9; + * optional .ItemList unk1 = 7; * @return this */ public PVEBattleResultScRsp clearUnk1() { @@ -461,7 +465,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk1 = 9; + * optional .ItemList unk1 = 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. @@ -475,7 +479,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk1 = 9; + * optional .ItemList unk1 = 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 @@ -489,7 +493,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk1 = 9; + * optional .ItemList unk1 = 7; * @param value the unk1 to set * @return this */ @@ -500,7 +504,11 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk2 = 13; + * 
+     *  extra_drop_data
+     *
+ * + * optional .ItemList unk2 = 12; * @return whether the unk2 field is set */ public boolean hasUnk2() { @@ -508,7 +516,11 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk2 = 13; + * 
+     *  extra_drop_data
+     *
+ * + * optional .ItemList unk2 = 12; * @return this */ public PVEBattleResultScRsp clearUnk2() { @@ -518,7 +530,11 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk2 = 13; + * 
+     *  extra_drop_data
+     *
+ * + * optional .ItemList unk2 = 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. @@ -532,7 +548,11 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk2 = 13; + * 
+     *  extra_drop_data
+     *
+ * + * optional .ItemList unk2 = 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 @@ -546,7 +566,11 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk2 = 13; + * 
+     *  extra_drop_data
+     *
+ * + * optional .ItemList unk2 = 12; * @param value the unk2 to set * @return this */ @@ -557,7 +581,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk3 = 524; + * optional .ItemList unk3 = 1634; * @return whether the unk3 field is set */ public boolean hasUnk3() { @@ -565,7 +589,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk3 = 524; + * optional .ItemList unk3 = 1634; * @return this */ public PVEBattleResultScRsp clearUnk3() { @@ -575,7 +599,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk3 = 524; + * optional .ItemList unk3 = 1634; * * This 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 +613,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk3 = 524; + * optional .ItemList unk3 = 1634; * * 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 +627,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk3 = 524; + * optional .ItemList unk3 = 1634; * @param value the unk3 to set * @return this */ @@ -614,90 +638,25 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string res_version = 3; - * @return whether the resVersion field is set + * optional string bin_version = 2; + * @return whether the binVersion field is set */ - public boolean hasResVersion() { + public boolean hasBinVersion() { return (bitField0_ & 0x00000800) != 0; } /** - * optional string res_version = 3; - * @return this - */ - public PVEBattleResultScRsp clearResVersion() { - bitField0_ &= ~0x00000800; - resVersion.clear(); - return this; - } - - /** - * optional string res_version = 3; - * @return the resVersion - */ - public String getResVersion() { - return resVersion.getString(); - } - - /** - * optional string res_version = 3; - * @return internal {@code Utf8String} representation of resVersion for reading - */ - public Utf8String getResVersionBytes() { - return this.resVersion; - } - - /** - * optional string res_version = 3; - * @return internal {@code Utf8String} representation of resVersion for modifications - */ - public Utf8String getMutableResVersionBytes() { - bitField0_ |= 0x00000800; - return this.resVersion; - } - - /** - * optional string res_version = 3; - * @param value the resVersion to set - * @return this - */ - public PVEBattleResultScRsp setResVersion(final CharSequence value) { - bitField0_ |= 0x00000800; - resVersion.copyFrom(value); - return this; - } - - /** - * optional string res_version = 3; - * @param value the resVersion to set - * @return this - */ - public PVEBattleResultScRsp setResVersion(final Utf8String value) { - bitField0_ |= 0x00000800; - resVersion.copyFrom(value); - return this; - } - - /** - * optional string bin_version = 14; - * @return whether the binVersion field is set - */ - public boolean hasBinVersion() { - return (bitField0_ & 0x00001000) != 0; - } - - /** - * optional string bin_version = 14; + * optional string bin_version = 2; * @return this */ public PVEBattleResultScRsp clearBinVersion() { - bitField0_ &= ~0x00001000; + bitField0_ &= ~0x00000800; binVersion.clear(); return this; } /** - * optional string bin_version = 14; + * optional string bin_version = 2; * @return the binVersion */ public String getBinVersion() { @@ -705,7 +664,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string bin_version = 14; + * optional string bin_version = 2; * @return internal {@code Utf8String} representation of binVersion for reading */ public Utf8String getBinVersionBytes() { @@ -713,38 +672,103 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string bin_version = 14; + * optional string bin_version = 2; * @return internal {@code Utf8String} representation of binVersion for modifications */ public Utf8String getMutableBinVersionBytes() { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; return this.binVersion; } /** - * optional string bin_version = 14; + * optional string bin_version = 2; * @param value the binVersion to set * @return this */ public PVEBattleResultScRsp setBinVersion(final CharSequence value) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; binVersion.copyFrom(value); return this; } /** - * optional string bin_version = 14; + * optional string bin_version = 2; * @param value the binVersion to set * @return this */ public PVEBattleResultScRsp setBinVersion(final Utf8String value) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; binVersion.copyFrom(value); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 8; + * optional string res_version = 4; + * @return whether the resVersion field is set + */ + public boolean hasResVersion() { + return (bitField0_ & 0x00001000) != 0; + } + + /** + * optional string res_version = 4; + * @return this + */ + public PVEBattleResultScRsp clearResVersion() { + bitField0_ &= ~0x00001000; + resVersion.clear(); + return this; + } + + /** + * optional string res_version = 4; + * @return the resVersion + */ + public String getResVersion() { + return resVersion.getString(); + } + + /** + * optional string res_version = 4; + * @return internal {@code Utf8String} representation of resVersion for reading + */ + public Utf8String getResVersionBytes() { + return this.resVersion; + } + + /** + * optional string res_version = 4; + * @return internal {@code Utf8String} representation of resVersion for modifications + */ + public Utf8String getMutableResVersionBytes() { + bitField0_ |= 0x00001000; + return this.resVersion; + } + + /** + * optional string res_version = 4; + * @param value the resVersion to set + * @return this + */ + public PVEBattleResultScRsp setResVersion(final CharSequence value) { + bitField0_ |= 0x00001000; + resVersion.copyFrom(value); + return this; + } + + /** + * optional string res_version = 4; + * @param value the resVersion to set + * @return this + */ + public PVEBattleResultScRsp setResVersion(final Utf8String value) { + bitField0_ |= 0x00001000; + resVersion.copyFrom(value); + return this; + } + + /** + * repeated .BattleAvatar battle_avatar_list = 15; * @return whether the battleAvatarList field is set */ public boolean hasBattleAvatarList() { @@ -752,7 +776,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 8; + * repeated .BattleAvatar battle_avatar_list = 15; * @return this */ public PVEBattleResultScRsp clearBattleAvatarList() { @@ -762,7 +786,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 8; + * repeated .BattleAvatar battle_avatar_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -776,7 +800,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 8; + * repeated .BattleAvatar battle_avatar_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -790,7 +814,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 8; + * repeated .BattleAvatar battle_avatar_list = 15; * @param value the battleAvatarList to add * @return this */ @@ -802,7 +826,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 8; + * repeated .BattleAvatar battle_avatar_list = 15; * @param values the battleAvatarList to add * @return this */ @@ -829,8 +853,8 @@ public final class PVEBattleResultScRspOuterClass { unk1.copyFrom(other.unk1); 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; @@ -875,12 +899,12 @@ public final class PVEBattleResultScRspOuterClass { 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); } @@ -905,8 +929,8 @@ public final class PVEBattleResultScRspOuterClass { unk1.clear(); unk2.clear(); unk3.clear(); - resVersion.clear(); binVersion.clear(); + resVersion.clear(); battleAvatarList.clear(); return this; } @@ -922,8 +946,8 @@ public final class PVEBattleResultScRspOuterClass { unk1.clearQuick(); unk2.clearQuick(); unk3.clearQuick(); - resVersion.clear(); binVersion.clear(); + resVersion.clear(); battleAvatarList.clearQuick(); return this; } @@ -949,68 +973,68 @@ public final class PVEBattleResultScRspOuterClass { && (!hasUnk1() || unk1.equals(other.unk1)) && (!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) 8); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(stageId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(eventId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(battleId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(mismatchTurnCount); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 64); output.writeEnumNoTag(endStatus); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeBoolNoTag(checkIdentical); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 10); output.writeMessageNoTag(dropData); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 58); output.writeMessageNoTag(unk1); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 98); output.writeMessageNoTag(unk2); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRawLittleEndian16((short) 8418); + output.writeRawLittleEndian16((short) 26258); output.writeMessageNoTag(unk3); } if ((bitField0_ & 0x00000800) != 0) { - output.writeRawByte((byte) 26); - output.writeStringNoTag(resVersion); + output.writeRawByte((byte) 18); + output.writeStringNoTag(binVersion); } if ((bitField0_ & 0x00001000) != 0) { - output.writeRawByte((byte) 114); - output.writeStringNoTag(binVersion); + output.writeRawByte((byte) 34); + output.writeStringNoTag(resVersion); } if ((bitField0_ & 0x00002000) != 0) { for (int i = 0; i < battleAvatarList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 122); output.writeMessageNoTag(battleAvatarList.get(i)); } } @@ -1053,10 +1077,10 @@ public final class PVEBattleResultScRspOuterClass { 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 +1095,52 @@ public final class PVEBattleResultScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 40: { // stageId stageId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // eventId - eventId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 48) { break; } } case 48: { + // eventId + eventId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { // battleId battleId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 120) { + if (tag != 104) { break; } } - case 120: { + case 104: { // mismatchTurnCount mismatchTurnCount = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 56) { + if (tag != 64) { break; } } - case 56: { + case 64: { // endStatus final int value = input.readInt32(); if (BattleEndStatusOuterClass.BattleEndStatus.forNumber(value) != null) { @@ -1124,74 +1148,74 @@ public final class PVEBattleResultScRspOuterClass { bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 96) { + if (tag != 112) { break; } } - case 96: { + case 112: { // checkIdentical checkIdentical = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { + // dropData + input.readMessage(dropData); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // unk1 + input.readMessage(unk1); + bitField0_ |= 0x00000100; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // unk2 + input.readMessage(unk2); + bitField0_ |= 0x00000200; + tag = input.readTag(); + if (tag != 13074) { + break; + } + } + case 13074: { + // unk3 + input.readMessage(unk3); + bitField0_ |= 0x00000400; + tag = input.readTag(); if (tag != 18) { break; } } case 18: { - // dropData - input.readMessage(dropData); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 74) { - break; - } - } - case 74: { - // unk1 - input.readMessage(unk1); - bitField0_ |= 0x00000100; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { - // unk2 - input.readMessage(unk2); - bitField0_ |= 0x00000200; - tag = input.readTag(); - if (tag != 4194) { - break; - } - } - case 4194: { - // unk3 - input.readMessage(unk3); - bitField0_ |= 0x00000400; - tag = input.readTag(); - if (tag != 26) { - break; - } - } - case 26: { - // resVersion - input.readString(resVersion); - bitField0_ |= 0x00000800; - tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { // binVersion input.readString(binVersion); - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; tag = input.readTag(); - if (tag != 66) { + if (tag != 34) { break; } } - case 66: { + case 34: { + // resVersion + input.readString(resVersion); + bitField0_ |= 0x00001000; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { // battleAvatarList tag = input.readRepeatedMessage(battleAvatarList, tag); bitField0_ |= 0x00002000; @@ -1250,10 +1274,10 @@ public final class PVEBattleResultScRspOuterClass { 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); @@ -1401,11 +1425,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 +1437,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 { @@ -1512,10 +1536,10 @@ public final class PVEBattleResultScRspOuterClass { 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/PileItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java index f3a609c..fc5d6e8 100644 --- a/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java @@ -24,7 +24,7 @@ public final class PileItemOuterClass { private int itemId; /** - * optional uint32 item_num = 14; + * optional uint32 item_num = 12; */ private int itemNum; @@ -76,7 +76,7 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_num = 14; + * optional uint32 item_num = 12; * @return whether the itemNum field is set */ public boolean hasItemNum() { @@ -84,7 +84,7 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_num = 14; + * optional uint32 item_num = 12; * @return this */ public PileItem clearItemNum() { @@ -94,7 +94,7 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_num = 14; + * optional uint32 item_num = 12; * @return the itemNum */ public int getItemNum() { @@ -102,7 +102,7 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_num = 14; + * optional uint32 item_num = 12; * @param value the itemNum to set * @return this */ @@ -181,7 +181,7 @@ public final class PileItemOuterClass { output.writeUInt32NoTag(itemId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(itemNum); } } @@ -210,11 +210,11 @@ public final class PileItemOuterClass { itemId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 96) { break; } } - case 112: { + case 96: { // itemNum itemNum = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java index 6f4a342..36d2483 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 play_music_id = 10; + * optional uint32 play_music_id = 14; */ private int playMusicId; @@ -34,7 +34,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { } /** - * optional uint32 play_music_id = 10; + * optional uint32 play_music_id = 14; * @return whether the playMusicId field is set */ public boolean hasPlayMusicId() { @@ -42,7 +42,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { } /** - * optional uint32 play_music_id = 10; + * optional uint32 play_music_id = 14; * @return this */ public PlayBackGroundMusicCsReq clearPlayMusicId() { @@ -52,7 +52,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { } /** - * optional uint32 play_music_id = 10; + * optional uint32 play_music_id = 14; * @return the playMusicId */ public int getPlayMusicId() { @@ -60,7 +60,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { } /** - * optional uint32 play_music_id = 10; + * optional uint32 play_music_id = 14; * @param value the playMusicId to set * @return this */ @@ -129,7 +129,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(playMusicId); } } @@ -150,7 +150,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 112: { // playMusicId playMusicId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java index 39a9309..4f2eba7 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java @@ -19,20 +19,20 @@ public final class PlayBackGroundMusicScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 playing_id = 4; + * optional uint32 playing_id = 7; */ private int playingId; /** - * optional uint32 play_music_id = 6; - */ - private int playMusicId; - - /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 8; */ private int retcode; + /** + * optional uint32 play_music_id = 10; + */ + private int playMusicId; + private PlayBackGroundMusicScRsp() { } @@ -44,7 +44,7 @@ public final class PlayBackGroundMusicScRspOuterClass { } /** - * optional uint32 playing_id = 4; + * optional uint32 playing_id = 7; * @return whether the playingId field is set */ public boolean hasPlayingId() { @@ -52,7 +52,7 @@ public final class PlayBackGroundMusicScRspOuterClass { } /** - * optional uint32 playing_id = 4; + * optional uint32 playing_id = 7; * @return this */ public PlayBackGroundMusicScRsp clearPlayingId() { @@ -62,7 +62,7 @@ public final class PlayBackGroundMusicScRspOuterClass { } /** - * optional uint32 playing_id = 4; + * optional uint32 playing_id = 7; * @return the playingId */ public int getPlayingId() { @@ -70,7 +70,7 @@ public final class PlayBackGroundMusicScRspOuterClass { } /** - * optional uint32 playing_id = 4; + * optional uint32 playing_id = 7; * @param value the playingId to set * @return this */ @@ -81,62 +81,25 @@ public final class PlayBackGroundMusicScRspOuterClass { } /** - * optional uint32 play_music_id = 6; - * @return whether the playMusicId field is set + * optional uint32 retcode = 8; + * @return whether the retcode field is set */ - public boolean hasPlayMusicId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 play_music_id = 6; - * @return this - */ - public PlayBackGroundMusicScRsp clearPlayMusicId() { - bitField0_ &= ~0x00000002; - playMusicId = 0; - return this; - } - - /** - * optional uint32 play_music_id = 6; - * @return the playMusicId - */ - public int getPlayMusicId() { - return playMusicId; - } - - /** - * optional uint32 play_music_id = 6; - * @param value the playMusicId to set - * @return this - */ - public PlayBackGroundMusicScRsp setPlayMusicId(final int value) { - bitField0_ |= 0x00000002; - playMusicId = value; - return this; - } - - /** - * optional uint32 retcode = 15; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 8; * @return this */ public PlayBackGroundMusicScRsp clearRetcode() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; retcode = 0; return this; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -144,24 +107,61 @@ public final class PlayBackGroundMusicScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ public PlayBackGroundMusicScRsp setRetcode(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; retcode = value; return this; } + /** + * optional uint32 play_music_id = 10; + * @return whether the playMusicId field is set + */ + public boolean hasPlayMusicId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 play_music_id = 10; + * @return this + */ + public PlayBackGroundMusicScRsp clearPlayMusicId() { + bitField0_ &= ~0x00000004; + playMusicId = 0; + return this; + } + + /** + * optional uint32 play_music_id = 10; + * @return the playMusicId + */ + public int getPlayMusicId() { + return playMusicId; + } + + /** + * optional uint32 play_music_id = 10; + * @param value the playMusicId to set + * @return this + */ + public PlayBackGroundMusicScRsp setPlayMusicId(final int value) { + bitField0_ |= 0x00000004; + playMusicId = value; + return this; + } + @Override public PlayBackGroundMusicScRsp copyFrom(final PlayBackGroundMusicScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; playingId = other.playingId; - playMusicId = other.playMusicId; retcode = other.retcode; + playMusicId = other.playMusicId; } return this; } @@ -175,12 +175,12 @@ public final class PlayBackGroundMusicScRspOuterClass { if (other.hasPlayingId()) { setPlayingId(other.playingId); } - if (other.hasPlayMusicId()) { - setPlayMusicId(other.playMusicId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasPlayMusicId()) { + setPlayMusicId(other.playMusicId); + } return this; } @@ -192,8 +192,8 @@ public final class PlayBackGroundMusicScRspOuterClass { cachedSize = -1; bitField0_ = 0; playingId = 0; - playMusicId = 0; retcode = 0; + playMusicId = 0; return this; } @@ -218,23 +218,23 @@ public final class PlayBackGroundMusicScRspOuterClass { PlayBackGroundMusicScRsp other = (PlayBackGroundMusicScRsp) o; return bitField0_ == other.bitField0_ && (!hasPlayingId() || playingId == other.playingId) - && (!hasPlayMusicId() || playMusicId == other.playMusicId) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasPlayMusicId() || playMusicId == other.playMusicId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(playingId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(playMusicId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(playMusicId); } } @@ -245,10 +245,10 @@ public final class PlayBackGroundMusicScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(playingId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(playMusicId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(playMusicId); } return size; } @@ -260,27 +260,27 @@ public final class PlayBackGroundMusicScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 56: { // playingId playingId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 64) { break; } } - case 48: { - // playMusicId - playMusicId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 64: { // retcode retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // playMusicId + playMusicId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -308,10 +308,10 @@ public final class PlayBackGroundMusicScRspOuterClass { output.writeUInt32(FieldNames.playingId, playingId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.playMusicId, playMusicId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.playMusicId, playMusicId); } output.endObject(); } @@ -335,11 +335,10 @@ public final class PlayBackGroundMusicScRspOuterClass { } break; } - case 835898444: - case -1319856608: { - if (input.isAtField(FieldNames.playMusicId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - playMusicId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -347,10 +346,11 @@ public final class PlayBackGroundMusicScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 835898444: + case -1319856608: { + if (input.isAtField(FieldNames.playMusicId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + playMusicId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -413,9 +413,9 @@ public final class PlayBackGroundMusicScRspOuterClass { static class FieldNames { static final FieldName playingId = FieldName.forField("playingId", "playing_id"); - static final FieldName playMusicId = FieldName.forField("playMusicId", "play_music_id"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName playMusicId = FieldName.forField("playMusicId", "play_music_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java index 4ece489..01d0978 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 = 7; + * optional uint32 platform_type = 12; */ private int platformType; /** - * optional string token = 11; + * optional string token = 8; */ private final Utf8String token = Utf8String.newEmptyInstance(); /** - * optional string account_uid = 14; + * optional string account_uid = 11; */ private final Utf8String accountUid = Utf8String.newEmptyInstance(); @@ -45,7 +45,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional uint32 platform_type = 7; + * optional uint32 platform_type = 12; * @return whether the platformType field is set */ public boolean hasPlatformType() { @@ -53,7 +53,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional uint32 platform_type = 7; + * optional uint32 platform_type = 12; * @return this */ public PlayerGetTokenCsReq clearPlatformType() { @@ -63,7 +63,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional uint32 platform_type = 7; + * optional uint32 platform_type = 12; * @return the platformType */ public int getPlatformType() { @@ -71,7 +71,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional uint32 platform_type = 7; + * optional uint32 platform_type = 12; * @param value the platformType to set * @return this */ @@ -82,7 +82,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 11; + * optional string token = 8; * @return whether the token field is set */ public boolean hasToken() { @@ -90,7 +90,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 11; + * optional string token = 8; * @return this */ public PlayerGetTokenCsReq clearToken() { @@ -100,7 +100,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 11; + * optional string token = 8; * @return the token */ public String getToken() { @@ -108,7 +108,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 11; + * optional string token = 8; * @return internal {@code Utf8String} representation of token for reading */ public Utf8String getTokenBytes() { @@ -116,7 +116,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 11; + * optional string token = 8; * @return internal {@code Utf8String} representation of token for modifications */ public Utf8String getMutableTokenBytes() { @@ -125,7 +125,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 11; + * optional string token = 8; * @param value the token to set * @return this */ @@ -136,7 +136,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 11; + * optional string token = 8; * @param value the token to set * @return this */ @@ -147,7 +147,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string account_uid = 14; + * optional string account_uid = 11; * @return whether the accountUid field is set */ public boolean hasAccountUid() { @@ -155,7 +155,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string account_uid = 14; + * optional string account_uid = 11; * @return this */ public PlayerGetTokenCsReq clearAccountUid() { @@ -165,7 +165,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string account_uid = 14; + * optional string account_uid = 11; * @return the accountUid */ public String getAccountUid() { @@ -173,7 +173,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string account_uid = 14; + * optional string account_uid = 11; * @return internal {@code Utf8String} representation of accountUid for reading */ public Utf8String getAccountUidBytes() { @@ -181,7 +181,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string account_uid = 14; + * optional string account_uid = 11; * @return internal {@code Utf8String} representation of accountUid for modifications */ public Utf8String getMutableAccountUidBytes() { @@ -190,7 +190,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string account_uid = 14; + * optional string account_uid = 11; * @param value the accountUid to set * @return this */ @@ -201,7 +201,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string account_uid = 14; + * optional string account_uid = 11; * @param value the accountUid to set * @return this */ @@ -284,15 +284,15 @@ public final class PlayerGetTokenCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(platformType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 66); output.writeStringNoTag(token); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 90); output.writeStringNoTag(accountUid); } } @@ -319,25 +319,25 @@ public final class PlayerGetTokenCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 96: { // platformType platformType = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { + // token + input.readString(token); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 90) { break; } } case 90: { - // token - input.readString(token); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { // 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 60262e4..9f6373b 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 = 10; + * optional uint64 secret_key_seed = 11; */ private long secretKeySeed; /** - * optional uint32 retcode = 1; - */ - private int retcode; - - /** - * optional uint32 uid = 3; + * optional uint32 uid = 1; */ private int uid; /** - * optional .BlackInfo black_info = 7; + * optional uint32 retcode = 7; + */ + private int retcode; + + /** + * optional .BlackInfo black_info = 15; */ private final BlackInfoOuterClass.BlackInfo blackInfo = BlackInfoOuterClass.BlackInfo.newInstance(); /** - * optional string msg = 8; + * optional string msg = 5; */ private final Utf8String msg = Utf8String.newEmptyInstance(); @@ -55,7 +55,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint64 secret_key_seed = 10; + * optional uint64 secret_key_seed = 11; * @return whether the secretKeySeed field is set */ public boolean hasSecretKeySeed() { @@ -63,7 +63,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint64 secret_key_seed = 10; + * optional uint64 secret_key_seed = 11; * @return this */ public PlayerGetTokenScRsp clearSecretKeySeed() { @@ -73,7 +73,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint64 secret_key_seed = 10; + * optional uint64 secret_key_seed = 11; * @return the secretKeySeed */ public long getSecretKeySeed() { @@ -81,7 +81,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint64 secret_key_seed = 10; + * optional uint64 secret_key_seed = 11; * @param value the secretKeySeed to set * @return this */ @@ -92,62 +92,25 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 retcode = 1; - * @return whether the retcode field is set + * optional uint32 uid = 1; + * @return whether the uid field is set */ - public boolean hasRetcode() { + public boolean hasUid() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 1; - * @return this - */ - public PlayerGetTokenScRsp clearRetcode() { - bitField0_ &= ~0x00000002; - 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 PlayerGetTokenScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; - retcode = value; - return this; - } - - /** - * optional uint32 uid = 3; - * @return whether the uid field is set - */ - public boolean hasUid() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 uid = 3; + * optional uint32 uid = 1; * @return this */ public PlayerGetTokenScRsp clearUid() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; uid = 0; return this; } /** - * optional uint32 uid = 3; + * optional uint32 uid = 1; * @return the uid */ public int getUid() { @@ -155,18 +118,55 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 uid = 3; + * optional uint32 uid = 1; * @param value the uid to set * @return this */ public PlayerGetTokenScRsp setUid(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; uid = value; return this; } /** - * optional .BlackInfo black_info = 7; + * optional uint32 retcode = 7; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 retcode = 7; + * @return this + */ + public PlayerGetTokenScRsp clearRetcode() { + bitField0_ &= ~0x00000004; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 7; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 7; + * @param value the retcode to set + * @return this + */ + public PlayerGetTokenScRsp setRetcode(final int value) { + bitField0_ |= 0x00000004; + retcode = value; + return this; + } + + /** + * optional .BlackInfo black_info = 15; * @return whether the blackInfo field is set */ public boolean hasBlackInfo() { @@ -174,7 +174,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 7; + * optional .BlackInfo black_info = 15; * @return this */ public PlayerGetTokenScRsp clearBlackInfo() { @@ -184,7 +184,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 7; + * optional .BlackInfo black_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. @@ -198,7 +198,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 7; + * optional .BlackInfo black_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 @@ -212,7 +212,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 7; + * optional .BlackInfo black_info = 15; * @param value the blackInfo to set * @return this */ @@ -223,7 +223,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 5; * @return whether the msg field is set */ public boolean hasMsg() { @@ -231,7 +231,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 5; * @return this */ public PlayerGetTokenScRsp clearMsg() { @@ -241,7 +241,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 5; * @return the msg */ public String getMsg() { @@ -249,7 +249,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 5; * @return internal {@code Utf8String} representation of msg for reading */ public Utf8String getMsgBytes() { @@ -257,7 +257,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 5; * @return internal {@code Utf8String} representation of msg for modifications */ public Utf8String getMutableMsgBytes() { @@ -266,7 +266,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 5; * @param value the msg to set * @return this */ @@ -277,7 +277,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 5; * @param value the msg to set * @return this */ @@ -293,8 +293,8 @@ public final class PlayerGetTokenScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; secretKeySeed = other.secretKeySeed; - retcode = other.retcode; uid = other.uid; + retcode = other.retcode; blackInfo.copyFrom(other.blackInfo); msg.copyFrom(other.msg); } @@ -310,12 +310,12 @@ public final class PlayerGetTokenScRspOuterClass { if (other.hasSecretKeySeed()) { setSecretKeySeed(other.secretKeySeed); } - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasUid()) { setUid(other.uid); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasBlackInfo()) { getMutableBlackInfo().mergeFrom(other.blackInfo); } @@ -333,8 +333,8 @@ public final class PlayerGetTokenScRspOuterClass { cachedSize = -1; bitField0_ = 0; secretKeySeed = 0L; - retcode = 0; uid = 0; + retcode = 0; blackInfo.clear(); msg.clear(); return this; @@ -363,8 +363,8 @@ public final class PlayerGetTokenScRspOuterClass { PlayerGetTokenScRsp other = (PlayerGetTokenScRsp) o; return bitField0_ == other.bitField0_ && (!hasSecretKeySeed() || secretKeySeed == other.secretKeySeed) - && (!hasRetcode() || retcode == other.retcode) && (!hasUid() || uid == other.uid) + && (!hasRetcode() || retcode == other.retcode) && (!hasBlackInfo() || blackInfo.equals(other.blackInfo)) && (!hasMsg() || msg.equals(other.msg)); } @@ -372,23 +372,23 @@ public final class PlayerGetTokenScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 88); output.writeUInt64NoTag(secretKeySeed); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); output.writeUInt32NoTag(uid); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 122); output.writeMessageNoTag(blackInfo); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 42); output.writeStringNoTag(msg); } } @@ -400,10 +400,10 @@ public final class PlayerGetTokenScRspOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(secretKeySeed); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(blackInfo); @@ -421,7 +421,7 @@ public final class PlayerGetTokenScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 88: { // secretKeySeed secretKeySeed = input.readUInt64(); bitField0_ |= 0x00000001; @@ -431,33 +431,33 @@ public final class PlayerGetTokenScRspOuterClass { } } case 8: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { // uid uid = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 56) { break; } } - case 58: { + case 56: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { // blackInfo input.readMessage(blackInfo); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 66) { + if (tag != 42) { break; } } - case 66: { + case 42: { // msg input.readString(msg); bitField0_ |= 0x00000010; @@ -487,10 +487,10 @@ public final class PlayerGetTokenScRspOuterClass { output.writeUInt64(FieldNames.secretKeySeed, secretKeySeed); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.uid, uid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.uid, uid); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.blackInfo, blackInfo); @@ -520,10 +520,10 @@ public final class PlayerGetTokenScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 115792: { + if (input.isAtField(FieldNames.uid)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + uid = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -531,10 +531,10 @@ public final class PlayerGetTokenScRspOuterClass { } break; } - case 115792: { - if (input.isAtField(FieldNames.uid)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - uid = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -620,10 +620,10 @@ public final class PlayerGetTokenScRspOuterClass { static class FieldNames { static final FieldName secretKeySeed = FieldName.forField("secretKeySeed", "secret_key_seed"); - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName uid = FieldName.forField("uid"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName blackInfo = FieldName.forField("blackInfo", "black_info"); static final FieldName msg = FieldName.forField("msg"); diff --git a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java index d150009..1eead84 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 = 4; + * optional uint64 client_time_ms = 9; */ private long clientTimeMs; @@ -34,7 +34,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional uint64 client_time_ms = 4; + * optional uint64 client_time_ms = 9; * @return whether the clientTimeMs field is set */ public boolean hasClientTimeMs() { @@ -42,7 +42,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional uint64 client_time_ms = 4; + * optional uint64 client_time_ms = 9; * @return this */ public PlayerHeartbeatCsReq clearClientTimeMs() { @@ -52,7 +52,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional uint64 client_time_ms = 4; + * optional uint64 client_time_ms = 9; * @return the clientTimeMs */ public long getClientTimeMs() { @@ -60,7 +60,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional uint64 client_time_ms = 4; + * optional uint64 client_time_ms = 9; * @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) 32); + output.writeRawByte((byte) 72); output.writeUInt64NoTag(clientTimeMs); } } @@ -150,7 +150,7 @@ public final class PlayerHeartbeatCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 72: { // 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 1d1707f..bfa1c03 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java @@ -19,12 +19,12 @@ public final class PlayerHeartbeatScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 server_time_ms = 11; + * optional uint64 server_time_ms = 5; */ private long serverTimeMs; /** - * optional uint64 client_time_ms = 13; + * optional uint64 client_time_ms = 12; */ private long clientTimeMs; @@ -44,7 +44,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint64 server_time_ms = 11; + * optional uint64 server_time_ms = 5; * @return whether the serverTimeMs field is set */ public boolean hasServerTimeMs() { @@ -52,7 +52,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint64 server_time_ms = 11; + * optional uint64 server_time_ms = 5; * @return this */ public PlayerHeartbeatScRsp clearServerTimeMs() { @@ -62,7 +62,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint64 server_time_ms = 11; + * optional uint64 server_time_ms = 5; * @return the serverTimeMs */ public long getServerTimeMs() { @@ -70,7 +70,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint64 server_time_ms = 11; + * optional uint64 server_time_ms = 5; * @param value the serverTimeMs to set * @return this */ @@ -81,7 +81,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint64 client_time_ms = 13; + * optional uint64 client_time_ms = 12; * @return whether the clientTimeMs field is set */ public boolean hasClientTimeMs() { @@ -89,7 +89,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint64 client_time_ms = 13; + * optional uint64 client_time_ms = 12; * @return this */ public PlayerHeartbeatScRsp clearClientTimeMs() { @@ -99,7 +99,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint64 client_time_ms = 13; + * optional uint64 client_time_ms = 12; * @return the clientTimeMs */ public long getClientTimeMs() { @@ -107,7 +107,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint64 client_time_ms = 13; + * optional uint64 client_time_ms = 12; * @param value the clientTimeMs to set * @return this */ @@ -225,11 +225,11 @@ public final class PlayerHeartbeatScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeUInt64NoTag(serverTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 96); output.writeUInt64NoTag(clientTimeMs); } if ((bitField0_ & 0x00000004) != 0) { @@ -260,16 +260,16 @@ public final class PlayerHeartbeatScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 40: { // serverTimeMs serverTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 96) { break; } } - case 104: { + case 96: { // clientTimeMs clientTimeMs = input.readUInt64(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java index 09ab536..5e34946 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java @@ -19,32 +19,32 @@ public final class PlayerLoginScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 server_timestamp_ms = 4; + * optional uint64 server_timestamp_ms = 1; */ private long serverTimestampMs; /** - * optional uint64 login_random = 13; + * optional uint64 login_random = 15; */ private long loginRandom; /** - * optional uint32 retcode = 2; - */ - private int retcode; - - /** - * optional uint32 stamina = 15; + * optional uint32 stamina = 6; */ private int stamina; /** - * optional sint32 cur_timezone = 7; + * optional uint32 retcode = 13; + */ + private int retcode; + + /** + * optional sint32 cur_timezone = 5; */ private int curTimezone; /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 10; */ private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance(); @@ -59,7 +59,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 server_timestamp_ms = 4; + * optional uint64 server_timestamp_ms = 1; * @return whether the serverTimestampMs field is set */ public boolean hasServerTimestampMs() { @@ -67,7 +67,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 server_timestamp_ms = 4; + * optional uint64 server_timestamp_ms = 1; * @return this */ public PlayerLoginScRsp clearServerTimestampMs() { @@ -77,7 +77,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 server_timestamp_ms = 4; + * optional uint64 server_timestamp_ms = 1; * @return the serverTimestampMs */ public long getServerTimestampMs() { @@ -85,7 +85,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 server_timestamp_ms = 4; + * optional uint64 server_timestamp_ms = 1; * @param value the serverTimestampMs to set * @return this */ @@ -96,7 +96,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 login_random = 13; + * optional uint64 login_random = 15; * @return whether the loginRandom field is set */ public boolean hasLoginRandom() { @@ -104,7 +104,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 login_random = 13; + * optional uint64 login_random = 15; * @return this */ public PlayerLoginScRsp clearLoginRandom() { @@ -114,7 +114,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 login_random = 13; + * optional uint64 login_random = 15; * @return the loginRandom */ public long getLoginRandom() { @@ -122,7 +122,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 login_random = 13; + * optional uint64 login_random = 15; * @param value the loginRandom to set * @return this */ @@ -133,62 +133,25 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 retcode = 2; - * @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 = 2; - * @return this - */ - public PlayerLoginScRsp clearRetcode() { - bitField0_ &= ~0x00000004; - 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 PlayerLoginScRsp setRetcode(final int value) { - bitField0_ |= 0x00000004; - retcode = value; - return this; - } - - /** - * optional uint32 stamina = 15; - * @return whether the stamina field is set - */ - public boolean hasStamina() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 stamina = 15; + * optional uint32 stamina = 6; * @return this */ public PlayerLoginScRsp clearStamina() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; stamina = 0; return this; } /** - * optional uint32 stamina = 15; + * optional uint32 stamina = 6; * @return the stamina */ public int getStamina() { @@ -196,18 +159,55 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 stamina = 15; + * 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 sint32 cur_timezone = 7; + * optional uint32 retcode = 13; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 retcode = 13; + * @return this + */ + public PlayerLoginScRsp clearRetcode() { + bitField0_ &= ~0x00000008; + 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 PlayerLoginScRsp setRetcode(final int value) { + bitField0_ |= 0x00000008; + retcode = value; + return this; + } + + /** + * optional sint32 cur_timezone = 5; * @return whether the curTimezone field is set */ public boolean hasCurTimezone() { @@ -215,7 +215,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional sint32 cur_timezone = 7; + * optional sint32 cur_timezone = 5; * @return this */ public PlayerLoginScRsp clearCurTimezone() { @@ -225,7 +225,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional sint32 cur_timezone = 7; + * optional sint32 cur_timezone = 5; * @return the curTimezone */ public int getCurTimezone() { @@ -233,7 +233,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional sint32 cur_timezone = 7; + * optional sint32 cur_timezone = 5; * @param value the curTimezone to set * @return this */ @@ -244,7 +244,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 10; * @return whether the basicInfo field is set */ public boolean hasBasicInfo() { @@ -252,7 +252,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 10; * @return this */ public PlayerLoginScRsp clearBasicInfo() { @@ -262,7 +262,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_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. @@ -276,7 +276,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_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 @@ -290,7 +290,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 10; * @param value the basicInfo to set * @return this */ @@ -307,8 +307,8 @@ public final class PlayerLoginScRspOuterClass { bitField0_ = other.bitField0_; serverTimestampMs = other.serverTimestampMs; loginRandom = other.loginRandom; - 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.hasLoginRandom()) { setLoginRandom(other.loginRandom); } - 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; serverTimestampMs = 0L; loginRandom = 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_ && (!hasServerTimestampMs() || serverTimestampMs == other.serverTimestampMs) && (!hasLoginRandom() || loginRandom == other.loginRandom) - && (!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) 32); + output.writeRawByte((byte) 8); output.writeUInt64NoTag(serverTimestampMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 120); output.writeUInt64NoTag(loginRandom); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(stamina); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 40); output.writeSInt32NoTag(curTimezone); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 82); output.writeMessageNoTag(basicInfo); } } @@ -425,10 +425,10 @@ public final class PlayerLoginScRspOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(loginRandom); } 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,52 +446,52 @@ public final class PlayerLoginScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 8: { // serverTimestampMs serverTimestampMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // loginRandom - loginRandom = input.readUInt64(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 120) { break; } } case 120: { - // stamina - stamina = input.readUInt32(); - bitField0_ |= 0x00000008; + // loginRandom + loginRandom = input.readUInt64(); + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 56) { + if (tag != 48) { break; } } - case 56: { + case 48: { + // stamina + stamina = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // curTimezone curTimezone = input.readSInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 50) { + if (tag != 82) { break; } } - case 50: { + case 82: { // basicInfo input.readMessage(basicInfo); bitField0_ |= 0x00000020; @@ -524,10 +524,10 @@ public final class PlayerLoginScRspOuterClass { output.writeUInt64(FieldNames.loginRandom, loginRandom); } 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 loginRandom = FieldName.forField("loginRandom", "login_random"); - 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 256d796..e09d11e 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java @@ -21,50 +21,55 @@ public final class PlayerSyncScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .AvatarSync avatar_sync = 3; + * optional uint32 total_achievement_exp = 1822; + */ + private int totalAchievementExp; + + /** + * optional .AvatarSync avatar_sync = 11; */ private final AvatarSyncOuterClass.AvatarSync avatarSync = AvatarSyncOuterClass.AvatarSync.newInstance(); /** - * optional .PlayerBasicInfo basic_info = 4; + * optional .PlayerBasicInfo basic_info = 15; */ private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance(); /** - * optional .BoardDataSync board_data_sync = 1627; + * optional .BoardDataSync board_data_sync = 480; */ private final BoardDataSyncOuterClass.BoardDataSync boardDataSync = BoardDataSyncOuterClass.BoardDataSync.newInstance(); /** - * repeated uint32 del_relic_list = 8; - */ - private final RepeatedInt delRelicList = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 del_equipment_list = 13; + * repeated uint32 del_equipment_list = 7; */ private final RepeatedInt delEquipmentList = RepeatedInt.newEmptyInstance(); /** - * repeated .Relic relic_list = 1; + * repeated uint32 del_relic_list = 13; */ - private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); + private final RepeatedInt delRelicList = RepeatedInt.newEmptyInstance(); /** - * repeated .Equipment equipment_list = 6; - */ - private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); - - /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * repeated .HeroBasicTypeInfo basic_type_info_list = 1; */ private final RepeatedMessage basicTypeInfoList = RepeatedMessage.newEmptyInstance(HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo.getFactory()); /** - * repeated .Material material_list = 15; + * repeated .Equipment equipment_list = 4; + */ + private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); + + /** + * repeated .Material material_list = 12; */ private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); + /** + * repeated .Relic relic_list = 14; + */ + private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); + private PlayerSyncScNotify() { } @@ -76,25 +81,62 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .AvatarSync avatar_sync = 3; - * @return whether the avatarSync field is set + * optional uint32 total_achievement_exp = 1822; + * @return whether the totalAchievementExp field is set */ - public boolean hasAvatarSync() { + public boolean hasTotalAchievementExp() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .AvatarSync avatar_sync = 3; + * optional uint32 total_achievement_exp = 1822; + * @return this + */ + public PlayerSyncScNotify clearTotalAchievementExp() { + bitField0_ &= ~0x00000001; + totalAchievementExp = 0; + return this; + } + + /** + * optional uint32 total_achievement_exp = 1822; + * @return the totalAchievementExp + */ + public int getTotalAchievementExp() { + return totalAchievementExp; + } + + /** + * optional uint32 total_achievement_exp = 1822; + * @param value the totalAchievementExp to set + * @return this + */ + public PlayerSyncScNotify setTotalAchievementExp(final int value) { + bitField0_ |= 0x00000001; + totalAchievementExp = value; + return this; + } + + /** + * optional .AvatarSync avatar_sync = 11; + * @return whether the avatarSync field is set + */ + public boolean hasAvatarSync() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .AvatarSync avatar_sync = 11; * @return this */ public PlayerSyncScNotify clearAvatarSync() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; avatarSync.clear(); return this; } /** - * optional .AvatarSync avatar_sync = 3; + * optional .AvatarSync avatar_sync = 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 +150,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .AvatarSync avatar_sync = 3; + * optional .AvatarSync avatar_sync = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -117,41 +159,41 @@ public final class PlayerSyncScNotifyOuterClass { * @return internal storage object for modifications */ public AvatarSyncOuterClass.AvatarSync getMutableAvatarSync() { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return avatarSync; } /** - * optional .AvatarSync avatar_sync = 3; + * optional .AvatarSync avatar_sync = 11; * @param value the avatarSync to set * @return this */ public PlayerSyncScNotify setAvatarSync(final AvatarSyncOuterClass.AvatarSync value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; avatarSync.copyFrom(value); return this; } /** - * optional .PlayerBasicInfo basic_info = 4; + * optional .PlayerBasicInfo basic_info = 15; * @return whether the basicInfo field is set */ public boolean hasBasicInfo() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional .PlayerBasicInfo basic_info = 4; + * optional .PlayerBasicInfo basic_info = 15; * @return this */ public PlayerSyncScNotify clearBasicInfo() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; basicInfo.clear(); return this; } /** - * optional .PlayerBasicInfo basic_info = 4; + * optional .PlayerBasicInfo basic_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. @@ -165,7 +207,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 4; + * optional .PlayerBasicInfo basic_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 @@ -174,41 +216,41 @@ public final class PlayerSyncScNotifyOuterClass { * @return internal storage object for modifications */ public PlayerBasicInfoOuterClass.PlayerBasicInfo getMutableBasicInfo() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return basicInfo; } /** - * optional .PlayerBasicInfo basic_info = 4; + * optional .PlayerBasicInfo basic_info = 15; * @param value the basicInfo to set * @return this */ public PlayerSyncScNotify setBasicInfo(final PlayerBasicInfoOuterClass.PlayerBasicInfo value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; basicInfo.copyFrom(value); return this; } /** - * optional .BoardDataSync board_data_sync = 1627; + * optional .BoardDataSync board_data_sync = 480; * @return whether the boardDataSync field is set */ public boolean hasBoardDataSync() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional .BoardDataSync board_data_sync = 1627; + * optional .BoardDataSync board_data_sync = 480; * @return this */ public PlayerSyncScNotify clearBoardDataSync() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; boardDataSync.clear(); return this; } /** - * optional .BoardDataSync board_data_sync = 1627; + * optional .BoardDataSync board_data_sync = 480; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -222,7 +264,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .BoardDataSync board_data_sync = 1627; + * optional .BoardDataSync board_data_sync = 480; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -231,91 +273,23 @@ public final class PlayerSyncScNotifyOuterClass { * @return internal storage object for modifications */ public BoardDataSyncOuterClass.BoardDataSync getMutableBoardDataSync() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return boardDataSync; } /** - * optional .BoardDataSync board_data_sync = 1627; + * optional .BoardDataSync board_data_sync = 480; * @param value the boardDataSync to set * @return this */ public PlayerSyncScNotify setBoardDataSync(final BoardDataSyncOuterClass.BoardDataSync value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; boardDataSync.copyFrom(value); return this; } /** - * repeated uint32 del_relic_list = 8; - * @return whether the delRelicList field is set - */ - public boolean hasDelRelicList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated uint32 del_relic_list = 8; - * @return this - */ - public PlayerSyncScNotify clearDelRelicList() { - bitField0_ &= ~0x00000008; - delRelicList.clear(); - return this; - } - - /** - * 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. - * - * Use {@link #getMutableDelRelicList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getDelRelicList() { - return delRelicList; - } - - /** - * repeated uint32 del_relic_list = 8; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableDelRelicList() { - bitField0_ |= 0x00000008; - return delRelicList; - } - - /** - * repeated uint32 del_relic_list = 8; - * @param value the delRelicList to add - * @return this - */ - public PlayerSyncScNotify addDelRelicList(final int value) { - bitField0_ |= 0x00000008; - delRelicList.add(value); - return this; - } - - /** - * repeated uint32 del_relic_list = 8; - * @param values the delRelicList to add - * @return this - */ - public PlayerSyncScNotify addAllDelRelicList(final int... values) { - bitField0_ |= 0x00000008; - delRelicList.addAll(values); - return this; - } - - /** - * repeated uint32 del_equipment_list = 13; + * repeated uint32 del_equipment_list = 7; * @return whether the delEquipmentList field is set */ public boolean hasDelEquipmentList() { @@ -323,7 +297,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_equipment_list = 13; + * repeated uint32 del_equipment_list = 7; * @return this */ public PlayerSyncScNotify clearDelEquipmentList() { @@ -333,7 +307,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_equipment_list = 13; + * repeated uint32 del_equipment_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. @@ -347,7 +321,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_equipment_list = 13; + * repeated uint32 del_equipment_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 @@ -361,7 +335,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_equipment_list = 13; + * repeated uint32 del_equipment_list = 7; * @param value the delEquipmentList to add * @return this */ @@ -372,7 +346,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_equipment_list = 13; + * repeated uint32 del_equipment_list = 7; * @param values the delEquipmentList to add * @return this */ @@ -383,39 +357,39 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated .Relic relic_list = 1; - * @return whether the relicList field is set + * repeated uint32 del_relic_list = 13; + * @return whether the delRelicList field is set */ - public boolean hasRelicList() { + public boolean hasDelRelicList() { return (bitField0_ & 0x00000020) != 0; } /** - * repeated .Relic relic_list = 1; + * repeated uint32 del_relic_list = 13; * @return this */ - public PlayerSyncScNotify clearRelicList() { + public PlayerSyncScNotify clearDelRelicList() { bitField0_ &= ~0x00000020; - relicList.clear(); + delRelicList.clear(); return this; } /** - * repeated .Relic relic_list = 1; + * repeated uint32 del_relic_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableRelicList()} if you want to modify it. + * Use {@link #getMutableDelRelicList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getRelicList() { - return relicList; + public RepeatedInt getDelRelicList() { + return delRelicList; } /** - * repeated .Relic relic_list = 1; + * repeated uint32 del_relic_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -423,121 +397,53 @@ public final class PlayerSyncScNotifyOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableRelicList() { + public RepeatedInt getMutableDelRelicList() { bitField0_ |= 0x00000020; - return relicList; + return delRelicList; } /** - * repeated .Relic relic_list = 1; - * @param value the relicList to add + * repeated uint32 del_relic_list = 13; + * @param value the delRelicList to add * @return this */ - public PlayerSyncScNotify addRelicList(final RelicOuterClass.Relic value) { + public PlayerSyncScNotify addDelRelicList(final int value) { bitField0_ |= 0x00000020; - relicList.add(value); + delRelicList.add(value); return this; } /** - * repeated .Relic relic_list = 1; - * @param values the relicList to add + * repeated uint32 del_relic_list = 13; + * @param values the delRelicList to add * @return this */ - public PlayerSyncScNotify addAllRelicList(final RelicOuterClass.Relic... values) { + public PlayerSyncScNotify addAllDelRelicList(final int... values) { bitField0_ |= 0x00000020; - relicList.addAll(values); + delRelicList.addAll(values); return this; } /** - * repeated .Equipment equipment_list = 6; - * @return whether the equipmentList field is set + * repeated .HeroBasicTypeInfo basic_type_info_list = 1; + * @return whether the basicTypeInfoList field is set */ - public boolean hasEquipmentList() { + public boolean hasBasicTypeInfoList() { return (bitField0_ & 0x00000040) != 0; } /** - * repeated .Equipment equipment_list = 6; - * @return this - */ - public PlayerSyncScNotify clearEquipmentList() { - bitField0_ &= ~0x00000040; - equipmentList.clear(); - return this; - } - - /** - * repeated .Equipment equipment_list = 6; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableEquipmentList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getEquipmentList() { - return equipmentList; - } - - /** - * repeated .Equipment equipment_list = 6; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableEquipmentList() { - bitField0_ |= 0x00000040; - return equipmentList; - } - - /** - * repeated .Equipment equipment_list = 6; - * @param value the equipmentList to add - * @return this - */ - public PlayerSyncScNotify addEquipmentList(final EquipmentOuterClass.Equipment value) { - bitField0_ |= 0x00000040; - equipmentList.add(value); - return this; - } - - /** - * repeated .Equipment equipment_list = 6; - * @param values the equipmentList to add - * @return this - */ - public PlayerSyncScNotify addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { - bitField0_ |= 0x00000040; - equipmentList.addAll(values); - return this; - } - - /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 11; - * @return whether the basicTypeInfoList field is set - */ - public boolean hasBasicTypeInfoList() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * repeated .HeroBasicTypeInfo basic_type_info_list = 1; * @return this */ public PlayerSyncScNotify clearBasicTypeInfoList() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; basicTypeInfoList.clear(); return this; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * repeated .HeroBasicTypeInfo basic_type_info_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. @@ -551,7 +457,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * repeated .HeroBasicTypeInfo basic_type_info_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 @@ -561,36 +467,104 @@ public final class PlayerSyncScNotifyOuterClass { */ public RepeatedMessage getMutableBasicTypeInfoList( ) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; return basicTypeInfoList; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * repeated .HeroBasicTypeInfo basic_type_info_list = 1; * @param value the basicTypeInfoList to add * @return this */ public PlayerSyncScNotify addBasicTypeInfoList( final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; basicTypeInfoList.add(value); return this; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * repeated .HeroBasicTypeInfo basic_type_info_list = 1; * @param values the basicTypeInfoList to add * @return this */ public PlayerSyncScNotify addAllBasicTypeInfoList( final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo... values) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; basicTypeInfoList.addAll(values); return this; } /** - * repeated .Material material_list = 15; + * repeated .Equipment equipment_list = 4; + * @return whether the equipmentList field is set + */ + public boolean hasEquipmentList() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * repeated .Equipment equipment_list = 4; + * @return this + */ + public PlayerSyncScNotify clearEquipmentList() { + bitField0_ &= ~0x00000080; + equipmentList.clear(); + return this; + } + + /** + * repeated .Equipment equipment_list = 4; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableEquipmentList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getEquipmentList() { + return equipmentList; + } + + /** + * repeated .Equipment equipment_list = 4; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableEquipmentList() { + bitField0_ |= 0x00000080; + return equipmentList; + } + + /** + * repeated .Equipment equipment_list = 4; + * @param value the equipmentList to add + * @return this + */ + public PlayerSyncScNotify addEquipmentList(final EquipmentOuterClass.Equipment value) { + bitField0_ |= 0x00000080; + equipmentList.add(value); + return this; + } + + /** + * repeated .Equipment equipment_list = 4; + * @param values the equipmentList to add + * @return this + */ + public PlayerSyncScNotify addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { + bitField0_ |= 0x00000080; + equipmentList.addAll(values); + return this; + } + + /** + * repeated .Material material_list = 12; * @return whether the materialList field is set */ public boolean hasMaterialList() { @@ -598,7 +572,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated .Material material_list = 15; + * repeated .Material material_list = 12; * @return this */ public PlayerSyncScNotify clearMaterialList() { @@ -608,7 +582,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated .Material material_list = 15; + * repeated .Material material_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. @@ -622,7 +596,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated .Material material_list = 15; + * repeated .Material material_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 @@ -636,7 +610,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated .Material material_list = 15; + * repeated .Material material_list = 12; * @param value the materialList to add * @return this */ @@ -647,7 +621,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated .Material material_list = 15; + * repeated .Material material_list = 12; * @param values the materialList to add * @return this */ @@ -657,20 +631,89 @@ public final class PlayerSyncScNotifyOuterClass { return this; } + /** + * repeated .Relic relic_list = 14; + * @return whether the relicList field is set + */ + public boolean hasRelicList() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * repeated .Relic relic_list = 14; + * @return this + */ + public PlayerSyncScNotify clearRelicList() { + bitField0_ &= ~0x00000200; + relicList.clear(); + return this; + } + + /** + * repeated .Relic relic_list = 14; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableRelicList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getRelicList() { + return relicList; + } + + /** + * repeated .Relic relic_list = 14; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableRelicList() { + bitField0_ |= 0x00000200; + return relicList; + } + + /** + * repeated .Relic relic_list = 14; + * @param value the relicList to add + * @return this + */ + public PlayerSyncScNotify addRelicList(final RelicOuterClass.Relic value) { + bitField0_ |= 0x00000200; + relicList.add(value); + return this; + } + + /** + * repeated .Relic relic_list = 14; + * @param values the relicList to add + * @return this + */ + public PlayerSyncScNotify addAllRelicList(final RelicOuterClass.Relic... values) { + bitField0_ |= 0x00000200; + relicList.addAll(values); + return this; + } + @Override public PlayerSyncScNotify copyFrom(final PlayerSyncScNotify other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + totalAchievementExp = other.totalAchievementExp; avatarSync.copyFrom(other.avatarSync); basicInfo.copyFrom(other.basicInfo); boardDataSync.copyFrom(other.boardDataSync); - delRelicList.copyFrom(other.delRelicList); delEquipmentList.copyFrom(other.delEquipmentList); - relicList.copyFrom(other.relicList); - equipmentList.copyFrom(other.equipmentList); + delRelicList.copyFrom(other.delRelicList); basicTypeInfoList.copyFrom(other.basicTypeInfoList); + equipmentList.copyFrom(other.equipmentList); materialList.copyFrom(other.materialList); + relicList.copyFrom(other.relicList); } return this; } @@ -681,6 +724,9 @@ public final class PlayerSyncScNotifyOuterClass { return this; } cachedSize = -1; + if (other.hasTotalAchievementExp()) { + setTotalAchievementExp(other.totalAchievementExp); + } if (other.hasAvatarSync()) { getMutableAvatarSync().mergeFrom(other.avatarSync); } @@ -690,24 +736,24 @@ public final class PlayerSyncScNotifyOuterClass { if (other.hasBoardDataSync()) { getMutableBoardDataSync().mergeFrom(other.boardDataSync); } - if (other.hasDelRelicList()) { - getMutableDelRelicList().addAll(other.delRelicList); - } if (other.hasDelEquipmentList()) { getMutableDelEquipmentList().addAll(other.delEquipmentList); } - if (other.hasRelicList()) { - getMutableRelicList().addAll(other.relicList); - } - if (other.hasEquipmentList()) { - getMutableEquipmentList().addAll(other.equipmentList); + if (other.hasDelRelicList()) { + getMutableDelRelicList().addAll(other.delRelicList); } if (other.hasBasicTypeInfoList()) { getMutableBasicTypeInfoList().addAll(other.basicTypeInfoList); } + if (other.hasEquipmentList()) { + getMutableEquipmentList().addAll(other.equipmentList); + } if (other.hasMaterialList()) { getMutableMaterialList().addAll(other.materialList); } + if (other.hasRelicList()) { + getMutableRelicList().addAll(other.relicList); + } return this; } @@ -718,15 +764,16 @@ public final class PlayerSyncScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; + totalAchievementExp = 0; avatarSync.clear(); basicInfo.clear(); boardDataSync.clear(); - delRelicList.clear(); delEquipmentList.clear(); - relicList.clear(); - equipmentList.clear(); + delRelicList.clear(); basicTypeInfoList.clear(); + equipmentList.clear(); materialList.clear(); + relicList.clear(); return this; } @@ -740,12 +787,12 @@ public final class PlayerSyncScNotifyOuterClass { avatarSync.clearQuick(); basicInfo.clearQuick(); boardDataSync.clearQuick(); - delRelicList.clear(); delEquipmentList.clear(); - relicList.clearQuick(); - equipmentList.clearQuick(); + delRelicList.clear(); basicTypeInfoList.clearQuick(); + equipmentList.clearQuick(); materialList.clearQuick(); + relicList.clearQuick(); return this; } @@ -759,99 +806,107 @@ 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)) && (!hasBoardDataSync() || boardDataSync.equals(other.boardDataSync)) - && (!hasDelRelicList() || delRelicList.equals(other.delRelicList)) && (!hasDelEquipmentList() || delEquipmentList.equals(other.delEquipmentList)) - && (!hasRelicList() || relicList.equals(other.relicList)) - && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)) + && (!hasDelRelicList() || delRelicList.equals(other.delRelicList)) && (!hasBasicTypeInfoList() || basicTypeInfoList.equals(other.basicTypeInfoList)) - && (!hasMaterialList() || materialList.equals(other.materialList)); + && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)) + && (!hasMaterialList() || materialList.equals(other.materialList)) + && (!hasRelicList() || relicList.equals(other.relicList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(avatarSync); + output.writeRawLittleEndian16((short) 29168); + output.writeUInt32NoTag(totalAchievementExp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(basicInfo); + output.writeRawByte((byte) 90); + output.writeMessageNoTag(avatarSync); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 26074); - output.writeMessageNoTag(boardDataSync); + output.writeRawByte((byte) 122); + output.writeMessageNoTag(basicInfo); } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < delRelicList.length(); i++) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(delRelicList.array()[i]); - } + output.writeRawLittleEndian16((short) 7810); + output.writeMessageNoTag(boardDataSync); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < delEquipmentList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(delEquipmentList.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(relicList.get(i)); + for (int i = 0; i < delRelicList.length(); i++) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(delRelicList.array()[i]); } } if ((bitField0_ & 0x00000040) != 0) { - for (int i = 0; i < equipmentList.length(); i++) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(equipmentList.get(i)); + for (int i = 0; i < basicTypeInfoList.length(); i++) { + output.writeRawByte((byte) 10); + output.writeMessageNoTag(basicTypeInfoList.get(i)); } } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < basicTypeInfoList.length(); i++) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(basicTypeInfoList.get(i)); + for (int i = 0; i < equipmentList.length(); i++) { + output.writeRawByte((byte) 34); + output.writeMessageNoTag(equipmentList.get(i)); } } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < materialList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 98); output.writeMessageNoTag(materialList.get(i)); } } + if ((bitField0_ & 0x00000200) != 0) { + for (int i = 0; i < relicList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(relicList.get(i)); + } + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(avatarSync); + size += 2 + ProtoSink.computeUInt32SizeNoTag(totalAchievementExp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(basicInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(avatarSync); } if ((bitField0_ & 0x00000004) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(boardDataSync); + size += 1 + ProtoSink.computeMessageSizeNoTag(basicInfo); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * delRelicList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delRelicList); + size += 2 + ProtoSink.computeMessageSizeNoTag(boardDataSync); } if ((bitField0_ & 0x00000010) != 0) { size += (1 * delEquipmentList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delEquipmentList); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + size += (1 * delRelicList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delRelicList); } if ((bitField0_ & 0x00000040) != 0) { - size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); + size += (1 * basicTypeInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(basicTypeInfoList); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * basicTypeInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(basicTypeInfoList); + size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); } if ((bitField0_ & 0x00000100) != 0) { size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); } + if ((bitField0_ & 0x00000200) != 0) { + size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + } return size; } @@ -862,79 +917,88 @@ public final class PlayerSyncScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { - // avatarSync - input.readMessage(avatarSync); + case 14576: { + // totalAchievementExp + totalAchievementExp = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 90) { break; } } - case 34: { - // basicInfo - input.readMessage(basicInfo); + case 90: { + // avatarSync + input.readMessage(avatarSync); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 13018) { + if (tag != 122) { break; } } - case 13018: { - // boardDataSync - input.readMessage(boardDataSync); + case 122: { + // basicInfo + input.readMessage(basicInfo); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 66) { + if (tag != 3842) { break; } } - case 66: { - // delRelicList [packed=true] - input.readPackedUInt32(delRelicList, tag); + case 3842: { + // boardDataSync + input.readMessage(boardDataSync); bitField0_ |= 0x00000008; tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // delEquipmentList [packed=true] + input.readPackedUInt32(delEquipmentList, tag); + bitField0_ |= 0x00000010; + tag = input.readTag(); if (tag != 106) { break; } } case 106: { - // delEquipmentList [packed=true] - input.readPackedUInt32(delEquipmentList, tag); - bitField0_ |= 0x00000010; + // delRelicList [packed=true] + input.readPackedUInt32(delRelicList, tag); + bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 10) { break; } } case 10: { - // relicList - tag = input.readRepeatedMessage(relicList, tag); - bitField0_ |= 0x00000020; - if (tag != 50) { - break; - } - } - case 50: { - // equipmentList - tag = input.readRepeatedMessage(equipmentList, tag); - bitField0_ |= 0x00000040; - if (tag != 90) { - break; - } - } - case 90: { // basicTypeInfoList tag = input.readRepeatedMessage(basicTypeInfoList, tag); - bitField0_ |= 0x00000080; - if (tag != 122) { + bitField0_ |= 0x00000040; + if (tag != 34) { break; } } - case 122: { + case 34: { + // equipmentList + tag = input.readRepeatedMessage(equipmentList, tag); + bitField0_ |= 0x00000080; + if (tag != 98) { + break; + } + } + case 98: { // materialList tag = input.readRepeatedMessage(materialList, tag); bitField0_ |= 0x00000100; + if (tag != 114) { + break; + } + } + case 114: { + // relicList + tag = input.readRepeatedMessage(relicList, tag); + bitField0_ |= 0x00000200; if (tag != 0) { break; } @@ -949,18 +1013,18 @@ public final class PlayerSyncScNotifyOuterClass { tag = input.readTag(); break; } - case 64: { - // delRelicList [packed=false] - tag = input.readRepeatedUInt32(delRelicList, tag); - bitField0_ |= 0x00000008; - break; - } - case 104: { + case 56: { // delEquipmentList [packed=false] tag = input.readRepeatedUInt32(delEquipmentList, tag); bitField0_ |= 0x00000010; break; } + case 104: { + // delRelicList [packed=false] + tag = input.readRepeatedUInt32(delRelicList, tag); + bitField0_ |= 0x00000020; + break; + } } } } @@ -969,32 +1033,35 @@ public final class PlayerSyncScNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.avatarSync, avatarSync); + output.writeUInt32(FieldNames.totalAchievementExp, totalAchievementExp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.basicInfo, basicInfo); + output.writeMessage(FieldNames.avatarSync, avatarSync); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.boardDataSync, boardDataSync); + output.writeMessage(FieldNames.basicInfo, basicInfo); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.delRelicList, delRelicList); + output.writeMessage(FieldNames.boardDataSync, boardDataSync); } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedUInt32(FieldNames.delEquipmentList, delEquipmentList); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.relicList, relicList); + output.writeRepeatedUInt32(FieldNames.delRelicList, delRelicList); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); + output.writeRepeatedMessage(FieldNames.basicTypeInfoList, basicTypeInfoList); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.basicTypeInfoList, basicTypeInfoList); + output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); } if ((bitField0_ & 0x00000100) != 0) { output.writeRepeatedMessage(FieldNames.materialList, materialList); } + if ((bitField0_ & 0x00000200) != 0) { + output.writeRepeatedMessage(FieldNames.relicList, relicList); + } output.endObject(); } @@ -1005,12 +1072,24 @@ public final class PlayerSyncScNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 255336658: + case -1295039982: { + if (input.isAtField(FieldNames.totalAchievementExp)) { + if (!input.trySkipNullValue()) { + totalAchievementExp = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case -403178604: case 397279681: { if (input.isAtField(FieldNames.avatarSync)) { if (!input.trySkipNullValue()) { input.readMessage(avatarSync); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -1022,7 +1101,7 @@ public final class PlayerSyncScNotifyOuterClass { if (input.isAtField(FieldNames.basicInfo)) { if (!input.trySkipNullValue()) { input.readMessage(basicInfo); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -1034,18 +1113,6 @@ public final class PlayerSyncScNotifyOuterClass { if (input.isAtField(FieldNames.boardDataSync)) { if (!input.trySkipNullValue()) { input.readMessage(boardDataSync); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1380069094: - case 1336083102: { - if (input.isAtField(FieldNames.delRelicList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(delRelicList); bitField0_ |= 0x00000008; } } else { @@ -1065,11 +1132,11 @@ public final class PlayerSyncScNotifyOuterClass { } break; } - case 204814001: - case 2071893482: { - if (input.isAtField(FieldNames.relicList)) { + case 1380069094: + case 1336083102: { + if (input.isAtField(FieldNames.delRelicList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(relicList); + input.readRepeatedUInt32(delRelicList); bitField0_ |= 0x00000020; } } else { @@ -1077,23 +1144,23 @@ public final class PlayerSyncScNotifyOuterClass { } break; } - case 2007143244: - case 2109525167: { - if (input.isAtField(FieldNames.equipmentList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(equipmentList); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } case -344592620: case -1315699973: { if (input.isAtField(FieldNames.basicTypeInfoList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(basicTypeInfoList); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } + case 2007143244: + case 2109525167: { + if (input.isAtField(FieldNames.equipmentList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(equipmentList); bitField0_ |= 0x00000080; } } else { @@ -1113,6 +1180,18 @@ public final class PlayerSyncScNotifyOuterClass { } break; } + case 204814001: + case 2071893482: { + if (input.isAtField(FieldNames.relicList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(relicList); + bitField0_ |= 0x00000200; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -1166,23 +1245,25 @@ public final class PlayerSyncScNotifyOuterClass { * Contains name constants used for serializing JSON */ 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 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 relicList = FieldName.forField("relicList", "relic_list"); - - static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list"); + static final FieldName delRelicList = FieldName.forField("delRelicList", "del_relic_list"); static final FieldName basicTypeInfoList = FieldName.forField("basicTypeInfoList", "basic_type_info_list"); + static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list"); + static final FieldName materialList = FieldName.forField("materialList", "material_list"); + + static final FieldName relicList = FieldName.forField("relicList", "relic_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java index 67753a6..5b806e4 100644 --- a/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class PromoteAvatarCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 base_avatar_id = 7; + * optional uint32 base_avatar_id = 4; */ private int baseAvatarId; /** - * repeated .ItemCost item_list = 13; + * repeated .ItemCost item_list = 7; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory()); @@ -40,7 +40,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 base_avatar_id = 4; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -48,7 +48,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 base_avatar_id = 4; * @return this */ public PromoteAvatarCsReq clearBaseAvatarId() { @@ -58,7 +58,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 base_avatar_id = 4; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -66,7 +66,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 base_avatar_id = 4; * @param value the baseAvatarId to set * @return this */ @@ -77,7 +77,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 13; + * repeated .ItemCost item_list = 7; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -85,7 +85,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 13; + * repeated .ItemCost item_list = 7; * @return this */ public PromoteAvatarCsReq clearItemList() { @@ -95,7 +95,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 13; + * repeated .ItemCost item_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 13; + * repeated .ItemCost item_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 13; + * repeated .ItemCost item_list = 7; * @param value the itemList to add * @return this */ @@ -134,7 +134,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 13; + * repeated .ItemCost item_list = 7; * @param values the itemList to add * @return this */ @@ -210,12 +210,12 @@ public final class PromoteAvatarCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 58); output.writeMessageNoTag(itemList.get(i)); } } @@ -240,16 +240,16 @@ public final class PromoteAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 32: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 58) { break; } } - case 106: { + case 58: { // itemList tag = input.readRepeatedMessage(itemList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/PromoteEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PromoteEquipmentCsReqOuterClass.java index 421c83c..46d24c3 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 = 15; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 12; + * optional .ItemCostList item_cost_list = 5; */ 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 = 15; * @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 = 15; * @return this */ public PromoteEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 13; + * optional uint32 equipment_unique_id = 15; * @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 = 15; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 12; + * optional .ItemCostList item_cost_list = 5; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 12; + * optional .ItemCostList item_cost_list = 5; * @return this */ public PromoteEquipmentCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 12; + * 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 PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 12; + * 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 PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 12; + * optional .ItemCostList item_cost_list = 5; * @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) 120); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 42); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class PromoteEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 120: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 42) { break; } } - case 98: { + case 42: { // 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 637cd5b..7ac15c8 100644 --- a/src/generated/main/emu/lunarcore/proto/PropAeonInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PropAeonInfoOuterClass.java @@ -19,20 +19,20 @@ public final class PropAeonInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 aeon_id = 7; + * optional uint32 aeon_id = 4; */ private int aeonId; /** - * optional uint32 add_exp = 13; - */ - private int addExp; - - /** - * optional uint32 dialogue_group_id = 14; + * optional uint32 dialogue_group_id = 9; */ private int dialogueGroupId; + /** + * optional uint32 add_exp = 15; + */ + private int addExp; + private PropAeonInfo() { } @@ -44,7 +44,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 aeon_id = 7; + * optional uint32 aeon_id = 4; * @return whether the aeonId field is set */ public boolean hasAeonId() { @@ -52,7 +52,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 aeon_id = 7; + * optional uint32 aeon_id = 4; * @return this */ public PropAeonInfo clearAeonId() { @@ -62,7 +62,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 aeon_id = 7; + * optional uint32 aeon_id = 4; * @return the aeonId */ public int getAeonId() { @@ -70,7 +70,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 aeon_id = 7; + * optional uint32 aeon_id = 4; * @param value the aeonId to set * @return this */ @@ -81,62 +81,25 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 add_exp = 13; - * @return whether the addExp field is set + * optional uint32 dialogue_group_id = 9; + * @return whether the dialogueGroupId field is set */ - public boolean hasAddExp() { + public boolean hasDialogueGroupId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 add_exp = 13; - * @return this - */ - public PropAeonInfo clearAddExp() { - bitField0_ &= ~0x00000002; - addExp = 0; - return this; - } - - /** - * optional uint32 add_exp = 13; - * @return the addExp - */ - public int getAddExp() { - return addExp; - } - - /** - * optional uint32 add_exp = 13; - * @param value the addExp to set - * @return this - */ - public PropAeonInfo setAddExp(final int value) { - bitField0_ |= 0x00000002; - addExp = value; - return this; - } - - /** - * optional uint32 dialogue_group_id = 14; - * @return whether the dialogueGroupId field is set - */ - public boolean hasDialogueGroupId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 dialogue_group_id = 14; + * optional uint32 dialogue_group_id = 9; * @return this */ public PropAeonInfo clearDialogueGroupId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; dialogueGroupId = 0; return this; } /** - * optional uint32 dialogue_group_id = 14; + * optional uint32 dialogue_group_id = 9; * @return the dialogueGroupId */ public int getDialogueGroupId() { @@ -144,24 +107,61 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 dialogue_group_id = 14; + * optional uint32 dialogue_group_id = 9; * @param value the dialogueGroupId to set * @return this */ public PropAeonInfo setDialogueGroupId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; dialogueGroupId = value; return this; } + /** + * optional uint32 add_exp = 15; + * @return whether the addExp field is set + */ + public boolean hasAddExp() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 add_exp = 15; + * @return this + */ + public PropAeonInfo clearAddExp() { + bitField0_ &= ~0x00000004; + addExp = 0; + return this; + } + + /** + * optional uint32 add_exp = 15; + * @return the addExp + */ + public int getAddExp() { + return addExp; + } + + /** + * optional uint32 add_exp = 15; + * @param value the addExp to set + * @return this + */ + public PropAeonInfo setAddExp(final int value) { + bitField0_ |= 0x00000004; + addExp = value; + return this; + } + @Override public PropAeonInfo copyFrom(final PropAeonInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; aeonId = other.aeonId; - addExp = other.addExp; dialogueGroupId = other.dialogueGroupId; + addExp = other.addExp; } return this; } @@ -175,12 +175,12 @@ public final class PropAeonInfoOuterClass { if (other.hasAeonId()) { setAeonId(other.aeonId); } - if (other.hasAddExp()) { - setAddExp(other.addExp); - } if (other.hasDialogueGroupId()) { setDialogueGroupId(other.dialogueGroupId); } + if (other.hasAddExp()) { + setAddExp(other.addExp); + } return this; } @@ -192,8 +192,8 @@ public final class PropAeonInfoOuterClass { cachedSize = -1; bitField0_ = 0; aeonId = 0; - addExp = 0; dialogueGroupId = 0; + addExp = 0; return this; } @@ -218,23 +218,23 @@ public final class PropAeonInfoOuterClass { PropAeonInfo other = (PropAeonInfo) o; return bitField0_ == other.bitField0_ && (!hasAeonId() || aeonId == other.aeonId) - && (!hasAddExp() || addExp == other.addExp) - && (!hasDialogueGroupId() || dialogueGroupId == other.dialogueGroupId); + && (!hasDialogueGroupId() || dialogueGroupId == other.dialogueGroupId) + && (!hasAddExp() || addExp == other.addExp); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(aeonId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(addExp); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(dialogueGroupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(dialogueGroupId); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(addExp); } } @@ -245,10 +245,10 @@ public final class PropAeonInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(addExp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueGroupId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueGroupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(addExp); } return size; } @@ -260,27 +260,27 @@ public final class PropAeonInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 32: { // aeonId aeonId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { - // addExp - addExp = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 72: { // dialogueGroupId dialogueGroupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // addExp + addExp = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -308,10 +308,10 @@ public final class PropAeonInfoOuterClass { output.writeUInt32(FieldNames.aeonId, aeonId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.addExp, addExp); + output.writeUInt32(FieldNames.dialogueGroupId, dialogueGroupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.dialogueGroupId, dialogueGroupId); + output.writeUInt32(FieldNames.addExp, addExp); } output.endObject(); } @@ -335,11 +335,11 @@ public final class PropAeonInfoOuterClass { } break; } - case -1422538308: - case -1148257921: { - if (input.isAtField(FieldNames.addExp)) { + case 1758320386: + case 1899979106: { + if (input.isAtField(FieldNames.dialogueGroupId)) { if (!input.trySkipNullValue()) { - addExp = input.readUInt32(); + dialogueGroupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -347,11 +347,11 @@ public final class PropAeonInfoOuterClass { } break; } - case 1758320386: - case 1899979106: { - if (input.isAtField(FieldNames.dialogueGroupId)) { + case -1422538308: + case -1148257921: { + if (input.isAtField(FieldNames.addExp)) { if (!input.trySkipNullValue()) { - dialogueGroupId = input.readUInt32(); + addExp = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -413,9 +413,9 @@ public final class PropAeonInfoOuterClass { static class FieldNames { static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id"); - static final FieldName addExp = FieldName.forField("addExp", "add_exp"); - static final FieldName dialogueGroupId = FieldName.forField("dialogueGroupId", "dialogue_group_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 8a824ae..05d439f 100644 --- a/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java @@ -19,7 +19,7 @@ public final class PropExtraInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .PropRogueInfo rogue_info = 2; + * optional .PropRogueInfo rogue_info = 12; */ private final PropRogueInfoOuterClass.PropRogueInfo rogueInfo = PropRogueInfoOuterClass.PropRogueInfo.newInstance(); @@ -34,7 +34,7 @@ public final class PropExtraInfoOuterClass { } /** - * optional .PropRogueInfo rogue_info = 2; + * optional .PropRogueInfo rogue_info = 12; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { @@ -42,7 +42,7 @@ public final class PropExtraInfoOuterClass { } /** - * optional .PropRogueInfo rogue_info = 2; + * optional .PropRogueInfo rogue_info = 12; * @return this */ public PropExtraInfo clearRogueInfo() { @@ -52,7 +52,7 @@ public final class PropExtraInfoOuterClass { } /** - * optional .PropRogueInfo rogue_info = 2; + * optional .PropRogueInfo rogue_info = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public final class PropExtraInfoOuterClass { } /** - * optional .PropRogueInfo rogue_info = 2; + * optional .PropRogueInfo rogue_info = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public final class PropExtraInfoOuterClass { } /** - * optional .PropRogueInfo rogue_info = 2; + * optional .PropRogueInfo rogue_info = 12; * @param value the rogueInfo to set * @return this */ @@ -150,7 +150,7 @@ public final class PropExtraInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 98); output.writeMessageNoTag(rogueInfo); } } @@ -171,7 +171,7 @@ public final class PropExtraInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 98: { // 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 31b2d2c..bec1e1c 100644 --- a/src/generated/main/emu/lunarcore/proto/PropRogueInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PropRogueInfoOuterClass.java @@ -19,15 +19,15 @@ public final class PropRogueInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 site_id = 11; - */ - private int siteId; - - /** - * optional uint32 room_id = 12; + * optional uint32 room_id = 10; */ private int roomId; + /** + * optional uint32 site_id = 13; + */ + private int siteId; + private PropRogueInfo() { } @@ -39,62 +39,25 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 site_id = 11; - * @return whether the siteId field is set + * optional uint32 room_id = 10; + * @return whether the roomId field is set */ - public boolean hasSiteId() { + public boolean hasRoomId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 site_id = 11; - * @return this - */ - public PropRogueInfo clearSiteId() { - bitField0_ &= ~0x00000001; - siteId = 0; - return this; - } - - /** - * optional uint32 site_id = 11; - * @return the siteId - */ - public int getSiteId() { - return siteId; - } - - /** - * optional uint32 site_id = 11; - * @param value the siteId to set - * @return this - */ - public PropRogueInfo 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 = 10; * @return this */ public PropRogueInfo clearRoomId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; roomId = 0; return this; } /** - * optional uint32 room_id = 12; + * optional uint32 room_id = 10; * @return the roomId */ public int getRoomId() { @@ -102,23 +65,60 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 room_id = 12; + * optional uint32 room_id = 10; * @param value the roomId to set * @return this */ public PropRogueInfo setRoomId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; roomId = value; return this; } + /** + * optional uint32 site_id = 13; + * @return whether the siteId field is set + */ + public boolean hasSiteId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 site_id = 13; + * @return this + */ + public PropRogueInfo clearSiteId() { + bitField0_ &= ~0x00000002; + siteId = 0; + return this; + } + + /** + * optional uint32 site_id = 13; + * @return the siteId + */ + public int getSiteId() { + return siteId; + } + + /** + * optional uint32 site_id = 13; + * @param value the siteId to set + * @return this + */ + public PropRogueInfo setSiteId(final int value) { + bitField0_ |= 0x00000002; + siteId = value; + return this; + } + @Override public PropRogueInfo copyFrom(final PropRogueInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - siteId = other.siteId; roomId = other.roomId; + siteId = other.siteId; } return this; } @@ -129,12 +129,12 @@ public final class PropRogueInfoOuterClass { return this; } cachedSize = -1; - if (other.hasSiteId()) { - setSiteId(other.siteId); - } if (other.hasRoomId()) { setRoomId(other.roomId); } + if (other.hasSiteId()) { + setSiteId(other.siteId); + } return this; } @@ -145,8 +145,8 @@ public final class PropRogueInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - siteId = 0; roomId = 0; + siteId = 0; return this; } @@ -170,19 +170,19 @@ public final class PropRogueInfoOuterClass { } PropRogueInfo other = (PropRogueInfo) o; return bitField0_ == other.bitField0_ - && (!hasSiteId() || siteId == other.siteId) - && (!hasRoomId() || roomId == other.roomId); + && (!hasRoomId() || roomId == other.roomId) + && (!hasSiteId() || siteId == other.siteId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(siteId); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(roomId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(roomId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(siteId); } } @@ -190,10 +190,10 @@ public final class PropRogueInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId); } return size; } @@ -205,18 +205,18 @@ public final class PropRogueInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { - // siteId - siteId = input.readUInt32(); + case 80: { + // roomId + roomId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 104) { break; } } - case 96: { - // roomId - roomId = input.readUInt32(); + case 104: { + // siteId + siteId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class PropRogueInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.siteId, siteId); + output.writeUInt32(FieldNames.roomId, roomId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.roomId, roomId); + output.writeUInt32(FieldNames.siteId, siteId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class PropRogueInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -902090046: - case 2100001043: { - if (input.isAtField(FieldNames.siteId)) { + case -925319338: + case 1379892991: { + if (input.isAtField(FieldNames.roomId)) { if (!input.trySkipNullValue()) { - siteId = input.readUInt32(); + roomId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class PropRogueInfoOuterClass { } 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 { @@ -332,9 +332,9 @@ public final class PropRogueInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName siteId = FieldName.forField("siteId", "site_id"); - static final FieldName roomId = FieldName.forField("roomId", "room_id"); + + static final FieldName siteId = FieldName.forField("siteId", "site_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java b/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java index cd140dc..e3f31b3 100644 --- a/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java @@ -10,7 +10,6 @@ import us.hebi.quickbuf.MessageFactory; import us.hebi.quickbuf.ProtoMessage; import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; -import us.hebi.quickbuf.RepeatedInt; public final class QuestOuterClass { /** @@ -20,30 +19,25 @@ public final class QuestOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 finish_time = 4; + * optional int64 finish_time = 3; */ private long finishTime; /** - * optional uint32 id = 5; + * optional uint32 id = 1; */ private int id; /** - * optional uint32 progress = 6; + * optional uint32 progress = 8; */ private int progress; /** - * optional .QuestStatus status = 13; + * optional .QuestStatus status = 14; */ private int status; - /** - * repeated uint32 IOIPJKJIHJB = 15; - */ - private final RepeatedInt iOIPJKJIHJB = RepeatedInt.newEmptyInstance(); - private Quest() { } @@ -55,7 +49,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 4; + * optional int64 finish_time = 3; * @return whether the finishTime field is set */ public boolean hasFinishTime() { @@ -63,7 +57,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 4; + * optional int64 finish_time = 3; * @return this */ public Quest clearFinishTime() { @@ -73,7 +67,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 4; + * optional int64 finish_time = 3; * @return the finishTime */ public long getFinishTime() { @@ -81,7 +75,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 4; + * optional int64 finish_time = 3; * @param value the finishTime to set * @return this */ @@ -92,7 +86,7 @@ public final class QuestOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 1; * @return whether the id field is set */ public boolean hasId() { @@ -100,7 +94,7 @@ public final class QuestOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 1; * @return this */ public Quest clearId() { @@ -110,7 +104,7 @@ public final class QuestOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 1; * @return the id */ public int getId() { @@ -118,7 +112,7 @@ public final class QuestOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 1; * @param value the id to set * @return this */ @@ -129,7 +123,7 @@ public final class QuestOuterClass { } /** - * optional uint32 progress = 6; + * optional uint32 progress = 8; * @return whether the progress field is set */ public boolean hasProgress() { @@ -137,7 +131,7 @@ public final class QuestOuterClass { } /** - * optional uint32 progress = 6; + * optional uint32 progress = 8; * @return this */ public Quest clearProgress() { @@ -147,7 +141,7 @@ public final class QuestOuterClass { } /** - * optional uint32 progress = 6; + * optional uint32 progress = 8; * @return the progress */ public int getProgress() { @@ -155,7 +149,7 @@ public final class QuestOuterClass { } /** - * optional uint32 progress = 6; + * optional uint32 progress = 8; * @param value the progress to set * @return this */ @@ -166,7 +160,7 @@ public final class QuestOuterClass { } /** - * optional .QuestStatus status = 13; + * optional .QuestStatus status = 14; * @return whether the status field is set */ public boolean hasStatus() { @@ -174,7 +168,7 @@ public final class QuestOuterClass { } /** - * optional .QuestStatus status = 13; + * optional .QuestStatus status = 14; * @return this */ public Quest clearStatus() { @@ -184,7 +178,7 @@ public final class QuestOuterClass { } /** - * optional .QuestStatus status = 13; + * optional .QuestStatus status = 14; * @return the status */ public QuestStatusOuterClass.QuestStatus getStatus() { @@ -217,7 +211,7 @@ public final class QuestOuterClass { } /** - * optional .QuestStatus status = 13; + * optional .QuestStatus status = 14; * @param value the status to set * @return this */ @@ -227,74 +221,6 @@ public final class QuestOuterClass { return this; } - /** - * repeated uint32 IOIPJKJIHJB = 15; - * @return whether the iOIPJKJIHJB field is set - */ - public boolean hasIOIPJKJIHJB() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated uint32 IOIPJKJIHJB = 15; - * @return this - */ - public Quest clearIOIPJKJIHJB() { - bitField0_ &= ~0x00000010; - iOIPJKJIHJB.clear(); - return this; - } - - /** - * repeated uint32 IOIPJKJIHJB = 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 #getMutableIOIPJKJIHJB()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getIOIPJKJIHJB() { - return iOIPJKJIHJB; - } - - /** - * repeated uint32 IOIPJKJIHJB = 15; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableIOIPJKJIHJB() { - bitField0_ |= 0x00000010; - return iOIPJKJIHJB; - } - - /** - * repeated uint32 IOIPJKJIHJB = 15; - * @param value the iOIPJKJIHJB to add - * @return this - */ - public Quest addIOIPJKJIHJB(final int value) { - bitField0_ |= 0x00000010; - iOIPJKJIHJB.add(value); - return this; - } - - /** - * repeated uint32 IOIPJKJIHJB = 15; - * @param values the iOIPJKJIHJB to add - * @return this - */ - public Quest addAllIOIPJKJIHJB(final int... values) { - bitField0_ |= 0x00000010; - iOIPJKJIHJB.addAll(values); - return this; - } - @Override public Quest copyFrom(final Quest other) { cachedSize = other.cachedSize; @@ -304,7 +230,6 @@ public final class QuestOuterClass { id = other.id; progress = other.progress; status = other.status; - iOIPJKJIHJB.copyFrom(other.iOIPJKJIHJB); } return this; } @@ -327,9 +252,6 @@ public final class QuestOuterClass { if (other.hasStatus()) { setStatusValue(other.status); } - if (other.hasIOIPJKJIHJB()) { - getMutableIOIPJKJIHJB().addAll(other.iOIPJKJIHJB); - } return this; } @@ -344,7 +266,6 @@ public final class QuestOuterClass { id = 0; progress = 0; status = 0; - iOIPJKJIHJB.clear(); return this; } @@ -355,7 +276,6 @@ public final class QuestOuterClass { } cachedSize = -1; bitField0_ = 0; - iOIPJKJIHJB.clear(); return this; } @@ -372,34 +292,27 @@ public final class QuestOuterClass { && (!hasFinishTime() || finishTime == other.finishTime) && (!hasId() || id == other.id) && (!hasProgress() || progress == other.progress) - && (!hasStatus() || status == other.status) - && (!hasIOIPJKJIHJB() || iOIPJKJIHJB.equals(other.iOIPJKJIHJB)); + && (!hasStatus() || status == other.status); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 24); output.writeInt64NoTag(finishTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(progress); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 112); output.writeEnumNoTag(status); } - if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < iOIPJKJIHJB.length(); i++) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(iOIPJKJIHJB.array()[i]); - } - } } @Override @@ -417,9 +330,6 @@ public final class QuestOuterClass { if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(status); } - if ((bitField0_ & 0x00000010) != 0) { - size += (1 * iOIPJKJIHJB.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(iOIPJKJIHJB); - } return size; } @@ -430,34 +340,34 @@ public final class QuestOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 24: { // finishTime finishTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 8) { break; } } - case 40: { + case 8: { // id id = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 64) { break; } } - case 48: { + case 64: { // progress progress = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 112) { break; } } - case 104: { + case 112: { // status final int value = input.readInt32(); if (QuestStatusOuterClass.QuestStatus.forNumber(value) != null) { @@ -465,15 +375,6 @@ public final class QuestOuterClass { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { - // iOIPJKJIHJB [packed=true] - input.readPackedUInt32(iOIPJKJIHJB, tag); - bitField0_ |= 0x00000010; - tag = input.readTag(); if (tag != 0) { break; } @@ -488,12 +389,6 @@ public final class QuestOuterClass { tag = input.readTag(); break; } - case 120: { - // iOIPJKJIHJB [packed=false] - tag = input.readRepeatedUInt32(iOIPJKJIHJB, tag); - bitField0_ |= 0x00000010; - break; - } } } } @@ -513,9 +408,6 @@ public final class QuestOuterClass { if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.status, status, QuestStatusOuterClass.QuestStatus.converter()); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedUInt32(FieldNames.iOIPJKJIHJB, iOIPJKJIHJB); - } output.endObject(); } @@ -576,17 +468,6 @@ public final class QuestOuterClass { } break; } - case 1686124499: { - if (input.isAtField(FieldNames.iOIPJKJIHJB)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(iOIPJKJIHJB); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } default: { input.skipUnknownField(); break; @@ -646,8 +527,6 @@ public final class QuestOuterClass { static final FieldName progress = FieldName.forField("progress"); static final FieldName status = FieldName.forField("status"); - - static final FieldName iOIPJKJIHJB = FieldName.forField("IOIPJKJIHJB"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java index 2634329..d309e94 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 = 2; - */ - private int baseAvatarId; - - /** - * optional uint32 plane_id = 7; - */ - private int planeId; - - /** - * optional uint32 index = 13; + * optional uint32 index = 12; */ private int index; /** - * optional .AvatarType avatar_type = 8; + * optional uint32 plane_id = 13; + */ + private int planeId; + + /** + * optional uint32 base_avatar_id = 15; + */ + private int baseAvatarId; + + /** + * optional .AvatarType avatar_type = 5; */ private int avatarType; /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ExtraLineupType extra_lineup_type = 8; */ private int extraLineupType; /** - * optional bool is_virtual = 5; + * optional bool is_virtual = 7; */ private boolean isVirtual; @@ -59,44 +59,44 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 2; - * @return whether the baseAvatarId field is set + * optional uint32 index = 12; + * @return whether the index field is set */ - public boolean hasBaseAvatarId() { + public boolean hasIndex() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 base_avatar_id = 2; + * optional uint32 index = 12; * @return this */ - public QuitLineupCsReq clearBaseAvatarId() { + public QuitLineupCsReq clearIndex() { bitField0_ &= ~0x00000001; - baseAvatarId = 0; + index = 0; return this; } /** - * optional uint32 base_avatar_id = 2; - * @return the baseAvatarId + * optional uint32 index = 12; + * @return the index */ - public int getBaseAvatarId() { - return baseAvatarId; + public int getIndex() { + return index; } /** - * optional uint32 base_avatar_id = 2; - * @param value the baseAvatarId to set + * optional uint32 index = 12; + * @param value the index to set * @return this */ - public QuitLineupCsReq setBaseAvatarId(final int value) { + public QuitLineupCsReq setIndex(final int value) { bitField0_ |= 0x00000001; - baseAvatarId = value; + index = value; return this; } /** - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 13; * @return whether the planeId field is set */ public boolean hasPlaneId() { @@ -104,7 +104,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 13; * @return this */ public QuitLineupCsReq clearPlaneId() { @@ -114,7 +114,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 13; * @return the planeId */ public int getPlaneId() { @@ -122,7 +122,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 13; * @param value the planeId to set * @return this */ @@ -133,44 +133,44 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 index = 13; - * @return whether the index field is set + * optional uint32 base_avatar_id = 15; + * @return whether the baseAvatarId field is set */ - public boolean hasIndex() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 index = 13; + * optional uint32 base_avatar_id = 15; * @return this */ - public QuitLineupCsReq clearIndex() { + public QuitLineupCsReq clearBaseAvatarId() { bitField0_ &= ~0x00000004; - index = 0; + baseAvatarId = 0; return this; } /** - * optional uint32 index = 13; - * @return the index + * optional uint32 base_avatar_id = 15; + * @return the baseAvatarId */ - public int getIndex() { - return index; + public int getBaseAvatarId() { + return baseAvatarId; } /** - * optional uint32 index = 13; - * @param value the index to set + * optional uint32 base_avatar_id = 15; + * @param value the baseAvatarId to set * @return this */ - public QuitLineupCsReq setIndex(final int value) { + public QuitLineupCsReq setBaseAvatarId(final int value) { bitField0_ |= 0x00000004; - index = value; + baseAvatarId = value; return this; } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 5; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -178,7 +178,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 5; * @return this */ public QuitLineupCsReq clearAvatarType() { @@ -188,7 +188,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 5; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -221,7 +221,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 5; * @param value the avatarType to set * @return this */ @@ -232,7 +232,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ExtraLineupType extra_lineup_type = 8; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -240,7 +240,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ExtraLineupType extra_lineup_type = 8; * @return this */ public QuitLineupCsReq clearExtraLineupType() { @@ -250,7 +250,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ExtraLineupType extra_lineup_type = 8; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -283,7 +283,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ExtraLineupType extra_lineup_type = 8; * @param value the extraLineupType to set * @return this */ @@ -295,7 +295,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional bool is_virtual = 5; + * 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 = 5; + * optional bool is_virtual = 7; * @return this */ public QuitLineupCsReq clearIsVirtual() { @@ -313,7 +313,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional bool is_virtual = 5; + * optional bool is_virtual = 7; * @return the isVirtual */ public boolean getIsVirtual() { @@ -321,7 +321,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional bool is_virtual = 5; + * optional bool is_virtual = 7; * @param value the isVirtual to set * @return this */ @@ -336,9 +336,9 @@ public final class QuitLineupCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - baseAvatarId = other.baseAvatarId; - planeId = other.planeId; index = other.index; + planeId = other.planeId; + baseAvatarId = other.baseAvatarId; avatarType = other.avatarType; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; @@ -352,14 +352,14 @@ public final class QuitLineupCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); + if (other.hasIndex()) { + setIndex(other.index); } if (other.hasPlaneId()) { setPlaneId(other.planeId); } - if (other.hasIndex()) { - setIndex(other.index); + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); @@ -380,9 +380,9 @@ public final class QuitLineupCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - baseAvatarId = 0; - planeId = 0; index = 0; + planeId = 0; + baseAvatarId = 0; avatarType = 0; extraLineupType = 0; isVirtual = false; @@ -409,9 +409,9 @@ public final class QuitLineupCsReqOuterClass { } QuitLineupCsReq other = (QuitLineupCsReq) o; return bitField0_ == other.bitField0_ - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasPlaneId() || planeId == other.planeId) && (!hasIndex() || index == other.index) + && (!hasPlaneId() || planeId == other.planeId) + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasAvatarType() || avatarType == other.avatarType) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual); @@ -420,27 +420,27 @@ public final class QuitLineupCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(index); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 40); output.writeEnumNoTag(avatarType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 64); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 56); output.writeBoolNoTag(isVirtual); } } @@ -449,13 +449,13 @@ public final class QuitLineupCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); @@ -476,34 +476,34 @@ public final class QuitLineupCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 96: { + // index + index = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // planeId - planeId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // index - index = input.readUInt32(); - bitField0_ |= 0x00000004; + // planeId + planeId = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 120) { break; } } - case 64: { + case 120: { + // baseAvatarId + baseAvatarId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -511,11 +511,11 @@ public final class QuitLineupCsReqOuterClass { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 112) { + if (tag != 64) { break; } } - case 112: { + case 64: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { @@ -523,11 +523,11 @@ public final class QuitLineupCsReqOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 40) { + if (tag != 56) { break; } } - case 40: { + case 56: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000020; @@ -554,13 +554,13 @@ public final class QuitLineupCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); @@ -581,11 +581,10 @@ public final class QuitLineupCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -605,10 +604,11 @@ public final class QuitLineupCsReqOuterClass { } break; } - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -715,11 +715,11 @@ public final class QuitLineupCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - 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 index = FieldName.forField("index"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); diff --git a/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java index 1255872..98cabab 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 = 10; + * optional uint32 rank = 2; */ private int rank; /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 9; */ private int baseAvatarId; /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 7; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -44,7 +44,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional uint32 rank = 10; + * optional uint32 rank = 2; * @return whether the rank field is set */ public boolean hasRank() { @@ -52,7 +52,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional uint32 rank = 10; + * optional uint32 rank = 2; * @return this */ public RankUpAvatarCsReq clearRank() { @@ -62,7 +62,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional uint32 rank = 10; + * optional uint32 rank = 2; * @return the rank */ public int getRank() { @@ -70,7 +70,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional uint32 rank = 10; + * optional uint32 rank = 2; * @param value the rank to set * @return this */ @@ -81,7 +81,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 9; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -89,7 +89,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 9; * @return this */ public RankUpAvatarCsReq clearBaseAvatarId() { @@ -99,7 +99,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 9; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -107,7 +107,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 9; * @param value the baseAvatarId to set * @return this */ @@ -118,7 +118,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 7; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -126,7 +126,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 7; * @return this */ public RankUpAvatarCsReq clearItemCostList() { @@ -136,7 +136,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * 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. @@ -150,7 +150,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * 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 @@ -164,7 +164,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 7; * @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) 80); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 58); output.writeMessageNoTag(itemCostList); } } @@ -281,25 +281,25 @@ public final class RankUpAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 16: { // rank rank = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 72) { break; } } - case 120: { + case 72: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 66) { + if (tag != 58) { break; } } - case 66: { + case 58: { // 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 e174410..09f5d3d 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 = 10; + * optional uint32 equipment_unique_id = 13; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 9; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 10; + * optional uint32 equipment_unique_id = 13; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 10; + * optional uint32 equipment_unique_id = 13; * @return this */ public RankUpEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 10; + * optional uint32 equipment_unique_id = 13; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 10; + * optional uint32 equipment_unique_id = 13; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 9; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 9; * @return this */ public RankUpEquipmentCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 9; * @param value the itemCostList to set * @return this */ @@ -198,11 +198,11 @@ public final class RankUpEquipmentCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 74); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class RankUpEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 104: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 74) { break; } } - case 34: { + case 74: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java index 48ba932..8f70d90 100644 --- a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 stage_id = 12; + * optional uint32 stage_id = 6; */ private int stageId; @@ -34,7 +34,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 12; + * optional uint32 stage_id = 6; * @return whether the stageId field is set */ public boolean hasStageId() { @@ -42,7 +42,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 12; + * optional uint32 stage_id = 6; * @return this */ public ReEnterLastElementStageCsReq clearStageId() { @@ -52,7 +52,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 12; + * optional uint32 stage_id = 6; * @return the stageId */ public int getStageId() { @@ -60,7 +60,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 12; + * optional uint32 stage_id = 6; * @param value the stageId to set * @return this */ @@ -129,7 +129,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(stageId); } } @@ -150,7 +150,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 48: { // 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 be41224..302018d 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 = 3; - */ - private int stageId; - - /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional .SceneBattleInfo battle_info = 11; + * optional uint32 stage_id = 10; + */ + private int stageId; + + /** + * optional .SceneBattleInfo battle_info = 1; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -44,62 +44,25 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional uint32 stage_id = 3; - * @return whether the stageId field is set + * optional uint32 retcode = 6; + * @return whether the retcode field is set */ - public boolean hasStageId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 stage_id = 3; - * @return this - */ - public ReEnterLastElementStageScRsp clearStageId() { - bitField0_ &= ~0x00000001; - stageId = 0; - return this; - } - - /** - * optional uint32 stage_id = 3; - * @return the stageId - */ - public int getStageId() { - return stageId; - } - - /** - * optional uint32 stage_id = 3; - * @param value the stageId to set - * @return this - */ - public ReEnterLastElementStageScRsp setStageId(final int value) { - bitField0_ |= 0x00000001; - stageId = 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 = 6; * @return this */ public ReEnterLastElementStageScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -107,18 +70,55 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; * @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 = 11; + * optional uint32 stage_id = 10; + * @return whether the stageId field is set + */ + public boolean hasStageId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 stage_id = 10; + * @return this + */ + public ReEnterLastElementStageScRsp clearStageId() { + bitField0_ &= ~0x00000002; + stageId = 0; + return this; + } + + /** + * optional uint32 stage_id = 10; + * @return the stageId + */ + public int getStageId() { + return stageId; + } + + /** + * optional uint32 stage_id = 10; + * @param value the stageId to set + * @return this + */ + public ReEnterLastElementStageScRsp setStageId(final int value) { + bitField0_ |= 0x00000002; + stageId = value; + return this; + } + + /** + * optional .SceneBattleInfo battle_info = 1; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -126,7 +126,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_info = 1; * @return this */ public ReEnterLastElementStageScRsp clearBattleInfo() { @@ -136,7 +136,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_info = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_info = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_info = 1; * @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) 24); - output.writeUInt32NoTag(stageId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(stageId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 10); 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 24: { - // stageId - stageId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 48: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 80) { break; } } - case 90: { + case 80: { + // stageId + stageId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000004; @@ -327,10 +327,10 @@ public final class ReEnterLastElementStageScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.stageId, stageId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.battleInfo, battleInfo); @@ -345,11 +345,10 @@ public final class ReEnterLastElementStageScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1897528135: - case 1306191356: { - if (input.isAtField(FieldNames.stageId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - stageId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -357,10 +356,11 @@ public final class ReEnterLastElementStageScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1897528135: + case 1306191356: { + if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + stageId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -435,10 +435,10 @@ public final class ReEnterLastElementStageScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + static final FieldName battleInfo = FieldName.forField("battleInfo", "battle_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java index fcea762..30e8462 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 = 14; + * optional uint32 trigger_entity_id = 4; */ private int triggerEntityId; /** - * optional .MotionInfo trigger_motion = 6; + * optional .MotionInfo trigger_motion = 12; */ private final MotionInfoOuterClass.MotionInfo triggerMotion = MotionInfoOuterClass.MotionInfo.newInstance(); /** - * optional string trigger_name = 4; + * optional string trigger_name = 5; */ private final Utf8String triggerName = Utf8String.newEmptyInstance(); /** - * repeated uint32 trigger_target_id_list = 15; + * repeated uint32 trigger_target_id_list = 10; */ private final RepeatedInt triggerTargetIdList = RepeatedInt.newEmptyInstance(); @@ -51,7 +51,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional uint32 trigger_entity_id = 14; + * optional uint32 trigger_entity_id = 4; * @return whether the triggerEntityId field is set */ public boolean hasTriggerEntityId() { @@ -59,7 +59,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional uint32 trigger_entity_id = 14; + * optional uint32 trigger_entity_id = 4; * @return this */ public RefreshTriggerByClientCsReq clearTriggerEntityId() { @@ -69,7 +69,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional uint32 trigger_entity_id = 14; + * optional uint32 trigger_entity_id = 4; * @return the triggerEntityId */ public int getTriggerEntityId() { @@ -77,7 +77,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional uint32 trigger_entity_id = 14; + * optional uint32 trigger_entity_id = 4; * @param value the triggerEntityId to set * @return this */ @@ -88,7 +88,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 6; + * optional .MotionInfo trigger_motion = 12; * @return whether the triggerMotion field is set */ public boolean hasTriggerMotion() { @@ -96,7 +96,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 6; + * optional .MotionInfo trigger_motion = 12; * @return this */ public RefreshTriggerByClientCsReq clearTriggerMotion() { @@ -106,7 +106,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 6; + * optional .MotionInfo trigger_motion = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -120,7 +120,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 6; + * optional .MotionInfo trigger_motion = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -134,7 +134,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 6; + * optional .MotionInfo trigger_motion = 12; * @param value the triggerMotion to set * @return this */ @@ -146,7 +146,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 4; + * 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 = 4; + * optional string trigger_name = 5; * @return this */ public RefreshTriggerByClientCsReq clearTriggerName() { @@ -164,7 +164,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 5; * @return the triggerName */ public String getTriggerName() { @@ -172,7 +172,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 4; + * 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 = 4; + * 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 = 4; + * 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 = 4; + * 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 = 15; + * repeated uint32 trigger_target_id_list = 10; * @return whether the triggerTargetIdList field is set */ public boolean hasTriggerTargetIdList() { @@ -219,7 +219,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 15; + * repeated uint32 trigger_target_id_list = 10; * @return this */ public RefreshTriggerByClientCsReq clearTriggerTargetIdList() { @@ -229,7 +229,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 15; + * repeated uint32 trigger_target_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. @@ -243,7 +243,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 15; + * repeated uint32 trigger_target_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 @@ -257,7 +257,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 15; + * repeated uint32 trigger_target_id_list = 10; * @param value the triggerTargetIdList to add * @return this */ @@ -268,7 +268,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 15; + * repeated uint32 trigger_target_id_list = 10; * @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) 112); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 98); output.writeMessageNoTag(triggerMotion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 42); output.writeStringNoTag(triggerName); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < triggerTargetIdList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(triggerTargetIdList.array()[i]); } } @@ -402,34 +402,34 @@ public final class RefreshTriggerByClientCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 32: { // triggerEntityId triggerEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 98) { break; } } - case 50: { + case 98: { // triggerMotion input.readMessage(triggerMotion); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 34) { + if (tag != 42) { break; } } - case 34: { + case 42: { // triggerName input.readString(triggerName); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 122) { + if (tag != 82) { break; } } - case 122: { + case 82: { // triggerTargetIdList [packed=true] input.readPackedUInt32(triggerTargetIdList, tag); bitField0_ |= 0x00000008; @@ -448,7 +448,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { tag = input.readTag(); break; } - case 120: { + case 80: { // 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 a2f6025..02b5de0 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 = 7; + * optional uint32 trigger_entity_id = 4; */ private int triggerEntityId; /** - * optional string trigger_name = 1; + * optional string trigger_name = 2; */ private final Utf8String triggerName = Utf8String.newEmptyInstance(); /** - * repeated uint32 trigger_target_id_list = 5; + * repeated uint32 trigger_target_id_list = 14; */ private final RepeatedInt triggerTargetIdList = RepeatedInt.newEmptyInstance(); @@ -46,7 +46,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional uint32 trigger_entity_id = 7; + * optional uint32 trigger_entity_id = 4; * @return whether the triggerEntityId field is set */ public boolean hasTriggerEntityId() { @@ -54,7 +54,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional uint32 trigger_entity_id = 7; + * optional uint32 trigger_entity_id = 4; * @return this */ public RefreshTriggerByClientScNotify clearTriggerEntityId() { @@ -64,7 +64,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional uint32 trigger_entity_id = 7; + * optional uint32 trigger_entity_id = 4; * @return the triggerEntityId */ public int getTriggerEntityId() { @@ -72,7 +72,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional uint32 trigger_entity_id = 7; + * optional uint32 trigger_entity_id = 4; * @param value the triggerEntityId to set * @return this */ @@ -83,7 +83,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 1; + * optional string trigger_name = 2; * @return whether the triggerName field is set */ public boolean hasTriggerName() { @@ -91,7 +91,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 1; + * optional string trigger_name = 2; * @return this */ public RefreshTriggerByClientScNotify clearTriggerName() { @@ -101,7 +101,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 1; + * optional string trigger_name = 2; * @return the triggerName */ public String getTriggerName() { @@ -109,7 +109,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 1; + * optional string trigger_name = 2; * @return internal {@code Utf8String} representation of triggerName for reading */ public Utf8String getTriggerNameBytes() { @@ -117,7 +117,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 1; + * optional string trigger_name = 2; * @return internal {@code Utf8String} representation of triggerName for modifications */ public Utf8String getMutableTriggerNameBytes() { @@ -126,7 +126,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 1; + * optional string trigger_name = 2; * @param value the triggerName to set * @return this */ @@ -137,7 +137,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 1; + * optional string trigger_name = 2; * @param value the triggerName to set * @return this */ @@ -148,7 +148,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 5; + * repeated uint32 trigger_target_id_list = 14; * @return whether the triggerTargetIdList field is set */ public boolean hasTriggerTargetIdList() { @@ -156,7 +156,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 5; + * repeated uint32 trigger_target_id_list = 14; * @return this */ public RefreshTriggerByClientScNotify clearTriggerTargetIdList() { @@ -166,7 +166,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 5; + * repeated uint32 trigger_target_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. @@ -180,7 +180,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 5; + * repeated uint32 trigger_target_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 @@ -194,7 +194,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 5; + * repeated uint32 trigger_target_id_list = 14; * @param value the triggerTargetIdList to add * @return this */ @@ -205,7 +205,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 5; + * repeated uint32 trigger_target_id_list = 14; * @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) 56); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 18); output.writeStringNoTag(triggerName); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < triggerTargetIdList.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(triggerTargetIdList.array()[i]); } } @@ -325,25 +325,25 @@ public final class RefreshTriggerByClientScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 32: { // triggerEntityId triggerEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 18) { break; } } - case 10: { + case 18: { // triggerName input.readString(triggerName); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 114) { break; } } - case 42: { + case 114: { // triggerTargetIdList [packed=true] input.readPackedUInt32(triggerTargetIdList, tag); bitField0_ |= 0x00000004; @@ -362,7 +362,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { tag = input.readTag(); break; } - case 40: { + case 112: { // 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 5015395..82404b2 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 = 5; + * optional uint32 trigger_entity_id = 1; */ private int triggerEntityId; /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 10; */ private int retcode; /** - * optional bool refresh_trigger = 11; + * optional bool refresh_trigger = 12; */ private boolean refreshTrigger; /** - * optional string trigger_name = 9; + * optional string trigger_name = 2; */ private final Utf8String triggerName = Utf8String.newEmptyInstance(); @@ -50,7 +50,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 trigger_entity_id = 5; + * optional uint32 trigger_entity_id = 1; * @return whether the triggerEntityId field is set */ public boolean hasTriggerEntityId() { @@ -58,7 +58,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 trigger_entity_id = 5; + * optional uint32 trigger_entity_id = 1; * @return this */ public RefreshTriggerByClientScRsp clearTriggerEntityId() { @@ -68,7 +68,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 trigger_entity_id = 5; + * optional uint32 trigger_entity_id = 1; * @return the triggerEntityId */ public int getTriggerEntityId() { @@ -76,7 +76,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 trigger_entity_id = 5; + * optional uint32 trigger_entity_id = 1; * @param value the triggerEntityId to set * @return this */ @@ -87,7 +87,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -95,7 +95,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 10; * @return this */ public RefreshTriggerByClientScRsp clearRetcode() { @@ -105,7 +105,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -113,7 +113,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -124,7 +124,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional bool refresh_trigger = 11; + * optional bool refresh_trigger = 12; * @return whether the refreshTrigger field is set */ public boolean hasRefreshTrigger() { @@ -132,7 +132,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional bool refresh_trigger = 11; + * optional bool refresh_trigger = 12; * @return this */ public RefreshTriggerByClientScRsp clearRefreshTrigger() { @@ -142,7 +142,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional bool refresh_trigger = 11; + * optional bool refresh_trigger = 12; * @return the refreshTrigger */ public boolean getRefreshTrigger() { @@ -150,7 +150,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional bool refresh_trigger = 11; + * optional bool refresh_trigger = 12; * @param value the refreshTrigger to set * @return this */ @@ -161,7 +161,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 2; * @return whether the triggerName field is set */ public boolean hasTriggerName() { @@ -169,7 +169,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 2; * @return this */ public RefreshTriggerByClientScRsp clearTriggerName() { @@ -179,7 +179,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 2; * @return the triggerName */ public String getTriggerName() { @@ -187,7 +187,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 2; * @return internal {@code Utf8String} representation of triggerName for reading */ public Utf8String getTriggerNameBytes() { @@ -195,7 +195,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 2; * @return internal {@code Utf8String} representation of triggerName for modifications */ public Utf8String getMutableTriggerNameBytes() { @@ -204,7 +204,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 2; * @param value the triggerName to set * @return this */ @@ -215,7 +215,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 2; * @param value the triggerName to set * @return this */ @@ -303,19 +303,19 @@ public final class RefreshTriggerByClientScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 96); output.writeBoolNoTag(refreshTrigger); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 18); output.writeStringNoTag(triggerName); } } @@ -345,34 +345,34 @@ public final class RefreshTriggerByClientScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 8: { // triggerEntityId triggerEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 80) { break; } } - case 48: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { + case 96: { // refreshTrigger refreshTrigger = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 74) { + if (tag != 18) { break; } } - case 74: { + case 18: { // triggerName input.readString(triggerName); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java index a59c059..f9d32ee 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java @@ -24,7 +24,7 @@ public final class RelicArchiveOuterClass { private int slot; /** - * optional uint32 relic_id = 7; + * optional uint32 relic_id = 15; */ private int relicId; @@ -76,7 +76,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 relic_id = 7; + * optional uint32 relic_id = 15; * @return whether the relicId field is set */ public boolean hasRelicId() { @@ -84,7 +84,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 relic_id = 7; + * optional uint32 relic_id = 15; * @return this */ public RelicArchive clearRelicId() { @@ -94,7 +94,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 relic_id = 7; + * optional uint32 relic_id = 15; * @return the relicId */ public int getRelicId() { @@ -102,7 +102,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 relic_id = 7; + * optional uint32 relic_id = 15; * @param value the relicId to set * @return this */ @@ -181,7 +181,7 @@ public final class RelicArchiveOuterClass { output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(relicId); } } @@ -210,11 +210,11 @@ public final class RelicArchiveOuterClass { slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 120) { break; } } - case 56: { + case 120: { // relicId relicId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java index 371729b..e02f1a2 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java @@ -20,47 +20,47 @@ public final class RelicOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 tid = 2; - */ - private int tid; - - /** - * optional uint32 level = 3; - */ - private int level; - - /** - * optional uint32 unique_id = 5; - */ - private int uniqueId; - - /** - * optional uint32 base_avatar_id = 7; - */ - private int baseAvatarId; - - /** - * optional uint32 exp = 10; - */ - private int exp; - - /** - * optional uint32 main_affix_id = 14; + * optional uint32 main_affix_id = 2; */ private int mainAffixId; /** - * optional bool is_discarded = 4; + * optional uint32 base_avatar_id = 6; */ - private boolean isDiscarded; + private int baseAvatarId; /** - * optional bool is_protected = 11; + * optional uint32 level = 8; + */ + private int level; + + /** + * optional uint32 tid = 10; + */ + private int tid; + + /** + * optional uint32 unique_id = 13; + */ + private int uniqueId; + + /** + * optional uint32 exp = 15; + */ + private int exp; + + /** + * optional bool is_protected = 1; */ private boolean isProtected; /** - * repeated .RelicAffix sub_affix_list = 8; + * optional bool is_discarded = 7; + */ + private boolean isDiscarded; + + /** + * repeated .RelicAffix sub_affix_list = 9; */ private final RepeatedMessage subAffixList = RepeatedMessage.newEmptyInstance(RelicAffixOuterClass.RelicAffix.getFactory()); @@ -75,210 +75,25 @@ public final class RelicOuterClass { } /** - * optional uint32 tid = 2; - * @return whether the tid field is set + * optional uint32 main_affix_id = 2; + * @return whether the mainAffixId field is set */ - public boolean hasTid() { + public boolean hasMainAffixId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 tid = 2; - * @return this - */ - public Relic clearTid() { - bitField0_ &= ~0x00000001; - tid = 0; - return this; - } - - /** - * optional uint32 tid = 2; - * @return the tid - */ - public int getTid() { - return tid; - } - - /** - * optional uint32 tid = 2; - * @param value the tid to set - * @return this - */ - public Relic setTid(final int value) { - bitField0_ |= 0x00000001; - tid = value; - return this; - } - - /** - * optional uint32 level = 3; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 level = 3; - * @return this - */ - public Relic clearLevel() { - bitField0_ &= ~0x00000002; - level = 0; - return this; - } - - /** - * optional uint32 level = 3; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 3; - * @param value the level to set - * @return this - */ - public Relic setLevel(final int value) { - bitField0_ |= 0x00000002; - level = value; - return this; - } - - /** - * optional uint32 unique_id = 5; - * @return whether the uniqueId field is set - */ - public boolean hasUniqueId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 unique_id = 5; - * @return this - */ - public Relic clearUniqueId() { - bitField0_ &= ~0x00000004; - uniqueId = 0; - return this; - } - - /** - * optional uint32 unique_id = 5; - * @return the uniqueId - */ - public int getUniqueId() { - return uniqueId; - } - - /** - * optional uint32 unique_id = 5; - * @param value the uniqueId to set - * @return this - */ - public Relic setUniqueId(final int value) { - bitField0_ |= 0x00000004; - uniqueId = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 7; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 base_avatar_id = 7; - * @return this - */ - public Relic clearBaseAvatarId() { - bitField0_ &= ~0x00000008; - 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 Relic setBaseAvatarId(final int value) { - bitField0_ |= 0x00000008; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 exp = 10; - * @return whether the exp field is set - */ - public boolean hasExp() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 exp = 10; - * @return this - */ - public Relic clearExp() { - bitField0_ &= ~0x00000010; - exp = 0; - return this; - } - - /** - * optional uint32 exp = 10; - * @return the exp - */ - public int getExp() { - return exp; - } - - /** - * optional uint32 exp = 10; - * @param value the exp to set - * @return this - */ - public Relic setExp(final int value) { - bitField0_ |= 0x00000010; - exp = value; - return this; - } - - /** - * optional uint32 main_affix_id = 14; - * @return whether the mainAffixId field is set - */ - public boolean hasMainAffixId() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 main_affix_id = 14; + * optional uint32 main_affix_id = 2; * @return this */ public Relic clearMainAffixId() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000001; mainAffixId = 0; return this; } /** - * optional uint32 main_affix_id = 14; + * optional uint32 main_affix_id = 2; * @return the mainAffixId */ public int getMainAffixId() { @@ -286,73 +101,221 @@ public final class RelicOuterClass { } /** - * optional uint32 main_affix_id = 14; + * optional uint32 main_affix_id = 2; * @param value the mainAffixId to set * @return this */ public Relic setMainAffixId(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000001; mainAffixId = value; return this; } /** - * optional bool is_discarded = 4; - * @return whether the isDiscarded field is set + * optional uint32 base_avatar_id = 6; + * @return whether the baseAvatarId field is set */ - public boolean hasIsDiscarded() { + public boolean hasBaseAvatarId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 base_avatar_id = 6; + * @return this + */ + public Relic clearBaseAvatarId() { + bitField0_ &= ~0x00000002; + baseAvatarId = 0; + return this; + } + + /** + * optional uint32 base_avatar_id = 6; + * @return the baseAvatarId + */ + public int getBaseAvatarId() { + return baseAvatarId; + } + + /** + * optional uint32 base_avatar_id = 6; + * @param value the baseAvatarId to set + * @return this + */ + public Relic setBaseAvatarId(final int value) { + bitField0_ |= 0x00000002; + baseAvatarId = value; + return this; + } + + /** + * optional uint32 level = 8; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 level = 8; + * @return this + */ + public Relic clearLevel() { + bitField0_ &= ~0x00000004; + level = 0; + return this; + } + + /** + * optional uint32 level = 8; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 8; + * @param value the level to set + * @return this + */ + public Relic setLevel(final int value) { + bitField0_ |= 0x00000004; + level = value; + return this; + } + + /** + * optional uint32 tid = 10; + * @return whether the tid field is set + */ + public boolean hasTid() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 tid = 10; + * @return this + */ + public Relic clearTid() { + bitField0_ &= ~0x00000008; + tid = 0; + return this; + } + + /** + * optional uint32 tid = 10; + * @return the tid + */ + public int getTid() { + return tid; + } + + /** + * optional uint32 tid = 10; + * @param value the tid to set + * @return this + */ + public Relic setTid(final int value) { + bitField0_ |= 0x00000008; + tid = value; + return this; + } + + /** + * optional uint32 unique_id = 13; + * @return whether the uniqueId field is set + */ + public boolean hasUniqueId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 unique_id = 13; + * @return this + */ + public Relic clearUniqueId() { + bitField0_ &= ~0x00000010; + uniqueId = 0; + return this; + } + + /** + * optional uint32 unique_id = 13; + * @return the uniqueId + */ + public int getUniqueId() { + return uniqueId; + } + + /** + * optional uint32 unique_id = 13; + * @param value the uniqueId to set + * @return this + */ + public Relic setUniqueId(final int value) { + bitField0_ |= 0x00000010; + uniqueId = value; + return this; + } + + /** + * optional uint32 exp = 15; + * @return whether the exp field is set + */ + public boolean hasExp() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 exp = 15; + * @return this + */ + public Relic clearExp() { + bitField0_ &= ~0x00000020; + exp = 0; + return this; + } + + /** + * optional uint32 exp = 15; + * @return the exp + */ + public int getExp() { + return exp; + } + + /** + * optional uint32 exp = 15; + * @param value the exp to set + * @return this + */ + public Relic setExp(final int value) { + bitField0_ |= 0x00000020; + exp = value; + return this; + } + + /** + * optional bool is_protected = 1; + * @return whether the isProtected field is set + */ + public boolean hasIsProtected() { return (bitField0_ & 0x00000040) != 0; } /** - * optional bool is_discarded = 4; - * @return this - */ - public Relic clearIsDiscarded() { - bitField0_ &= ~0x00000040; - isDiscarded = false; - return this; - } - - /** - * optional bool is_discarded = 4; - * @return the isDiscarded - */ - public boolean getIsDiscarded() { - return isDiscarded; - } - - /** - * optional bool is_discarded = 4; - * @param value the isDiscarded to set - * @return this - */ - public Relic setIsDiscarded(final boolean value) { - bitField0_ |= 0x00000040; - isDiscarded = value; - return this; - } - - /** - * optional bool is_protected = 11; - * @return whether the isProtected field is set - */ - public boolean hasIsProtected() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional bool is_protected = 11; + * optional bool is_protected = 1; * @return this */ public Relic clearIsProtected() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; isProtected = false; return this; } /** - * optional bool is_protected = 11; + * optional bool is_protected = 1; * @return the isProtected */ public boolean getIsProtected() { @@ -360,18 +323,55 @@ public final class RelicOuterClass { } /** - * optional bool is_protected = 11; + * optional bool is_protected = 1; * @param value the isProtected to set * @return this */ public Relic setIsProtected(final boolean value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; isProtected = value; return this; } /** - * repeated .RelicAffix sub_affix_list = 8; + * optional bool is_discarded = 7; + * @return whether the isDiscarded field is set + */ + public boolean hasIsDiscarded() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional bool is_discarded = 7; + * @return this + */ + public Relic clearIsDiscarded() { + bitField0_ &= ~0x00000080; + isDiscarded = false; + return this; + } + + /** + * optional bool is_discarded = 7; + * @return the isDiscarded + */ + public boolean getIsDiscarded() { + return isDiscarded; + } + + /** + * optional bool is_discarded = 7; + * @param value the isDiscarded to set + * @return this + */ + public Relic setIsDiscarded(final boolean value) { + bitField0_ |= 0x00000080; + isDiscarded = value; + return this; + } + + /** + * repeated .RelicAffix sub_affix_list = 9; * @return whether the subAffixList field is set */ public boolean hasSubAffixList() { @@ -379,7 +379,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 8; + * repeated .RelicAffix sub_affix_list = 9; * @return this */ public Relic clearSubAffixList() { @@ -389,7 +389,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 8; + * repeated .RelicAffix sub_affix_list = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -403,7 +403,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 8; + * repeated .RelicAffix sub_affix_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -417,7 +417,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 8; + * repeated .RelicAffix sub_affix_list = 9; * @param value the subAffixList to add * @return this */ @@ -428,7 +428,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 8; + * repeated .RelicAffix sub_affix_list = 9; * @param values the subAffixList to add * @return this */ @@ -443,14 +443,14 @@ public final class RelicOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - tid = other.tid; - level = other.level; - uniqueId = other.uniqueId; - baseAvatarId = other.baseAvatarId; - exp = other.exp; mainAffixId = other.mainAffixId; - isDiscarded = other.isDiscarded; + baseAvatarId = other.baseAvatarId; + level = other.level; + tid = other.tid; + uniqueId = other.uniqueId; + exp = other.exp; isProtected = other.isProtected; + isDiscarded = other.isDiscarded; subAffixList.copyFrom(other.subAffixList); } return this; @@ -462,30 +462,30 @@ public final class RelicOuterClass { return this; } cachedSize = -1; - if (other.hasTid()) { - setTid(other.tid); - } - if (other.hasLevel()) { - setLevel(other.level); - } - if (other.hasUniqueId()) { - setUniqueId(other.uniqueId); + if (other.hasMainAffixId()) { + setMainAffixId(other.mainAffixId); } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } + if (other.hasLevel()) { + setLevel(other.level); + } + if (other.hasTid()) { + setTid(other.tid); + } + if (other.hasUniqueId()) { + setUniqueId(other.uniqueId); + } if (other.hasExp()) { setExp(other.exp); } - if (other.hasMainAffixId()) { - setMainAffixId(other.mainAffixId); + if (other.hasIsProtected()) { + setIsProtected(other.isProtected); } if (other.hasIsDiscarded()) { setIsDiscarded(other.isDiscarded); } - if (other.hasIsProtected()) { - setIsProtected(other.isProtected); - } if (other.hasSubAffixList()) { getMutableSubAffixList().addAll(other.subAffixList); } @@ -499,14 +499,14 @@ public final class RelicOuterClass { } cachedSize = -1; bitField0_ = 0; - tid = 0; - level = 0; - uniqueId = 0; - baseAvatarId = 0; - exp = 0; mainAffixId = 0; - isDiscarded = false; + baseAvatarId = 0; + level = 0; + tid = 0; + uniqueId = 0; + exp = 0; isProtected = false; + isDiscarded = false; subAffixList.clear(); return this; } @@ -532,14 +532,14 @@ public final class RelicOuterClass { } Relic other = (Relic) o; return bitField0_ == other.bitField0_ - && (!hasTid() || tid == other.tid) - && (!hasLevel() || level == other.level) - && (!hasUniqueId() || uniqueId == other.uniqueId) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasExp() || exp == other.exp) && (!hasMainAffixId() || mainAffixId == other.mainAffixId) - && (!hasIsDiscarded() || isDiscarded == other.isDiscarded) + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasLevel() || level == other.level) + && (!hasTid() || tid == other.tid) + && (!hasUniqueId() || uniqueId == other.uniqueId) + && (!hasExp() || exp == other.exp) && (!hasIsProtected() || isProtected == other.isProtected) + && (!hasIsDiscarded() || isDiscarded == other.isDiscarded) && (!hasSubAffixList() || subAffixList.equals(other.subAffixList)); } @@ -547,39 +547,39 @@ public final class RelicOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(tid); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(uniqueId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(exp); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); output.writeUInt32NoTag(mainAffixId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(baseAvatarId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(level); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(tid); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(uniqueId); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(exp); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 32); - output.writeBoolNoTag(isDiscarded); + output.writeRawByte((byte) 8); + output.writeBoolNoTag(isProtected); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 88); - output.writeBoolNoTag(isProtected); + output.writeRawByte((byte) 56); + output.writeBoolNoTag(isDiscarded); } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < subAffixList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 74); output.writeMessageNoTag(subAffixList.get(i)); } } @@ -589,22 +589,22 @@ public final class RelicOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000040) != 0) { size += 2; @@ -626,78 +626,78 @@ public final class RelicOuterClass { while (true) { switch (tag) { case 16: { - // tid - tid = input.readUInt32(); + // mainAffixId + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 48) { break; } } - case 24: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // uniqueId - uniqueId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 48: { // baseAvatarId baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 80) { break; } } case 80: { - // exp - exp = input.readUInt32(); + // tid + tid = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // uniqueId + uniqueId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 112) { + if (tag != 120) { break; } } - case 112: { - // mainAffixId - mainAffixId = input.readUInt32(); + case 120: { + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 32) { + if (tag != 8) { break; } } - case 32: { - // isDiscarded - isDiscarded = input.readBool(); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 8: { // isProtected isProtected = input.readBool(); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 66) { + if (tag != 56) { break; } } - case 66: { + case 56: { + // isDiscarded + isDiscarded = input.readBool(); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { // subAffixList tag = input.readRepeatedMessage(subAffixList, tag); bitField0_ |= 0x00000100; @@ -723,28 +723,28 @@ public final class RelicOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.tid, tid); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.uniqueId, uniqueId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.exp, exp); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.mainAffixId, mainAffixId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.level, level); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.tid, tid); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.uniqueId, uniqueId); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.exp, exp); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeBool(FieldNames.isDiscarded, isDiscarded); + output.writeBool(FieldNames.isProtected, isProtected); } if ((bitField0_ & 0x00000080) != 0) { - output.writeBool(FieldNames.isProtected, isProtected); + output.writeBool(FieldNames.isDiscarded, isDiscarded); } if ((bitField0_ & 0x00000100) != 0) { output.writeRepeatedMessage(FieldNames.subAffixList, subAffixList); @@ -759,10 +759,11 @@ public final class RelicOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 114831: { - if (input.isAtField(FieldNames.tid)) { + case -1973876974: + case -1426712144: { + if (input.isAtField(FieldNames.mainAffixId)) { if (!input.trySkipNullValue()) { - tid = input.readUInt32(); + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -770,34 +771,33 @@ 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 -294460212: - case -538310583: { - if (input.isAtField(FieldNames.uniqueId)) { - if (!input.trySkipNullValue()) { - uniqueId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 118022725: case -1756826157: { if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { baseAvatarId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 114831: { + if (input.isAtField(FieldNames.tid)) { + if (!input.trySkipNullValue()) { + tid = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -805,22 +805,22 @@ public final class RelicOuterClass { } break; } + case -294460212: + case -538310583: { + if (input.isAtField(FieldNames.uniqueId)) { + if (!input.trySkipNullValue()) { + uniqueId = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } case 100893: { if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { exp = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1973876974: - case -1426712144: { - if (input.isAtField(FieldNames.mainAffixId)) { - if (!input.trySkipNullValue()) { - mainAffixId = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -828,23 +828,23 @@ public final class RelicOuterClass { } break; } - case 1044162483: - case -1445363480: { - if (input.isAtField(FieldNames.isDiscarded)) { - if (!input.trySkipNullValue()) { - isDiscarded = input.readBool(); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } case 569879972: case -1919645991: { if (input.isAtField(FieldNames.isProtected)) { if (!input.trySkipNullValue()) { isProtected = input.readBool(); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1044162483: + case -1445363480: { + if (input.isAtField(FieldNames.isDiscarded)) { + if (!input.trySkipNullValue()) { + isDiscarded = input.readBool(); bitField0_ |= 0x00000080; } } else { @@ -916,22 +916,22 @@ public final class RelicOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName tid = FieldName.forField("tid"); - - static final FieldName level = FieldName.forField("level"); - - static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); + static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName level = FieldName.forField("level"); + + static final FieldName tid = FieldName.forField("tid"); + + static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); + static final FieldName exp = FieldName.forField("exp"); - static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); + static final FieldName isProtected = FieldName.forField("isProtected", "is_protected"); static final FieldName isDiscarded = FieldName.forField("isDiscarded", "is_discarded"); - static final FieldName isProtected = FieldName.forField("isProtected", "is_protected"); - static final FieldName subAffixList = FieldName.forField("subAffixList", "sub_affix_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java index c2a496a..bf1660f 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java @@ -19,12 +19,12 @@ public final class RelicParamOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 slot = 8; + * optional uint32 slot = 3; */ private int slot; /** - * optional uint32 relic_unique_id = 13; + * optional uint32 relic_unique_id = 4; */ private int relicUniqueId; @@ -39,7 +39,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 slot = 8; + * optional uint32 slot = 3; * @return whether the slot field is set */ public boolean hasSlot() { @@ -47,7 +47,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 slot = 8; + * optional uint32 slot = 3; * @return this */ public RelicParam clearSlot() { @@ -57,7 +57,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 slot = 8; + * optional uint32 slot = 3; * @return the slot */ public int getSlot() { @@ -65,7 +65,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 slot = 8; + * optional uint32 slot = 3; * @param value the slot to set * @return this */ @@ -76,7 +76,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 relic_unique_id = 13; + * optional uint32 relic_unique_id = 4; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -84,7 +84,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 relic_unique_id = 13; + * optional uint32 relic_unique_id = 4; * @return this */ public RelicParam clearRelicUniqueId() { @@ -94,7 +94,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 relic_unique_id = 13; + * optional uint32 relic_unique_id = 4; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -102,7 +102,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 relic_unique_id = 13; + * optional uint32 relic_unique_id = 4; * @param value the relicUniqueId to set * @return this */ @@ -177,11 +177,11 @@ public final class RelicParamOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(relicUniqueId); } } @@ -205,16 +205,16 @@ public final class RelicParamOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 24: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 32) { break; } } - case 104: { + case 32: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java index 84635cf..b4cbab5 100644 --- a/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java @@ -20,32 +20,32 @@ public final class ReplaceLineupCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 plane_id = 3; - */ - private int planeId; - - /** - * optional uint32 index = 7; + * optional uint32 index = 5; */ private int index; /** - * optional uint32 leader_slot = 14; + * optional uint32 plane_id = 8; + */ + private int planeId; + + /** + * optional uint32 leader_slot = 13; */ private int leaderSlot; /** - * optional .ExtraLineupType extra_lineup_type = 4; + * optional .ExtraLineupType extra_lineup_type = 12; */ private int extraLineupType; /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 7; */ private boolean isVirtual; /** - * repeated .LineupSlotData slots = 1; + * repeated .LineupSlotData slots = 3; */ private final RepeatedMessage slots = RepeatedMessage.newEmptyInstance(LineupSlotDataOuterClass.LineupSlotData.getFactory()); @@ -60,62 +60,25 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 3; - * @return whether the planeId field is set + * optional uint32 index = 5; + * @return whether the index field is set */ - public boolean hasPlaneId() { + public boolean hasIndex() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 plane_id = 3; - * @return this - */ - public ReplaceLineupCsReq clearPlaneId() { - bitField0_ &= ~0x00000001; - 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_ |= 0x00000001; - planeId = value; - return this; - } - - /** - * optional uint32 index = 7; - * @return whether the index field is set - */ - public boolean hasIndex() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 index = 7; + * optional uint32 index = 5; * @return this */ public ReplaceLineupCsReq clearIndex() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; index = 0; return this; } /** - * optional uint32 index = 7; + * optional uint32 index = 5; * @return the index */ public int getIndex() { @@ -123,18 +86,55 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional uint32 index = 7; + * optional uint32 index = 5; * @param value the index to set * @return this */ public ReplaceLineupCsReq setIndex(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; index = value; return this; } /** - * optional uint32 leader_slot = 14; + * optional uint32 plane_id = 8; + * @return whether the planeId field is set + */ + public boolean hasPlaneId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 plane_id = 8; + * @return this + */ + public ReplaceLineupCsReq clearPlaneId() { + bitField0_ &= ~0x00000002; + planeId = 0; + return this; + } + + /** + * optional uint32 plane_id = 8; + * @return the planeId + */ + public int getPlaneId() { + return planeId; + } + + /** + * optional uint32 plane_id = 8; + * @param value the planeId to set + * @return this + */ + public ReplaceLineupCsReq setPlaneId(final int value) { + bitField0_ |= 0x00000002; + planeId = value; + return this; + } + + /** + * optional uint32 leader_slot = 13; * @return whether the leaderSlot field is set */ public boolean hasLeaderSlot() { @@ -142,7 +142,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional uint32 leader_slot = 14; + * optional uint32 leader_slot = 13; * @return this */ public ReplaceLineupCsReq clearLeaderSlot() { @@ -152,7 +152,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional uint32 leader_slot = 14; + * optional uint32 leader_slot = 13; * @return the leaderSlot */ public int getLeaderSlot() { @@ -160,7 +160,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional uint32 leader_slot = 14; + * optional uint32 leader_slot = 13; * @param value the leaderSlot to set * @return this */ @@ -171,7 +171,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 4; + * 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 = 4; + * optional .ExtraLineupType extra_lineup_type = 12; * @return this */ public ReplaceLineupCsReq clearExtraLineupType() { @@ -189,7 +189,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 4; + * 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 = 4; + * 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 = 8; + * optional bool is_virtual = 7; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -242,7 +242,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 7; * @return this */ public ReplaceLineupCsReq clearIsVirtual() { @@ -252,7 +252,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 7; * @return the isVirtual */ public boolean getIsVirtual() { @@ -260,7 +260,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 7; * @param value the isVirtual to set * @return this */ @@ -271,7 +271,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 1; + * repeated .LineupSlotData slots = 3; * @return whether the slots field is set */ public boolean hasSlots() { @@ -279,7 +279,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 1; + * repeated .LineupSlotData slots = 3; * @return this */ public ReplaceLineupCsReq clearSlots() { @@ -289,7 +289,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 1; + * repeated .LineupSlotData slots = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -303,7 +303,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 1; + * repeated .LineupSlotData slots = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -317,7 +317,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 1; + * repeated .LineupSlotData slots = 3; * @param value the slots to add * @return this */ @@ -328,7 +328,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 1; + * repeated .LineupSlotData slots = 3; * @param values the slots to add * @return this */ @@ -343,8 +343,8 @@ public final class ReplaceLineupCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - planeId = other.planeId; index = other.index; + planeId = other.planeId; leaderSlot = other.leaderSlot; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; @@ -359,12 +359,12 @@ public final class ReplaceLineupCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasPlaneId()) { - setPlaneId(other.planeId); - } if (other.hasIndex()) { setIndex(other.index); } + if (other.hasPlaneId()) { + setPlaneId(other.planeId); + } if (other.hasLeaderSlot()) { setLeaderSlot(other.leaderSlot); } @@ -387,8 +387,8 @@ public final class ReplaceLineupCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - planeId = 0; index = 0; + planeId = 0; leaderSlot = 0; extraLineupType = 0; isVirtual = false; @@ -417,8 +417,8 @@ public final class ReplaceLineupCsReqOuterClass { } ReplaceLineupCsReq other = (ReplaceLineupCsReq) o; return bitField0_ == other.bitField0_ - && (!hasPlaneId() || planeId == other.planeId) && (!hasIndex() || index == other.index) + && (!hasPlaneId() || planeId == other.planeId) && (!hasLeaderSlot() || leaderSlot == other.leaderSlot) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual) @@ -428,28 +428,28 @@ public final class ReplaceLineupCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(planeId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(index); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(planeId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(leaderSlot); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 96); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 56); output.writeBoolNoTag(isVirtual); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < slots.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 26); output.writeMessageNoTag(slots.get(i)); } } @@ -459,10 +459,10 @@ public final class ReplaceLineupCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); @@ -486,34 +486,34 @@ public final class ReplaceLineupCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // planeId - planeId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 40: { // index index = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 64) { break; } } - case 112: { + case 64: { + // planeId + planeId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { // leaderSlot leaderSlot = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 32) { + if (tag != 96) { break; } } - case 32: { + 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 != 64) { + if (tag != 56) { break; } } - case 64: { + case 56: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 10) { + if (tag != 26) { break; } } - case 10: { + case 26: { // slots tag = input.readRepeatedMessage(slots, tag); bitField0_ |= 0x00000020; @@ -560,10 +560,10 @@ public final class ReplaceLineupCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.leaderSlot, leaderSlot); @@ -587,11 +587,10 @@ public final class ReplaceLineupCsReqOuterClass { } 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 { @@ -599,10 +598,11 @@ public final class ReplaceLineupCsReqOuterClass { } break; } - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + planeId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -715,10 +715,10 @@ public final class ReplaceLineupCsReqOuterClass { * 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 planeId = FieldName.forField("planeId", "plane_id"); + static final FieldName leaderSlot = FieldName.forField("leaderSlot", "leader_slot"); static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); diff --git a/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeCsReqOuterClass.java index 4b55217..f028249 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 = 15; + * optional uint32 num = 11; */ private int num; @@ -34,7 +34,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { } /** - * optional uint32 num = 15; + * optional uint32 num = 11; * @return whether the num field is set */ public boolean hasNum() { @@ -42,7 +42,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { } /** - * optional uint32 num = 15; + * optional uint32 num = 11; * @return this */ public ReserveStaminaExchangeCsReq clearNum() { @@ -52,7 +52,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { } /** - * optional uint32 num = 15; + * optional uint32 num = 11; * @return the num */ public int getNum() { @@ -60,7 +60,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { } /** - * optional uint32 num = 15; + * optional uint32 num = 11; * @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) 120); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(num); } } @@ -150,7 +150,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 88: { // 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 b6dbb48..f7b27b7 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 = 5; - */ - private int retcode; - - /** - * optional uint32 num = 9; + * optional uint32 num = 8; */ private int num; + /** + * optional uint32 retcode = 12; + */ + private int retcode; + private ReserveStaminaExchangeScRsp() { } @@ -39,62 +39,25 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set + * optional uint32 num = 8; + * @return whether the num field is set */ - public boolean hasRetcode() { + public boolean hasNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 5; - * @return this - */ - public ReserveStaminaExchangeScRsp 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 ReserveStaminaExchangeScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 num = 9; - * @return whether the num field is set - */ - public boolean hasNum() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 num = 9; + * optional uint32 num = 8; * @return this */ public ReserveStaminaExchangeScRsp clearNum() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; num = 0; return this; } /** - * optional uint32 num = 9; + * optional uint32 num = 8; * @return the num */ public int getNum() { @@ -102,23 +65,60 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 num = 9; + * optional uint32 num = 8; * @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 = 12; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 12; + * @return this + */ + public ReserveStaminaExchangeScRsp 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 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) 40); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(num); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(num); + output.writeRawByte((byte) 96); + 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; } @@ -205,18 +205,18 @@ public final class ReserveStaminaExchangeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // retcode - retcode = input.readUInt32(); + case 64: { + // num + num = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 96) { break; } } - case 72: { - // num - num = input.readUInt32(); + case 96: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class 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 e23ba6b..8ac0925 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; - */ - private int fromUid; - - /** - * optional uint32 to_uid = 11; - */ - private int toUid; - - /** - * optional uint32 emote = 14; + * optional uint32 emote = 1; */ private int emote; /** - * optional .ChatType chat_type = 13; + * optional uint32 to_uid = 4; + */ + private int toUid; + + /** + * optional uint32 from_uid = 7; + */ + private int fromUid; + + /** + * optional .ChatType chat_type = 5; */ private int chatType; /** - * optional .MsgType msg_type = 15; + * optional .MsgType msg_type = 9; */ private int msgType; /** - * optional string text = 8; + * optional string text = 10; */ private final Utf8String text = Utf8String.newEmptyInstance(); @@ -60,44 +60,44 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 from_uid = 4; - * @return whether the fromUid field is set + * optional uint32 emote = 1; + * @return whether the emote field is set */ - public boolean hasFromUid() { + public boolean hasEmote() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 from_uid = 4; + * optional uint32 emote = 1; * @return this */ - public RevcMsgScNotify clearFromUid() { + public RevcMsgScNotify clearEmote() { bitField0_ &= ~0x00000001; - fromUid = 0; + emote = 0; return this; } /** - * optional uint32 from_uid = 4; - * @return the fromUid + * optional uint32 emote = 1; + * @return the emote */ - public int getFromUid() { - return fromUid; + public int getEmote() { + return emote; } /** - * optional uint32 from_uid = 4; - * @param value the fromUid to set + * optional uint32 emote = 1; + * @param value the emote to set * @return this */ - public RevcMsgScNotify setFromUid(final int value) { + public RevcMsgScNotify setEmote(final int value) { bitField0_ |= 0x00000001; - fromUid = value; + emote = value; return this; } /** - * optional uint32 to_uid = 11; + * optional uint32 to_uid = 4; * @return whether the toUid field is set */ public boolean hasToUid() { @@ -105,7 +105,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 to_uid = 11; + * optional uint32 to_uid = 4; * @return this */ public RevcMsgScNotify clearToUid() { @@ -115,7 +115,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 to_uid = 11; + * optional uint32 to_uid = 4; * @return the toUid */ public int getToUid() { @@ -123,7 +123,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 to_uid = 11; + * optional uint32 to_uid = 4; * @param value the toUid to set * @return this */ @@ -134,44 +134,44 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 emote = 14; - * @return whether the emote field is set + * optional uint32 from_uid = 7; + * @return whether the fromUid field is set */ - public boolean hasEmote() { + public boolean hasFromUid() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 emote = 14; + * optional uint32 from_uid = 7; * @return this */ - public RevcMsgScNotify clearEmote() { + public RevcMsgScNotify clearFromUid() { bitField0_ &= ~0x00000004; - emote = 0; + fromUid = 0; return this; } /** - * optional uint32 emote = 14; - * @return the emote + * optional uint32 from_uid = 7; + * @return the fromUid */ - public int getEmote() { - return emote; + public int getFromUid() { + return fromUid; } /** - * optional uint32 emote = 14; - * @param value the emote to set + * optional uint32 from_uid = 7; + * @param value the fromUid to set * @return this */ - public RevcMsgScNotify setEmote(final int value) { + public RevcMsgScNotify setFromUid(final int value) { bitField0_ |= 0x00000004; - emote = value; + fromUid = value; return this; } /** - * optional .ChatType chat_type = 13; + * optional .ChatType chat_type = 5; * @return whether the chatType field is set */ public boolean hasChatType() { @@ -179,7 +179,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .ChatType chat_type = 13; + * optional .ChatType chat_type = 5; * @return this */ public RevcMsgScNotify clearChatType() { @@ -189,7 +189,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .ChatType chat_type = 13; + * optional .ChatType chat_type = 5; * @return the chatType */ public ChatTypeOuterClass.ChatType getChatType() { @@ -222,7 +222,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .ChatType chat_type = 13; + * optional .ChatType chat_type = 5; * @param value the chatType to set * @return this */ @@ -233,7 +233,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 15; + * optional .MsgType msg_type = 9; * @return whether the msgType field is set */ public boolean hasMsgType() { @@ -241,7 +241,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 15; + * optional .MsgType msg_type = 9; * @return this */ public RevcMsgScNotify clearMsgType() { @@ -251,7 +251,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 15; + * optional .MsgType msg_type = 9; * @return the msgType */ public MsgTypeOuterClass.MsgType getMsgType() { @@ -284,7 +284,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 15; + * optional .MsgType msg_type = 9; * @param value the msgType to set * @return this */ @@ -295,7 +295,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 8; + * optional string text = 10; * @return whether the text field is set */ public boolean hasText() { @@ -303,7 +303,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 8; + * optional string text = 10; * @return this */ public RevcMsgScNotify clearText() { @@ -313,7 +313,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 8; + * optional string text = 10; * @return the text */ public String getText() { @@ -321,7 +321,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 8; + * optional string text = 10; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -329,7 +329,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 8; + * optional string text = 10; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -338,7 +338,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 8; + * optional string text = 10; * @param value the text to set * @return this */ @@ -349,7 +349,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 8; + * optional string text = 10; * @param value the text to set * @return this */ @@ -364,9 +364,9 @@ public final class RevcMsgScNotifyOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - fromUid = other.fromUid; - toUid = other.toUid; emote = other.emote; + toUid = other.toUid; + fromUid = other.fromUid; chatType = other.chatType; msgType = other.msgType; text.copyFrom(other.text); @@ -380,14 +380,14 @@ public final class RevcMsgScNotifyOuterClass { return this; } cachedSize = -1; - if (other.hasFromUid()) { - setFromUid(other.fromUid); + if (other.hasEmote()) { + setEmote(other.emote); } if (other.hasToUid()) { setToUid(other.toUid); } - if (other.hasEmote()) { - setEmote(other.emote); + if (other.hasFromUid()) { + setFromUid(other.fromUid); } if (other.hasChatType()) { setChatTypeValue(other.chatType); @@ -408,9 +408,9 @@ public final class RevcMsgScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - fromUid = 0; - toUid = 0; emote = 0; + toUid = 0; + fromUid = 0; chatType = 0; msgType = 0; text.clear(); @@ -438,9 +438,9 @@ public final class RevcMsgScNotifyOuterClass { } RevcMsgScNotify other = (RevcMsgScNotify) o; return bitField0_ == other.bitField0_ - && (!hasFromUid() || fromUid == other.fromUid) - && (!hasToUid() || toUid == other.toUid) && (!hasEmote() || emote == other.emote) + && (!hasToUid() || toUid == other.toUid) + && (!hasFromUid() || fromUid == other.fromUid) && (!hasChatType() || chatType == other.chatType) && (!hasMsgType() || msgType == other.msgType) && (!hasText() || text.equals(other.text)); @@ -449,27 +449,27 @@ public final class RevcMsgScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(fromUid); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(emote); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(toUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(emote); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(fromUid); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 40); output.writeEnumNoTag(chatType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 72); output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 82); output.writeStringNoTag(text); } } @@ -478,13 +478,13 @@ public final class RevcMsgScNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(fromUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(emote); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(emote); + size += 1 + ProtoSink.computeUInt32SizeNoTag(fromUid); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(chatType); @@ -505,34 +505,34 @@ public final class RevcMsgScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // fromUid - fromUid = input.readUInt32(); + case 8: { + // emote + emote = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 32) { break; } } - case 88: { + case 32: { // toUid toUid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 56) { break; } } - case 112: { - // emote - emote = input.readUInt32(); + case 56: { + // fromUid + fromUid = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 40) { break; } } - case 104: { + case 40: { // chatType final int value = input.readInt32(); if (ChatTypeOuterClass.ChatType.forNumber(value) != null) { @@ -540,11 +540,11 @@ public final class RevcMsgScNotifyOuterClass { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 120) { + if (tag != 72) { break; } } - case 120: { + case 72: { // msgType final int value = input.readInt32(); if (MsgTypeOuterClass.MsgType.forNumber(value) != null) { @@ -552,11 +552,11 @@ public final class RevcMsgScNotifyOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 66) { + if (tag != 82) { break; } } - case 66: { + case 82: { // text input.readString(text); bitField0_ |= 0x00000020; @@ -583,13 +583,13 @@ public final class RevcMsgScNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.fromUid, fromUid); + output.writeUInt32(FieldNames.emote, emote); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.toUid, toUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.emote, emote); + output.writeUInt32(FieldNames.fromUid, fromUid); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.chatType, chatType, ChatTypeOuterClass.ChatType.converter()); @@ -610,11 +610,10 @@ public final class RevcMsgScNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -594338746: - case -1244322245: { - if (input.isAtField(FieldNames.fromUid)) { + case 96633208: { + if (input.isAtField(FieldNames.emote)) { if (!input.trySkipNullValue()) { - fromUid = input.readUInt32(); + emote = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -634,10 +633,11 @@ public final class RevcMsgScNotifyOuterClass { } break; } - case 96633208: { - if (input.isAtField(FieldNames.emote)) { + case -594338746: + case -1244322245: { + if (input.isAtField(FieldNames.fromUid)) { if (!input.trySkipNullValue()) { - emote = input.readUInt32(); + fromUid = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -743,11 +743,11 @@ public final class RevcMsgScNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName fromUid = FieldName.forField("fromUid", "from_uid"); + static final FieldName emote = FieldName.forField("emote"); static final FieldName toUid = FieldName.forField("toUid", "to_uid"); - static final FieldName emote = FieldName.forField("emote"); + static final FieldName fromUid = FieldName.forField("fromUid", "from_uid"); static final FieldName chatType = FieldName.forField("chatType", "chat_type"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java index 04f2f80..bee9e23 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java @@ -20,31 +20,35 @@ public final class RogueActionOuterClass { /** * 
-     * LLFCJMIMLKM AHNMLHMDONN = 1018;
-     * HKNINLMGOBO KDNAICGDMPF = 300;
-     * MEOJKHHEBII BNCDLNBHMPB = 187;
-     * CPPHCDOAOMC KNNHLJKEGEJ = 746;
-     * FNMHPFGFAML JGLPEKLFGBM = 1274;
+     * CELLDKOCJIA DONMAOEJMEF = 618;
+     * RogueMiracleRepairAction IJGDIIAMLOO = 1746;
+     * RogueMiracleDestroyAction BAECAJOMOJM = 1403;
+     * RogueMiracleDropAction CDLPPJNNBIM = 196;
+     * RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
      *
* - * optional .RogueBonusSelectInfo bonus_select_info = 1074; + * optional .RogueBonusSelectInfo bonus_select_info = 1849; */ private final RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo bonusSelectInfo = RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo.newInstance(); /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 1185; + * 
+     * RogueBuffDropInfo BMIDONBKJNJ = 590;
+     * RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
+     *
+ * + * optional .RogueMiracleSelectInfo miracle_select_info = 1899; */ - private final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo buffSelectInfo = RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo.newInstance(); + private final RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo miracleSelectInfo = RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo.newInstance(); /** * 
-     * MJBKKJOHDBI BMIDONBKJNJ = 1111;
-     * APICFOIELNJ BDLINKPALNL = 1279;
+     *  done
      *
* - * optional .RogueMiracleSelectInfo miracle_select_info = 1967; + * optional .RogueCommonBuffSelectInfo buff_select_info = 1978; */ - private final RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo miracleSelectInfo = RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo.newInstance(); + private final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo buffSelectInfo = RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo.newInstance(); private RogueAction() { } @@ -56,16 +60,50 @@ public final class RogueActionOuterClass { return new RogueAction(); } + public boolean hasAction() { + return (((bitField0_ & 0x00000007)) != 0); + } + + public RogueAction clearAction() { + if (hasAction()) { + clearBonusSelectInfo(); + clearMiracleSelectInfo(); + clearBuffSelectInfo(); + } + return this; + } + + private void clearActionOtherBonusSelectInfo() { + if ((((bitField0_ & 0x00000006)) != 0)) { + clearMiracleSelectInfo(); + clearBuffSelectInfo(); + } + } + + private void clearActionOtherMiracleSelectInfo() { + if ((((bitField0_ & 0x00000005)) != 0)) { + clearBonusSelectInfo(); + clearBuffSelectInfo(); + } + } + + private void clearActionOtherBuffSelectInfo() { + if ((((bitField0_ & 0x00000003)) != 0)) { + clearBonusSelectInfo(); + clearMiracleSelectInfo(); + } + } + /** * 
-     * LLFCJMIMLKM AHNMLHMDONN = 1018;
-     * HKNINLMGOBO KDNAICGDMPF = 300;
-     * MEOJKHHEBII BNCDLNBHMPB = 187;
-     * CPPHCDOAOMC KNNHLJKEGEJ = 746;
-     * FNMHPFGFAML JGLPEKLFGBM = 1274;
+     * CELLDKOCJIA DONMAOEJMEF = 618;
+     * RogueMiracleRepairAction IJGDIIAMLOO = 1746;
+     * RogueMiracleDestroyAction BAECAJOMOJM = 1403;
+     * RogueMiracleDropAction CDLPPJNNBIM = 196;
+     * RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
      *
* - * optional .RogueBonusSelectInfo bonus_select_info = 1074; + * optional .RogueBonusSelectInfo bonus_select_info = 1849; * @return whether the bonusSelectInfo field is set */ public boolean hasBonusSelectInfo() { @@ -74,14 +112,14 @@ public final class RogueActionOuterClass { /** * 
-     * LLFCJMIMLKM AHNMLHMDONN = 1018;
-     * HKNINLMGOBO KDNAICGDMPF = 300;
-     * MEOJKHHEBII BNCDLNBHMPB = 187;
-     * CPPHCDOAOMC KNNHLJKEGEJ = 746;
-     * FNMHPFGFAML JGLPEKLFGBM = 1274;
+     * CELLDKOCJIA DONMAOEJMEF = 618;
+     * RogueMiracleRepairAction IJGDIIAMLOO = 1746;
+     * RogueMiracleDestroyAction BAECAJOMOJM = 1403;
+     * RogueMiracleDropAction CDLPPJNNBIM = 196;
+     * RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
      *
* - * optional .RogueBonusSelectInfo bonus_select_info = 1074; + * optional .RogueBonusSelectInfo bonus_select_info = 1849; * @return this */ public RogueAction clearBonusSelectInfo() { @@ -92,14 +130,14 @@ public final class RogueActionOuterClass { /** * 
-     * LLFCJMIMLKM AHNMLHMDONN = 1018;
-     * HKNINLMGOBO KDNAICGDMPF = 300;
-     * MEOJKHHEBII BNCDLNBHMPB = 187;
-     * CPPHCDOAOMC KNNHLJKEGEJ = 746;
-     * FNMHPFGFAML JGLPEKLFGBM = 1274;
+     * CELLDKOCJIA DONMAOEJMEF = 618;
+     * RogueMiracleRepairAction IJGDIIAMLOO = 1746;
+     * RogueMiracleDestroyAction BAECAJOMOJM = 1403;
+     * RogueMiracleDropAction CDLPPJNNBIM = 196;
+     * RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
      *
* - * optional .RogueBonusSelectInfo bonus_select_info = 1074; + * optional .RogueBonusSelectInfo bonus_select_info = 1849; * * This 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,14 +152,14 @@ public final class RogueActionOuterClass { /** * 
-     * LLFCJMIMLKM AHNMLHMDONN = 1018;
-     * HKNINLMGOBO KDNAICGDMPF = 300;
-     * MEOJKHHEBII BNCDLNBHMPB = 187;
-     * CPPHCDOAOMC KNNHLJKEGEJ = 746;
-     * FNMHPFGFAML JGLPEKLFGBM = 1274;
+     * CELLDKOCJIA DONMAOEJMEF = 618;
+     * RogueMiracleRepairAction IJGDIIAMLOO = 1746;
+     * RogueMiracleDestroyAction BAECAJOMOJM = 1403;
+     * RogueMiracleDropAction CDLPPJNNBIM = 196;
+     * RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
      *
* - * optional .RogueBonusSelectInfo bonus_select_info = 1074; + * optional .RogueBonusSelectInfo bonus_select_info = 1849; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -130,124 +168,67 @@ public final class RogueActionOuterClass { * @return internal storage object for modifications */ public RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo getMutableBonusSelectInfo() { + clearActionOtherBonusSelectInfo(); bitField0_ |= 0x00000001; return bonusSelectInfo; } /** * 
-     * LLFCJMIMLKM AHNMLHMDONN = 1018;
-     * HKNINLMGOBO KDNAICGDMPF = 300;
-     * MEOJKHHEBII BNCDLNBHMPB = 187;
-     * CPPHCDOAOMC KNNHLJKEGEJ = 746;
-     * FNMHPFGFAML JGLPEKLFGBM = 1274;
+     * CELLDKOCJIA DONMAOEJMEF = 618;
+     * RogueMiracleRepairAction IJGDIIAMLOO = 1746;
+     * RogueMiracleDestroyAction BAECAJOMOJM = 1403;
+     * RogueMiracleDropAction CDLPPJNNBIM = 196;
+     * RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
      *
* - * optional .RogueBonusSelectInfo bonus_select_info = 1074; + * optional .RogueBonusSelectInfo bonus_select_info = 1849; * @param value the bonusSelectInfo to set * @return this */ public RogueAction setBonusSelectInfo( final RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo value) { + clearActionOtherBonusSelectInfo(); bitField0_ |= 0x00000001; bonusSelectInfo.copyFrom(value); return this; } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 1185; - * @return whether the buffSelectInfo field is set + * 
+     * RogueBuffDropInfo BMIDONBKJNJ = 590;
+     * RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
+     *
+ * + * optional .RogueMiracleSelectInfo miracle_select_info = 1899; + * @return whether the miracleSelectInfo field is set */ - public boolean hasBuffSelectInfo() { + public boolean hasMiracleSelectInfo() { return (bitField0_ & 0x00000002) != 0; } - /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 1185; - * @return this - */ - public RogueAction clearBuffSelectInfo() { - bitField0_ &= ~0x00000002; - buffSelectInfo.clear(); - return this; - } - - /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 1185; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableBuffSelectInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo getBuffSelectInfo() { - return buffSelectInfo; - } - - /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 1185; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo getMutableBuffSelectInfo( - ) { - bitField0_ |= 0x00000002; - return buffSelectInfo; - } - - /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 1185; - * @param value the buffSelectInfo to set - * @return this - */ - public RogueAction setBuffSelectInfo( - final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo value) { - bitField0_ |= 0x00000002; - buffSelectInfo.copyFrom(value); - return this; - } - /** * 
-     * MJBKKJOHDBI BMIDONBKJNJ = 1111;
-     * APICFOIELNJ BDLINKPALNL = 1279;
+     * RogueBuffDropInfo BMIDONBKJNJ = 590;
+     * RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
      *
* - * optional .RogueMiracleSelectInfo miracle_select_info = 1967; - * @return whether the miracleSelectInfo field is set - */ - public boolean hasMiracleSelectInfo() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * 
-     * MJBKKJOHDBI BMIDONBKJNJ = 1111;
-     * APICFOIELNJ BDLINKPALNL = 1279;
-     *
- * - * optional .RogueMiracleSelectInfo miracle_select_info = 1967; + * optional .RogueMiracleSelectInfo miracle_select_info = 1899; * @return this */ public RogueAction clearMiracleSelectInfo() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; miracleSelectInfo.clear(); return this; } /** * 
-     * MJBKKJOHDBI BMIDONBKJNJ = 1111;
-     * APICFOIELNJ BDLINKPALNL = 1279;
+     * RogueBuffDropInfo BMIDONBKJNJ = 590;
+     * RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
      *
* - * optional .RogueMiracleSelectInfo miracle_select_info = 1967; + * optional .RogueMiracleSelectInfo miracle_select_info = 1899; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -262,11 +243,11 @@ public final class RogueActionOuterClass { /** * 
-     * MJBKKJOHDBI BMIDONBKJNJ = 1111;
-     * APICFOIELNJ BDLINKPALNL = 1279;
+     * RogueBuffDropInfo BMIDONBKJNJ = 590;
+     * RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
      *
* - * optional .RogueMiracleSelectInfo miracle_select_info = 1967; + * optional .RogueMiracleSelectInfo miracle_select_info = 1899; * * 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,35 +256,118 @@ public final class RogueActionOuterClass { * @return internal storage object for modifications */ public RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo getMutableMiracleSelectInfo() { - bitField0_ |= 0x00000004; + clearActionOtherMiracleSelectInfo(); + bitField0_ |= 0x00000002; return miracleSelectInfo; } /** * 
-     * MJBKKJOHDBI BMIDONBKJNJ = 1111;
-     * APICFOIELNJ BDLINKPALNL = 1279;
+     * RogueBuffDropInfo BMIDONBKJNJ = 590;
+     * RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
      *
* - * optional .RogueMiracleSelectInfo miracle_select_info = 1967; + * optional .RogueMiracleSelectInfo miracle_select_info = 1899; * @param value the miracleSelectInfo to set * @return this */ public RogueAction setMiracleSelectInfo( final RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo value) { - bitField0_ |= 0x00000004; + clearActionOtherMiracleSelectInfo(); + bitField0_ |= 0x00000002; miracleSelectInfo.copyFrom(value); return this; } + /** + * 
+     *  done
+     *
+ * + * optional .RogueCommonBuffSelectInfo buff_select_info = 1978; + * @return whether the buffSelectInfo field is set + */ + public boolean hasBuffSelectInfo() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * 
+     *  done
+     *
+ * + * optional .RogueCommonBuffSelectInfo buff_select_info = 1978; + * @return this + */ + public RogueAction clearBuffSelectInfo() { + bitField0_ &= ~0x00000004; + buffSelectInfo.clear(); + return this; + } + + /** + * 
+     *  done
+     *
+ * + * optional .RogueCommonBuffSelectInfo buff_select_info = 1978; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableBuffSelectInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo getBuffSelectInfo() { + return buffSelectInfo; + } + + /** + * 
+     *  done
+     *
+ * + * optional .RogueCommonBuffSelectInfo buff_select_info = 1978; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo getMutableBuffSelectInfo( + ) { + clearActionOtherBuffSelectInfo(); + bitField0_ |= 0x00000004; + return buffSelectInfo; + } + + /** + * 
+     *  done
+     *
+ * + * optional .RogueCommonBuffSelectInfo buff_select_info = 1978; + * @param value the buffSelectInfo to set + * @return this + */ + public RogueAction setBuffSelectInfo( + final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo value) { + clearActionOtherBuffSelectInfo(); + bitField0_ |= 0x00000004; + buffSelectInfo.copyFrom(value); + return this; + } + @Override public RogueAction copyFrom(final RogueAction other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; bonusSelectInfo.copyFrom(other.bonusSelectInfo); - buffSelectInfo.copyFrom(other.buffSelectInfo); miracleSelectInfo.copyFrom(other.miracleSelectInfo); + buffSelectInfo.copyFrom(other.buffSelectInfo); } return this; } @@ -317,12 +381,12 @@ public final class RogueActionOuterClass { if (other.hasBonusSelectInfo()) { getMutableBonusSelectInfo().mergeFrom(other.bonusSelectInfo); } - if (other.hasBuffSelectInfo()) { - getMutableBuffSelectInfo().mergeFrom(other.buffSelectInfo); - } if (other.hasMiracleSelectInfo()) { getMutableMiracleSelectInfo().mergeFrom(other.miracleSelectInfo); } + if (other.hasBuffSelectInfo()) { + getMutableBuffSelectInfo().mergeFrom(other.buffSelectInfo); + } return this; } @@ -334,8 +398,8 @@ public final class RogueActionOuterClass { cachedSize = -1; bitField0_ = 0; bonusSelectInfo.clear(); - buffSelectInfo.clear(); miracleSelectInfo.clear(); + buffSelectInfo.clear(); return this; } @@ -347,8 +411,8 @@ public final class RogueActionOuterClass { cachedSize = -1; bitField0_ = 0; bonusSelectInfo.clearQuick(); - buffSelectInfo.clearQuick(); miracleSelectInfo.clearQuick(); + buffSelectInfo.clearQuick(); return this; } @@ -363,23 +427,23 @@ public final class RogueActionOuterClass { RogueAction other = (RogueAction) o; return bitField0_ == other.bitField0_ && (!hasBonusSelectInfo() || bonusSelectInfo.equals(other.bonusSelectInfo)) - && (!hasBuffSelectInfo() || buffSelectInfo.equals(other.buffSelectInfo)) - && (!hasMiracleSelectInfo() || miracleSelectInfo.equals(other.miracleSelectInfo)); + && (!hasMiracleSelectInfo() || miracleSelectInfo.equals(other.miracleSelectInfo)) + && (!hasBuffSelectInfo() || buffSelectInfo.equals(other.buffSelectInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawLittleEndian16((short) 17298); + output.writeRawLittleEndian16((short) 29642); output.writeMessageNoTag(bonusSelectInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawLittleEndian16((short) 19082); - output.writeMessageNoTag(buffSelectInfo); + output.writeRawLittleEndian16((short) 30426); + output.writeMessageNoTag(miracleSelectInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 31482); - output.writeMessageNoTag(miracleSelectInfo); + output.writeRawLittleEndian16((short) 31698); + output.writeMessageNoTag(buffSelectInfo); } } @@ -390,10 +454,10 @@ public final class RogueActionOuterClass { size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectInfo); } if ((bitField0_ & 0x00000002) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(buffSelectInfo); + size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectInfo); } if ((bitField0_ & 0x00000004) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectInfo); + size += 2 + ProtoSink.computeMessageSizeNoTag(buffSelectInfo); } return size; } @@ -405,27 +469,30 @@ public final class RogueActionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8594: { + case 14794: { // bonusSelectInfo + clearActionOtherBonusSelectInfo(); input.readMessage(bonusSelectInfo); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 9482) { + if (tag != 15194) { break; } } - case 9482: { - // buffSelectInfo - input.readMessage(buffSelectInfo); + case 15194: { + // miracleSelectInfo + clearActionOtherMiracleSelectInfo(); + input.readMessage(miracleSelectInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 15738) { + if (tag != 15826) { break; } } - case 15738: { - // miracleSelectInfo - input.readMessage(miracleSelectInfo); + case 15826: { + // buffSelectInfo + clearActionOtherBuffSelectInfo(); + input.readMessage(buffSelectInfo); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -453,10 +520,10 @@ public final class RogueActionOuterClass { output.writeMessage(FieldNames.bonusSelectInfo, bonusSelectInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.buffSelectInfo, buffSelectInfo); + output.writeMessage(FieldNames.miracleSelectInfo, miracleSelectInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.miracleSelectInfo, miracleSelectInfo); + output.writeMessage(FieldNames.buffSelectInfo, buffSelectInfo); } output.endObject(); } @@ -472,6 +539,7 @@ public final class RogueActionOuterClass { case -1836716559: { if (input.isAtField(FieldNames.bonusSelectInfo)) { if (!input.trySkipNullValue()) { + clearActionOtherBonusSelectInfo(); input.readMessage(bonusSelectInfo); bitField0_ |= 0x00000001; } @@ -480,23 +548,25 @@ public final class RogueActionOuterClass { } break; } - case -255242115: - case 1500540965: { - if (input.isAtField(FieldNames.buffSelectInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(buffSelectInfo); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -1009314021: case -1608054973: { if (input.isAtField(FieldNames.miracleSelectInfo)) { if (!input.trySkipNullValue()) { + clearActionOtherMiracleSelectInfo(); input.readMessage(miracleSelectInfo); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -255242115: + case 1500540965: { + if (input.isAtField(FieldNames.buffSelectInfo)) { + if (!input.trySkipNullValue()) { + clearActionOtherBuffSelectInfo(); + input.readMessage(buffSelectInfo); bitField0_ |= 0x00000004; } } else { @@ -558,9 +628,9 @@ public final class RogueActionOuterClass { static class FieldNames { static final FieldName bonusSelectInfo = FieldName.forField("bonusSelectInfo", "bonus_select_info"); - static final FieldName buffSelectInfo = FieldName.forField("buffSelectInfo", "buff_select_info"); - static final FieldName miracleSelectInfo = FieldName.forField("miracleSelectInfo", "miracle_select_info"); + + static final FieldName buffSelectInfo = FieldName.forField("buffSelectInfo", "buff_select_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java index 22b7c21..5b48dbe 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java @@ -19,39 +19,30 @@ public final class RogueActionResultDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueVirtualItemData remove_item_list = 11; + * optional .RogueVirtualItemData remove_item_list = 12; */ private final RogueVirtualItemDataOuterClass.RogueVirtualItemData removeItemList = RogueVirtualItemDataOuterClass.RogueVirtualItemData.newInstance(); /** - * optional .RogueVirtualItemData add_item_list = 12; + * optional .RogueVirtualItemData add_item_list = 13; */ private final RogueVirtualItemDataOuterClass.RogueVirtualItemData addItemList = RogueVirtualItemDataOuterClass.RogueVirtualItemData.newInstance(); /** - * 
-     * MCFPILGOKJL LBHBDGKKJIJ = 167;
-     * PONBIJNJGJN CANDAIPCPJK = 1473;
-     * KALADHPCJPN CDCGLLGKBPA = 1188;
-     * CNEKDDFMKCK FGHCBKGDKAB = 1032;
-     * HICHEGNFHNG IIDMFNJOBOG = 1742;
-     * PGJANLDGLEM DPCCLAKMHLJ = 477;
-     *
- * - * optional .RogueMiracleData add_miracle_list = 168; + * optional .RogueBuffData remove_buff_list = 818; + */ + private final RogueBuffDataOuterClass.RogueBuffData removeBuffList = RogueBuffDataOuterClass.RogueBuffData.newInstance(); + + /** + * optional .RogueMiracleData add_miracle_list = 1194; */ private final RogueMiracleDataOuterClass.RogueMiracleData addMiracleList = RogueMiracleDataOuterClass.RogueMiracleData.newInstance(); /** - * optional .RogueBuffData add_buff_list = 319; + * optional .RogueBuffData add_buff_list = 1583; */ private final RogueBuffDataOuterClass.RogueBuffData addBuffList = RogueBuffDataOuterClass.RogueBuffData.newInstance(); - /** - * optional .RogueBuffData remove_buff_list = 439; - */ - private final RogueBuffDataOuterClass.RogueBuffData removeBuffList = RogueBuffDataOuterClass.RogueBuffData.newInstance(); - private RogueActionResultData() { } @@ -63,7 +54,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueVirtualItemData remove_item_list = 11; + * optional .RogueVirtualItemData remove_item_list = 12; * @return whether the removeItemList field is set */ public boolean hasRemoveItemList() { @@ -71,7 +62,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueVirtualItemData remove_item_list = 11; + * optional .RogueVirtualItemData remove_item_list = 12; * @return this */ public RogueActionResultData clearRemoveItemList() { @@ -81,7 +72,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueVirtualItemData remove_item_list = 11; + * optional .RogueVirtualItemData remove_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. @@ -95,7 +86,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueVirtualItemData remove_item_list = 11; + * optional .RogueVirtualItemData remove_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 @@ -109,7 +100,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueVirtualItemData remove_item_list = 11; + * optional .RogueVirtualItemData remove_item_list = 12; * @param value the removeItemList to set * @return this */ @@ -121,7 +112,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueVirtualItemData add_item_list = 12; + * optional .RogueVirtualItemData add_item_list = 13; * @return whether the addItemList field is set */ public boolean hasAddItemList() { @@ -129,7 +120,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueVirtualItemData add_item_list = 12; + * optional .RogueVirtualItemData add_item_list = 13; * @return this */ public RogueActionResultData clearAddItemList() { @@ -139,7 +130,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueVirtualItemData add_item_list = 12; + * optional .RogueVirtualItemData add_item_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -153,7 +144,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueVirtualItemData add_item_list = 12; + * optional .RogueVirtualItemData add_item_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -167,7 +158,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueVirtualItemData add_item_list = 12; + * optional .RogueVirtualItemData add_item_list = 13; * @param value the addItemList to set * @return this */ @@ -179,185 +170,25 @@ public final class RogueActionResultDataOuterClass { } /** - * 
-     * MCFPILGOKJL LBHBDGKKJIJ = 167;
-     * PONBIJNJGJN CANDAIPCPJK = 1473;
-     * KALADHPCJPN CDCGLLGKBPA = 1188;
-     * CNEKDDFMKCK FGHCBKGDKAB = 1032;
-     * HICHEGNFHNG IIDMFNJOBOG = 1742;
-     * PGJANLDGLEM DPCCLAKMHLJ = 477;
-     *
- * - * optional .RogueMiracleData add_miracle_list = 168; - * @return whether the addMiracleList field is set + * optional .RogueBuffData remove_buff_list = 818; + * @return whether the removeBuffList field is set */ - public boolean hasAddMiracleList() { + public boolean hasRemoveBuffList() { return (bitField0_ & 0x00000004) != 0; } /** - * 
-     * MCFPILGOKJL LBHBDGKKJIJ = 167;
-     * PONBIJNJGJN CANDAIPCPJK = 1473;
-     * KALADHPCJPN CDCGLLGKBPA = 1188;
-     * CNEKDDFMKCK FGHCBKGDKAB = 1032;
-     * HICHEGNFHNG IIDMFNJOBOG = 1742;
-     * PGJANLDGLEM DPCCLAKMHLJ = 477;
-     *
- * - * optional .RogueMiracleData add_miracle_list = 168; - * @return this - */ - public RogueActionResultData clearAddMiracleList() { - bitField0_ &= ~0x00000004; - addMiracleList.clear(); - return this; - } - - /** - * 
-     * MCFPILGOKJL LBHBDGKKJIJ = 167;
-     * PONBIJNJGJN CANDAIPCPJK = 1473;
-     * KALADHPCJPN CDCGLLGKBPA = 1188;
-     * CNEKDDFMKCK FGHCBKGDKAB = 1032;
-     * HICHEGNFHNG IIDMFNJOBOG = 1742;
-     * PGJANLDGLEM DPCCLAKMHLJ = 477;
-     *
- * - * optional .RogueMiracleData add_miracle_list = 168; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableAddMiracleList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueMiracleDataOuterClass.RogueMiracleData getAddMiracleList() { - return addMiracleList; - } - - /** - * 
-     * MCFPILGOKJL LBHBDGKKJIJ = 167;
-     * PONBIJNJGJN CANDAIPCPJK = 1473;
-     * KALADHPCJPN CDCGLLGKBPA = 1188;
-     * CNEKDDFMKCK FGHCBKGDKAB = 1032;
-     * HICHEGNFHNG IIDMFNJOBOG = 1742;
-     * PGJANLDGLEM DPCCLAKMHLJ = 477;
-     *
- * - * optional .RogueMiracleData add_miracle_list = 168; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueMiracleDataOuterClass.RogueMiracleData getMutableAddMiracleList() { - bitField0_ |= 0x00000004; - return addMiracleList; - } - - /** - * 
-     * MCFPILGOKJL LBHBDGKKJIJ = 167;
-     * PONBIJNJGJN CANDAIPCPJK = 1473;
-     * KALADHPCJPN CDCGLLGKBPA = 1188;
-     * CNEKDDFMKCK FGHCBKGDKAB = 1032;
-     * HICHEGNFHNG IIDMFNJOBOG = 1742;
-     * PGJANLDGLEM DPCCLAKMHLJ = 477;
-     *
- * - * optional .RogueMiracleData add_miracle_list = 168; - * @param value the addMiracleList to set - * @return this - */ - public RogueActionResultData setAddMiracleList( - final RogueMiracleDataOuterClass.RogueMiracleData value) { - bitField0_ |= 0x00000004; - addMiracleList.copyFrom(value); - return this; - } - - /** - * optional .RogueBuffData add_buff_list = 319; - * @return whether the addBuffList field is set - */ - public boolean hasAddBuffList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .RogueBuffData add_buff_list = 319; - * @return this - */ - public RogueActionResultData clearAddBuffList() { - bitField0_ &= ~0x00000008; - addBuffList.clear(); - return this; - } - - /** - * optional .RogueBuffData add_buff_list = 319; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableAddBuffList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueBuffDataOuterClass.RogueBuffData getAddBuffList() { - return addBuffList; - } - - /** - * optional .RogueBuffData add_buff_list = 319; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueBuffDataOuterClass.RogueBuffData getMutableAddBuffList() { - bitField0_ |= 0x00000008; - return addBuffList; - } - - /** - * optional .RogueBuffData add_buff_list = 319; - * @param value the addBuffList to set - * @return this - */ - public RogueActionResultData setAddBuffList(final RogueBuffDataOuterClass.RogueBuffData value) { - bitField0_ |= 0x00000008; - addBuffList.copyFrom(value); - return this; - } - - /** - * optional .RogueBuffData remove_buff_list = 439; - * @return whether the removeBuffList field is set - */ - public boolean hasRemoveBuffList() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .RogueBuffData remove_buff_list = 439; + * optional .RogueBuffData remove_buff_list = 818; * @return this */ public RogueActionResultData clearRemoveBuffList() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; removeBuffList.clear(); return this; } /** - * optional .RogueBuffData remove_buff_list = 439; + * optional .RogueBuffData remove_buff_list = 818; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -371,7 +202,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueBuffData remove_buff_list = 439; + * optional .RogueBuffData remove_buff_list = 818; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -380,22 +211,137 @@ public final class RogueActionResultDataOuterClass { * @return internal storage object for modifications */ public RogueBuffDataOuterClass.RogueBuffData getMutableRemoveBuffList() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; return removeBuffList; } /** - * optional .RogueBuffData remove_buff_list = 439; + * optional .RogueBuffData remove_buff_list = 818; * @param value the removeBuffList to set * @return this */ public RogueActionResultData setRemoveBuffList( final RogueBuffDataOuterClass.RogueBuffData value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; removeBuffList.copyFrom(value); return this; } + /** + * optional .RogueMiracleData add_miracle_list = 1194; + * @return whether the addMiracleList field is set + */ + public boolean hasAddMiracleList() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .RogueMiracleData add_miracle_list = 1194; + * @return this + */ + public RogueActionResultData clearAddMiracleList() { + bitField0_ &= ~0x00000008; + addMiracleList.clear(); + return this; + } + + /** + * optional .RogueMiracleData add_miracle_list = 1194; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableAddMiracleList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueMiracleDataOuterClass.RogueMiracleData getAddMiracleList() { + return addMiracleList; + } + + /** + * optional .RogueMiracleData add_miracle_list = 1194; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueMiracleDataOuterClass.RogueMiracleData getMutableAddMiracleList() { + bitField0_ |= 0x00000008; + return addMiracleList; + } + + /** + * optional .RogueMiracleData add_miracle_list = 1194; + * @param value the addMiracleList to set + * @return this + */ + public RogueActionResultData setAddMiracleList( + final RogueMiracleDataOuterClass.RogueMiracleData value) { + bitField0_ |= 0x00000008; + addMiracleList.copyFrom(value); + return this; + } + + /** + * optional .RogueBuffData add_buff_list = 1583; + * @return whether the addBuffList field is set + */ + public boolean hasAddBuffList() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .RogueBuffData add_buff_list = 1583; + * @return this + */ + public RogueActionResultData clearAddBuffList() { + bitField0_ &= ~0x00000010; + addBuffList.clear(); + return this; + } + + /** + * optional .RogueBuffData add_buff_list = 1583; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableAddBuffList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueBuffDataOuterClass.RogueBuffData getAddBuffList() { + return addBuffList; + } + + /** + * optional .RogueBuffData add_buff_list = 1583; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueBuffDataOuterClass.RogueBuffData getMutableAddBuffList() { + bitField0_ |= 0x00000010; + return addBuffList; + } + + /** + * optional .RogueBuffData add_buff_list = 1583; + * @param value the addBuffList to set + * @return this + */ + public RogueActionResultData setAddBuffList(final RogueBuffDataOuterClass.RogueBuffData value) { + bitField0_ |= 0x00000010; + addBuffList.copyFrom(value); + return this; + } + @Override public RogueActionResultData copyFrom(final RogueActionResultData other) { cachedSize = other.cachedSize; @@ -403,9 +349,9 @@ public final class RogueActionResultDataOuterClass { bitField0_ = other.bitField0_; removeItemList.copyFrom(other.removeItemList); addItemList.copyFrom(other.addItemList); + removeBuffList.copyFrom(other.removeBuffList); addMiracleList.copyFrom(other.addMiracleList); addBuffList.copyFrom(other.addBuffList); - removeBuffList.copyFrom(other.removeBuffList); } return this; } @@ -422,15 +368,15 @@ public final class RogueActionResultDataOuterClass { if (other.hasAddItemList()) { getMutableAddItemList().mergeFrom(other.addItemList); } + if (other.hasRemoveBuffList()) { + getMutableRemoveBuffList().mergeFrom(other.removeBuffList); + } if (other.hasAddMiracleList()) { getMutableAddMiracleList().mergeFrom(other.addMiracleList); } if (other.hasAddBuffList()) { getMutableAddBuffList().mergeFrom(other.addBuffList); } - if (other.hasRemoveBuffList()) { - getMutableRemoveBuffList().mergeFrom(other.removeBuffList); - } return this; } @@ -443,9 +389,9 @@ public final class RogueActionResultDataOuterClass { bitField0_ = 0; removeItemList.clear(); addItemList.clear(); + removeBuffList.clear(); addMiracleList.clear(); addBuffList.clear(); - removeBuffList.clear(); return this; } @@ -458,9 +404,9 @@ public final class RogueActionResultDataOuterClass { bitField0_ = 0; removeItemList.clearQuick(); addItemList.clearQuick(); + removeBuffList.clearQuick(); addMiracleList.clearQuick(); addBuffList.clearQuick(); - removeBuffList.clearQuick(); return this; } @@ -476,32 +422,32 @@ public final class RogueActionResultDataOuterClass { return bitField0_ == other.bitField0_ && (!hasRemoveItemList() || removeItemList.equals(other.removeItemList)) && (!hasAddItemList() || addItemList.equals(other.addItemList)) + && (!hasRemoveBuffList() || removeBuffList.equals(other.removeBuffList)) && (!hasAddMiracleList() || addMiracleList.equals(other.addMiracleList)) - && (!hasAddBuffList() || addBuffList.equals(other.addBuffList)) - && (!hasRemoveBuffList() || removeBuffList.equals(other.removeBuffList)); + && (!hasAddBuffList() || addBuffList.equals(other.addBuffList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 98); output.writeMessageNoTag(removeItemList); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 106); output.writeMessageNoTag(addItemList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 2754); - output.writeMessageNoTag(addMiracleList); + output.writeRawLittleEndian16((short) 13202); + output.writeMessageNoTag(removeBuffList); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 5114); - output.writeMessageNoTag(addBuffList); + output.writeRawLittleEndian16((short) 19154); + output.writeMessageNoTag(addMiracleList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 7098); - output.writeMessageNoTag(removeBuffList); + output.writeRawLittleEndian16((short) 25338); + output.writeMessageNoTag(addBuffList); } } @@ -515,13 +461,13 @@ public final class RogueActionResultDataOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(addItemList); } if ((bitField0_ & 0x00000004) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(addMiracleList); + size += 2 + ProtoSink.computeMessageSizeNoTag(removeBuffList); } if ((bitField0_ & 0x00000008) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(addBuffList); + size += 2 + ProtoSink.computeMessageSizeNoTag(addMiracleList); } if ((bitField0_ & 0x00000010) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(removeBuffList); + size += 2 + ProtoSink.computeMessageSizeNoTag(addBuffList); } return size; } @@ -533,45 +479,45 @@ public final class RogueActionResultDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 90: { + case 98: { // removeItemList input.readMessage(removeItemList); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 106) { break; } } - case 98: { + case 106: { // addItemList input.readMessage(addItemList); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 1346) { + if (tag != 6546) { break; } } - case 1346: { - // addMiracleList - input.readMessage(addMiracleList); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 2554) { - break; - } - } - case 2554: { - // addBuffList - input.readMessage(addBuffList); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 3514) { - break; - } - } - case 3514: { + case 6546: { // removeBuffList input.readMessage(removeBuffList); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 9554) { + break; + } + } + case 9554: { + // addMiracleList + input.readMessage(addMiracleList); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 12666) { + break; + } + } + case 12666: { + // addBuffList + input.readMessage(addBuffList); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -602,13 +548,13 @@ public final class RogueActionResultDataOuterClass { output.writeMessage(FieldNames.addItemList, addItemList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.addMiracleList, addMiracleList); + output.writeMessage(FieldNames.removeBuffList, removeBuffList); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.addBuffList, addBuffList); + output.writeMessage(FieldNames.addMiracleList, addMiracleList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeMessage(FieldNames.removeBuffList, removeBuffList); + output.writeMessage(FieldNames.addBuffList, addBuffList); } output.endObject(); } @@ -644,12 +590,24 @@ public final class RogueActionResultDataOuterClass { } break; } + case 1177726005: + case 1903522575: { + if (input.isAtField(FieldNames.removeBuffList)) { + if (!input.trySkipNullValue()) { + input.readMessage(removeBuffList); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } case 1381554510: case -850648438: { if (input.isAtField(FieldNames.addMiracleList)) { if (!input.trySkipNullValue()) { input.readMessage(addMiracleList); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -661,18 +619,6 @@ public final class RogueActionResultDataOuterClass { if (input.isAtField(FieldNames.addBuffList)) { if (!input.trySkipNullValue()) { input.readMessage(addBuffList); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1177726005: - case 1903522575: { - if (input.isAtField(FieldNames.removeBuffList)) { - if (!input.trySkipNullValue()) { - input.readMessage(removeBuffList); bitField0_ |= 0x00000010; } } else { @@ -737,11 +683,11 @@ public final class RogueActionResultDataOuterClass { static final FieldName addItemList = FieldName.forField("addItemList", "add_item_list"); + static final FieldName removeBuffList = FieldName.forField("removeBuffList", "remove_buff_list"); + static final FieldName addMiracleList = FieldName.forField("addMiracleList", "add_miracle_list"); static final FieldName addBuffList = FieldName.forField("addBuffList", "add_buff_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 4420cc6..409655c 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueActionResultOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueActionResultOuterClass.java @@ -19,14 +19,14 @@ public final class RogueActionResultOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueBuffSource source = 3; + * optional .RogueBuffSource source = 11; */ private int source; /** - * optional .RogueActionResultData action_data = 11; + * optional .RogueActionResultData rogue_action = 15; */ - private final RogueActionResultDataOuterClass.RogueActionResultData actionData = RogueActionResultDataOuterClass.RogueActionResultData.newInstance(); + private final RogueActionResultDataOuterClass.RogueActionResultData rogueAction = RogueActionResultDataOuterClass.RogueActionResultData.newInstance(); private RogueActionResult() { } @@ -39,7 +39,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueBuffSource source = 3; + * optional .RogueBuffSource source = 11; * @return whether the source field is set */ public boolean hasSource() { @@ -47,7 +47,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueBuffSource source = 3; + * optional .RogueBuffSource source = 11; * @return this */ public RogueActionResult clearSource() { @@ -57,7 +57,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueBuffSource source = 3; + * optional .RogueBuffSource source = 11; * @return the source */ public RogueBuffSourceOuterClass.RogueBuffSource getSource() { @@ -90,7 +90,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueBuffSource source = 3; + * optional .RogueBuffSource source = 11; * @param value the source to set * @return this */ @@ -101,39 +101,39 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueActionResultData action_data = 11; - * @return whether the actionData field is set + * optional .RogueActionResultData rogue_action = 15; + * @return whether the rogueAction field is set */ - public boolean hasActionData() { + public boolean hasRogueAction() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .RogueActionResultData action_data = 11; + * optional .RogueActionResultData rogue_action = 15; * @return this */ - public RogueActionResult clearActionData() { + public RogueActionResult clearRogueAction() { bitField0_ &= ~0x00000002; - actionData.clear(); + rogueAction.clear(); return this; } /** - * optional .RogueActionResultData action_data = 11; + * optional .RogueActionResultData rogue_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. * - * Use {@link #getMutableActionData()} if you want to modify it. + * Use {@link #getMutableRogueAction()} if you want to modify it. * * @return internal storage object for reading */ - public RogueActionResultDataOuterClass.RogueActionResultData getActionData() { - return actionData; + public RogueActionResultDataOuterClass.RogueActionResultData getRogueAction() { + return rogueAction; } /** - * optional .RogueActionResultData action_data = 11; + * optional .RogueActionResultData rogue_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 @@ -141,20 +141,20 @@ public final class RogueActionResultOuterClass { * * @return internal storage object for modifications */ - public RogueActionResultDataOuterClass.RogueActionResultData getMutableActionData() { + public RogueActionResultDataOuterClass.RogueActionResultData getMutableRogueAction() { bitField0_ |= 0x00000002; - return actionData; + return rogueAction; } /** - * optional .RogueActionResultData action_data = 11; - * @param value the actionData to set + * optional .RogueActionResultData rogue_action = 15; + * @param value the rogueAction to set * @return this */ - public RogueActionResult setActionData( + public RogueActionResult setRogueAction( final RogueActionResultDataOuterClass.RogueActionResultData value) { bitField0_ |= 0x00000002; - actionData.copyFrom(value); + rogueAction.copyFrom(value); return this; } @@ -164,7 +164,7 @@ public final class RogueActionResultOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; source = other.source; - actionData.copyFrom(other.actionData); + rogueAction.copyFrom(other.rogueAction); } return this; } @@ -178,8 +178,8 @@ public final class RogueActionResultOuterClass { if (other.hasSource()) { setSourceValue(other.source); } - if (other.hasActionData()) { - getMutableActionData().mergeFrom(other.actionData); + if (other.hasRogueAction()) { + getMutableRogueAction().mergeFrom(other.rogueAction); } return this; } @@ -192,7 +192,7 @@ public final class RogueActionResultOuterClass { cachedSize = -1; bitField0_ = 0; source = 0; - actionData.clear(); + rogueAction.clear(); return this; } @@ -203,7 +203,7 @@ public final class RogueActionResultOuterClass { } cachedSize = -1; bitField0_ = 0; - actionData.clearQuick(); + rogueAction.clearQuick(); return this; } @@ -218,18 +218,18 @@ public final class RogueActionResultOuterClass { RogueActionResult other = (RogueActionResult) o; return bitField0_ == other.bitField0_ && (!hasSource() || source == other.source) - && (!hasActionData() || actionData.equals(other.actionData)); + && (!hasRogueAction() || rogueAction.equals(other.rogueAction)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 88); output.writeEnumNoTag(source); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(actionData); + output.writeRawByte((byte) 122); + output.writeMessageNoTag(rogueAction); } } @@ -240,7 +240,7 @@ public final class RogueActionResultOuterClass { size += 1 + ProtoSink.computeEnumSizeNoTag(source); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(actionData); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAction); } return size; } @@ -252,7 +252,7 @@ public final class RogueActionResultOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 88: { // source final int value = input.readInt32(); if (RogueBuffSourceOuterClass.RogueBuffSource.forNumber(value) != null) { @@ -260,13 +260,13 @@ public final class RogueActionResultOuterClass { bitField0_ |= 0x00000001; } tag = input.readTag(); - if (tag != 90) { + if (tag != 122) { break; } } - case 90: { - // actionData - input.readMessage(actionData); + case 122: { + // rogueAction + input.readMessage(rogueAction); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -294,7 +294,7 @@ public final class RogueActionResultOuterClass { output.writeEnum(FieldNames.source, source, RogueBuffSourceOuterClass.RogueBuffSource.converter()); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.actionData, actionData); + output.writeMessage(FieldNames.rogueAction, rogueAction); } output.endObject(); } @@ -322,11 +322,11 @@ public final class RogueActionResultOuterClass { } break; } - case 1851381504: - case 1583258643: { - if (input.isAtField(FieldNames.actionData)) { + case -1366582096: + case 1368298555: { + if (input.isAtField(FieldNames.rogueAction)) { if (!input.trySkipNullValue()) { - input.readMessage(actionData); + input.readMessage(rogueAction); bitField0_ |= 0x00000002; } } else { @@ -389,7 +389,7 @@ public final class RogueActionResultOuterClass { static class FieldNames { static final FieldName source = FieldName.forField("source"); - static final FieldName actionData = FieldName.forField("actionData", "action_data"); + static final FieldName rogueAction = FieldName.forField("rogueAction", "rogue_action"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java index a3d683e..f1abdf0 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java @@ -20,34 +20,22 @@ public final class RogueAeonInfoOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     *  3
-     *
- * - * optional uint32 JPEBPGIEGPO = 14; + * optional uint32 NFFJHLFKCPE = 11; */ - private int jPEBPGIEGPO; + private int nFFJHLFKCPE; /** - * 
-     *  9
-     *
- * * optional uint32 unlock_aeon_num = 15; */ private int unlockAeonNum; /** - * 
-     *  guess
-     *
- * - * optional bool is_unlocked = 1; + * optional bool is_unlocked = 5; */ private boolean isUnlocked; /** - * repeated uint32 aeon_id_list = 8; + * repeated uint32 aeon_id_list = 13; */ private final RepeatedInt aeonIdList = RepeatedInt.newEmptyInstance(); @@ -62,63 +50,43 @@ public final class RogueAeonInfoOuterClass { } /** - * 
-     *  3
-     *
- * - * optional uint32 JPEBPGIEGPO = 14; - * @return whether the jPEBPGIEGPO field is set + * optional uint32 NFFJHLFKCPE = 11; + * @return whether the nFFJHLFKCPE field is set */ - public boolean hasJPEBPGIEGPO() { + public boolean hasNFFJHLFKCPE() { return (bitField0_ & 0x00000001) != 0; } /** - * 
-     *  3
-     *
- * - * optional uint32 JPEBPGIEGPO = 14; + * optional uint32 NFFJHLFKCPE = 11; * @return this */ - public RogueAeonInfo clearJPEBPGIEGPO() { + public RogueAeonInfo clearNFFJHLFKCPE() { bitField0_ &= ~0x00000001; - jPEBPGIEGPO = 0; + nFFJHLFKCPE = 0; return this; } /** - * 
-     *  3
-     *
- * - * optional uint32 JPEBPGIEGPO = 14; - * @return the jPEBPGIEGPO + * optional uint32 NFFJHLFKCPE = 11; + * @return the nFFJHLFKCPE */ - public int getJPEBPGIEGPO() { - return jPEBPGIEGPO; + public int getNFFJHLFKCPE() { + return nFFJHLFKCPE; } /** - * 
-     *  3
-     *
- * - * optional uint32 JPEBPGIEGPO = 14; - * @param value the jPEBPGIEGPO to set + * optional uint32 NFFJHLFKCPE = 11; + * @param value the nFFJHLFKCPE to set * @return this */ - public RogueAeonInfo setJPEBPGIEGPO(final int value) { + public RogueAeonInfo setNFFJHLFKCPE(final int value) { bitField0_ |= 0x00000001; - jPEBPGIEGPO = value; + nFFJHLFKCPE = value; return this; } /** - * 
-     *  9
-     *
- * * optional uint32 unlock_aeon_num = 15; * @return whether the unlockAeonNum field is set */ @@ -127,10 +95,6 @@ public final class RogueAeonInfoOuterClass { } /** - * 
-     *  9
-     *
- * * optional uint32 unlock_aeon_num = 15; * @return this */ @@ -141,10 +105,6 @@ public final class RogueAeonInfoOuterClass { } /** - * 
-     *  9
-     *
- * * optional uint32 unlock_aeon_num = 15; * @return the unlockAeonNum */ @@ -153,10 +113,6 @@ public final class RogueAeonInfoOuterClass { } /** - * 
-     *  9
-     *
- * * optional uint32 unlock_aeon_num = 15; * @param value the unlockAeonNum to set * @return this @@ -168,11 +124,7 @@ public final class RogueAeonInfoOuterClass { } /** - * 
-     *  guess
-     *
- * - * optional bool is_unlocked = 1; + * optional bool is_unlocked = 5; * @return whether the isUnlocked field is set */ public boolean hasIsUnlocked() { @@ -180,11 +132,7 @@ public final class RogueAeonInfoOuterClass { } /** - * 
-     *  guess
-     *
- * - * optional bool is_unlocked = 1; + * optional bool is_unlocked = 5; * @return this */ public RogueAeonInfo clearIsUnlocked() { @@ -194,11 +142,7 @@ public final class RogueAeonInfoOuterClass { } /** - * 
-     *  guess
-     *
- * - * optional bool is_unlocked = 1; + * optional bool is_unlocked = 5; * @return the isUnlocked */ public boolean getIsUnlocked() { @@ -206,11 +150,7 @@ public final class RogueAeonInfoOuterClass { } /** - * 
-     *  guess
-     *
- * - * optional bool is_unlocked = 1; + * optional bool is_unlocked = 5; * @param value the isUnlocked to set * @return this */ @@ -221,7 +161,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 8; + * repeated uint32 aeon_id_list = 13; * @return whether the aeonIdList field is set */ public boolean hasAeonIdList() { @@ -229,7 +169,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 8; + * repeated uint32 aeon_id_list = 13; * @return this */ public RogueAeonInfo clearAeonIdList() { @@ -239,7 +179,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 8; + * 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. @@ -253,7 +193,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 8; + * 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 @@ -267,7 +207,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 8; + * repeated uint32 aeon_id_list = 13; * @param value the aeonIdList to add * @return this */ @@ -278,7 +218,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 8; + * repeated uint32 aeon_id_list = 13; * @param values the aeonIdList to add * @return this */ @@ -293,7 +233,7 @@ public final class RogueAeonInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - jPEBPGIEGPO = other.jPEBPGIEGPO; + nFFJHLFKCPE = other.nFFJHLFKCPE; unlockAeonNum = other.unlockAeonNum; isUnlocked = other.isUnlocked; aeonIdList.copyFrom(other.aeonIdList); @@ -307,8 +247,8 @@ public final class RogueAeonInfoOuterClass { return this; } cachedSize = -1; - if (other.hasJPEBPGIEGPO()) { - setJPEBPGIEGPO(other.jPEBPGIEGPO); + if (other.hasNFFJHLFKCPE()) { + setNFFJHLFKCPE(other.nFFJHLFKCPE); } if (other.hasUnlockAeonNum()) { setUnlockAeonNum(other.unlockAeonNum); @@ -329,7 +269,7 @@ public final class RogueAeonInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - jPEBPGIEGPO = 0; + nFFJHLFKCPE = 0; unlockAeonNum = 0; isUnlocked = false; aeonIdList.clear(); @@ -357,7 +297,7 @@ public final class RogueAeonInfoOuterClass { } RogueAeonInfo other = (RogueAeonInfo) o; return bitField0_ == other.bitField0_ - && (!hasJPEBPGIEGPO() || jPEBPGIEGPO == other.jPEBPGIEGPO) + && (!hasNFFJHLFKCPE() || nFFJHLFKCPE == other.nFFJHLFKCPE) && (!hasUnlockAeonNum() || unlockAeonNum == other.unlockAeonNum) && (!hasIsUnlocked() || isUnlocked == other.isUnlocked) && (!hasAeonIdList() || aeonIdList.equals(other.aeonIdList)); @@ -366,20 +306,20 @@ public final class RogueAeonInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(jPEBPGIEGPO); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(nFFJHLFKCPE); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 120); output.writeUInt32NoTag(unlockAeonNum); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 40); output.writeBoolNoTag(isUnlocked); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < aeonIdList.length(); i++) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(aeonIdList.array()[i]); } } @@ -389,7 +329,7 @@ public final class RogueAeonInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(jPEBPGIEGPO); + size += 1 + ProtoSink.computeUInt32SizeNoTag(nFFJHLFKCPE); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonNum); @@ -410,9 +350,9 @@ public final class RogueAeonInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { - // jPEBPGIEGPO - jPEBPGIEGPO = input.readUInt32(); + case 88: { + // nFFJHLFKCPE + nFFJHLFKCPE = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 120) { @@ -424,20 +364,20 @@ public final class RogueAeonInfoOuterClass { unlockAeonNum = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 8) { + if (tag != 40) { break; } } - case 8: { + case 40: { // isUnlocked isUnlocked = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 66) { + if (tag != 106) { break; } } - case 66: { + case 106: { // aeonIdList [packed=true] input.readPackedUInt32(aeonIdList, tag); bitField0_ |= 0x00000008; @@ -456,7 +396,7 @@ public final class RogueAeonInfoOuterClass { tag = input.readTag(); break; } - case 64: { + case 104: { // aeonIdList [packed=false] tag = input.readRepeatedUInt32(aeonIdList, tag); bitField0_ |= 0x00000008; @@ -470,7 +410,7 @@ public final class RogueAeonInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.jPEBPGIEGPO, jPEBPGIEGPO); + output.writeUInt32(FieldNames.nFFJHLFKCPE, nFFJHLFKCPE); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.unlockAeonNum, unlockAeonNum); @@ -491,10 +431,10 @@ public final class RogueAeonInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 617496720: { - if (input.isAtField(FieldNames.jPEBPGIEGPO)) { + case 570375187: { + if (input.isAtField(FieldNames.nFFJHLFKCPE)) { if (!input.trySkipNullValue()) { - jPEBPGIEGPO = input.readUInt32(); + nFFJHLFKCPE = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -590,7 +530,7 @@ public final class RogueAeonInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName jPEBPGIEGPO = FieldName.forField("JPEBPGIEGPO"); + static final FieldName nFFJHLFKCPE = FieldName.forField("NFFJHLFKCPE"); static final FieldName unlockAeonNum = FieldName.forField("unlockAeonNum", "unlock_aeon_num"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java index df162e3..ddd3056 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java @@ -19,7 +19,7 @@ public final class RogueAeonOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 aeon_id = 10; + * optional uint32 aeon_id = 15; */ private int aeonId; @@ -43,7 +43,7 @@ public final class RogueAeonOuterClass { } /** - * optional uint32 aeon_id = 10; + * optional uint32 aeon_id = 15; * @return whether the aeonId field is set */ public boolean hasAeonId() { @@ -51,7 +51,7 @@ public final class RogueAeonOuterClass { } /** - * optional uint32 aeon_id = 10; + * optional uint32 aeon_id = 15; * @return this */ public RogueAeon clearAeonId() { @@ -61,7 +61,7 @@ public final class RogueAeonOuterClass { } /** - * optional uint32 aeon_id = 10; + * optional uint32 aeon_id = 15; * @return the aeonId */ public int getAeonId() { @@ -69,7 +69,7 @@ public final class RogueAeonOuterClass { } /** - * optional uint32 aeon_id = 10; + * optional uint32 aeon_id = 15; * @param value the aeonId to set * @return this */ @@ -197,7 +197,7 @@ public final class RogueAeonOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(aeonId); } if ((bitField0_ & 0x00000002) != 0) { @@ -225,7 +225,7 @@ public final class RogueAeonOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 120: { // aeonId aeonId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueAreaOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAreaOuterClass.java index 530923c..7266818 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAreaOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAreaOuterClass.java @@ -19,33 +19,34 @@ public final class RogueAreaOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_reach_room_num = 2; - */ - private int curReachRoomNum; - - /** - * optional uint32 map_id = 5; - */ - private int mapId; - - /** - * optional uint32 area_id = 7; - */ - private int areaId; - - /** - * optional uint32 rogue_area_status = 8; + * optional uint32 rogue_area_status = 1; */ private int rogueAreaStatus; /** - * 
-     *  HJEALCCKPAO AMMMELMOKJF = 12;
-     *
- * - * optional bool CMJFDLMBIOK = 14; + * optional uint32 area_id = 2; */ - private boolean cMJFDLMBIOK; + private int areaId; + + /** + * optional uint32 rogue_status = 4; + */ + private int rogueStatus; + + /** + * optional uint32 cur_reach_room_num = 6; + */ + private int curReachRoomNum; + + /** + * optional uint32 map_id = 15; + */ + private int mapId; + + /** + * optional bool has_taken_rewards = 11; + */ + private boolean hasTakenRewards; private RogueArea() { } @@ -58,136 +59,25 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 cur_reach_room_num = 2; - * @return whether the curReachRoomNum field is set + * optional uint32 rogue_area_status = 1; + * @return whether the rogueAreaStatus field is set */ - public boolean hasCurReachRoomNum() { + public boolean hasRogueAreaStatus() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cur_reach_room_num = 2; - * @return this - */ - public RogueArea clearCurReachRoomNum() { - bitField0_ &= ~0x00000001; - curReachRoomNum = 0; - return this; - } - - /** - * optional uint32 cur_reach_room_num = 2; - * @return the curReachRoomNum - */ - public int getCurReachRoomNum() { - return curReachRoomNum; - } - - /** - * optional uint32 cur_reach_room_num = 2; - * @param value the curReachRoomNum to set - * @return this - */ - public RogueArea setCurReachRoomNum(final int value) { - bitField0_ |= 0x00000001; - curReachRoomNum = value; - return this; - } - - /** - * optional uint32 map_id = 5; - * @return whether the mapId field is set - */ - public boolean hasMapId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 map_id = 5; - * @return this - */ - public RogueArea clearMapId() { - bitField0_ &= ~0x00000002; - mapId = 0; - return this; - } - - /** - * optional uint32 map_id = 5; - * @return the mapId - */ - public int getMapId() { - return mapId; - } - - /** - * optional uint32 map_id = 5; - * @param value the mapId to set - * @return this - */ - public RogueArea setMapId(final int value) { - bitField0_ |= 0x00000002; - mapId = value; - return this; - } - - /** - * optional uint32 area_id = 7; - * @return whether the areaId field is set - */ - public boolean hasAreaId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 area_id = 7; - * @return this - */ - public RogueArea clearAreaId() { - bitField0_ &= ~0x00000004; - areaId = 0; - return this; - } - - /** - * optional uint32 area_id = 7; - * @return the areaId - */ - public int getAreaId() { - return areaId; - } - - /** - * optional uint32 area_id = 7; - * @param value the areaId to set - * @return this - */ - public RogueArea setAreaId(final int value) { - bitField0_ |= 0x00000004; - areaId = value; - return this; - } - - /** - * optional uint32 rogue_area_status = 8; - * @return whether the rogueAreaStatus field is set - */ - public boolean hasRogueAreaStatus() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 rogue_area_status = 8; + * optional uint32 rogue_area_status = 1; * @return this */ public RogueArea clearRogueAreaStatus() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; rogueAreaStatus = 0; return this; } /** - * optional uint32 rogue_area_status = 8; + * optional uint32 rogue_area_status = 1; * @return the rogueAreaStatus */ public int getRogueAreaStatus() { @@ -195,66 +85,198 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 rogue_area_status = 8; + * optional uint32 rogue_area_status = 1; * @param value the rogueAreaStatus to set * @return this */ public RogueArea setRogueAreaStatus(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; rogueAreaStatus = value; return this; } /** - * 
-     *  HJEALCCKPAO AMMMELMOKJF = 12;
-     *
- * - * optional bool CMJFDLMBIOK = 14; - * @return whether the cMJFDLMBIOK field is set + * optional uint32 area_id = 2; + * @return whether the areaId field is set */ - public boolean hasCMJFDLMBIOK() { - return (bitField0_ & 0x00000010) != 0; + public boolean hasAreaId() { + return (bitField0_ & 0x00000002) != 0; } /** - * 
-     *  HJEALCCKPAO AMMMELMOKJF = 12;
-     *
- * - * optional bool CMJFDLMBIOK = 14; + * optional uint32 area_id = 2; * @return this */ - public RogueArea clearCMJFDLMBIOK() { - bitField0_ &= ~0x00000010; - cMJFDLMBIOK = false; + public RogueArea clearAreaId() { + bitField0_ &= ~0x00000002; + areaId = 0; return this; } /** - * 
-     *  HJEALCCKPAO AMMMELMOKJF = 12;
-     *
- * - * optional bool CMJFDLMBIOK = 14; - * @return the cMJFDLMBIOK + * optional uint32 area_id = 2; + * @return the areaId */ - public boolean getCMJFDLMBIOK() { - return cMJFDLMBIOK; + public int getAreaId() { + return areaId; } /** - * 
-     *  HJEALCCKPAO AMMMELMOKJF = 12;
-     *
- * - * optional bool CMJFDLMBIOK = 14; - * @param value the cMJFDLMBIOK to set + * optional uint32 area_id = 2; + * @param value the areaId to set * @return this */ - public RogueArea setCMJFDLMBIOK(final boolean value) { + public RogueArea setAreaId(final int value) { + bitField0_ |= 0x00000002; + areaId = value; + return this; + } + + /** + * optional uint32 rogue_status = 4; + * @return whether the rogueStatus field is set + */ + public boolean hasRogueStatus() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 rogue_status = 4; + * @return this + */ + public RogueArea clearRogueStatus() { + bitField0_ &= ~0x00000004; + rogueStatus = 0; + return this; + } + + /** + * optional uint32 rogue_status = 4; + * @return the rogueStatus + */ + public int getRogueStatus() { + return rogueStatus; + } + + /** + * optional uint32 rogue_status = 4; + * @param value the rogueStatus to set + * @return this + */ + public RogueArea setRogueStatus(final int value) { + bitField0_ |= 0x00000004; + rogueStatus = value; + return this; + } + + /** + * optional uint32 cur_reach_room_num = 6; + * @return whether the curReachRoomNum field is set + */ + public boolean hasCurReachRoomNum() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 cur_reach_room_num = 6; + * @return this + */ + public RogueArea clearCurReachRoomNum() { + bitField0_ &= ~0x00000008; + curReachRoomNum = 0; + return this; + } + + /** + * optional uint32 cur_reach_room_num = 6; + * @return the curReachRoomNum + */ + public int getCurReachRoomNum() { + return curReachRoomNum; + } + + /** + * optional uint32 cur_reach_room_num = 6; + * @param value the curReachRoomNum to set + * @return this + */ + public RogueArea setCurReachRoomNum(final int value) { + bitField0_ |= 0x00000008; + curReachRoomNum = value; + return this; + } + + /** + * optional uint32 map_id = 15; + * @return whether the mapId field is set + */ + public boolean hasMapId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 map_id = 15; + * @return this + */ + public RogueArea clearMapId() { + bitField0_ &= ~0x00000010; + mapId = 0; + return this; + } + + /** + * optional uint32 map_id = 15; + * @return the mapId + */ + public int getMapId() { + return mapId; + } + + /** + * optional uint32 map_id = 15; + * @param value the mapId to set + * @return this + */ + public RogueArea setMapId(final int value) { bitField0_ |= 0x00000010; - cMJFDLMBIOK = value; + mapId = value; + return this; + } + + /** + * optional bool has_taken_rewards = 11; + * @return whether the hasTakenRewards field is set + */ + public boolean hasHasTakenRewards() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional bool has_taken_rewards = 11; + * @return this + */ + public RogueArea clearHasTakenRewards() { + bitField0_ &= ~0x00000020; + hasTakenRewards = false; + return this; + } + + /** + * optional bool has_taken_rewards = 11; + * @return the hasTakenRewards + */ + public boolean getHasTakenRewards() { + return hasTakenRewards; + } + + /** + * optional bool has_taken_rewards = 11; + * @param value the hasTakenRewards to set + * @return this + */ + public RogueArea setHasTakenRewards(final boolean value) { + bitField0_ |= 0x00000020; + hasTakenRewards = value; return this; } @@ -263,11 +285,12 @@ public final class RogueAreaOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + rogueAreaStatus = other.rogueAreaStatus; + areaId = other.areaId; + rogueStatus = other.rogueStatus; curReachRoomNum = other.curReachRoomNum; mapId = other.mapId; - areaId = other.areaId; - rogueAreaStatus = other.rogueAreaStatus; - cMJFDLMBIOK = other.cMJFDLMBIOK; + hasTakenRewards = other.hasTakenRewards; } return this; } @@ -278,20 +301,23 @@ public final class RogueAreaOuterClass { return this; } cachedSize = -1; + if (other.hasRogueAreaStatus()) { + setRogueAreaStatus(other.rogueAreaStatus); + } + if (other.hasAreaId()) { + setAreaId(other.areaId); + } + if (other.hasRogueStatus()) { + setRogueStatus(other.rogueStatus); + } if (other.hasCurReachRoomNum()) { setCurReachRoomNum(other.curReachRoomNum); } if (other.hasMapId()) { setMapId(other.mapId); } - if (other.hasAreaId()) { - setAreaId(other.areaId); - } - if (other.hasRogueAreaStatus()) { - setRogueAreaStatus(other.rogueAreaStatus); - } - if (other.hasCMJFDLMBIOK()) { - setCMJFDLMBIOK(other.cMJFDLMBIOK); + if (other.hasHasTakenRewards()) { + setHasTakenRewards(other.hasTakenRewards); } return this; } @@ -303,11 +329,12 @@ public final class RogueAreaOuterClass { } cachedSize = -1; bitField0_ = 0; + rogueAreaStatus = 0; + areaId = 0; + rogueStatus = 0; curReachRoomNum = 0; mapId = 0; - areaId = 0; - rogueAreaStatus = 0; - cMJFDLMBIOK = false; + hasTakenRewards = false; return this; } @@ -331,34 +358,39 @@ public final class RogueAreaOuterClass { } RogueArea other = (RogueArea) o; return bitField0_ == other.bitField0_ + && (!hasRogueAreaStatus() || rogueAreaStatus == other.rogueAreaStatus) + && (!hasAreaId() || areaId == other.areaId) + && (!hasRogueStatus() || rogueStatus == other.rogueStatus) && (!hasCurReachRoomNum() || curReachRoomNum == other.curReachRoomNum) && (!hasMapId() || mapId == other.mapId) - && (!hasAreaId() || areaId == other.areaId) - && (!hasRogueAreaStatus() || rogueAreaStatus == other.rogueAreaStatus) - && (!hasCMJFDLMBIOK() || cMJFDLMBIOK == other.cMJFDLMBIOK); + && (!hasHasTakenRewards() || hasTakenRewards == other.hasTakenRewards); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(curReachRoomNum); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(mapId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(areaId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(rogueAreaStatus); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(areaId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(rogueStatus); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(curReachRoomNum); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 112); - output.writeBoolNoTag(cMJFDLMBIOK); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(mapId); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 88); + output.writeBoolNoTag(hasTakenRewards); } } @@ -366,18 +398,21 @@ public final class RogueAreaOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curReachRoomNum); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueAreaStatus); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueStatus); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curReachRoomNum); + } if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId); + } + if ((bitField0_ & 0x00000020) != 0) { size += 2; } return size; @@ -390,47 +425,56 @@ public final class RogueAreaOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // curReachRoomNum - curReachRoomNum = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // mapId - mapId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // areaId - areaId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 8: { // rogueAreaStatus rogueAreaStatus = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 16) { break; } } - case 112: { - // cMJFDLMBIOK - cMJFDLMBIOK = input.readBool(); + case 16: { + // areaId + areaId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // rogueStatus + rogueStatus = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // curReachRoomNum + curReachRoomNum = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // mapId + mapId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // hasTakenRewards + hasTakenRewards = input.readBool(); + bitField0_ |= 0x00000020; + tag = input.readTag(); if (tag != 0) { break; } @@ -453,19 +497,22 @@ public final class RogueAreaOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.curReachRoomNum, curReachRoomNum); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.mapId, mapId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.areaId, areaId); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.rogueAreaStatus, rogueAreaStatus); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.areaId, areaId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.rogueStatus, rogueStatus); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.curReachRoomNum, curReachRoomNum); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeBool(FieldNames.cMJFDLMBIOK, cMJFDLMBIOK); + output.writeUInt32(FieldNames.mapId, mapId); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeBool(FieldNames.hasTakenRewards, hasTakenRewards); } output.endObject(); } @@ -477,11 +524,11 @@ public final class RogueAreaOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 888045080: - case 328196941: { - if (input.isAtField(FieldNames.curReachRoomNum)) { + case -731414439: + case -1961715457: { + if (input.isAtField(FieldNames.rogueAreaStatus)) { if (!input.trySkipNullValue()) { - curReachRoomNum = input.readUInt32(); + rogueAreaStatus = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -489,23 +536,23 @@ public final class RogueAreaOuterClass { } break; } - case 103663511: - case -1081377058: { - if (input.isAtField(FieldNames.mapId)) { - if (!input.trySkipNullValue()) { - mapId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -1409553784: case -746472947: { if (input.isAtField(FieldNames.areaId)) { if (!input.trySkipNullValue()) { areaId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -836112788: + case 1898767863: { + if (input.isAtField(FieldNames.rogueStatus)) { + if (!input.trySkipNullValue()) { + rogueStatus = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -513,11 +560,11 @@ public final class RogueAreaOuterClass { } break; } - case -731414439: - case -1961715457: { - if (input.isAtField(FieldNames.rogueAreaStatus)) { + case 888045080: + case 328196941: { + if (input.isAtField(FieldNames.curReachRoomNum)) { if (!input.trySkipNullValue()) { - rogueAreaStatus = input.readUInt32(); + curReachRoomNum = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -525,10 +572,11 @@ public final class RogueAreaOuterClass { } break; } - case 1216373954: { - if (input.isAtField(FieldNames.cMJFDLMBIOK)) { + case 103663511: + case -1081377058: { + if (input.isAtField(FieldNames.mapId)) { if (!input.trySkipNullValue()) { - cMJFDLMBIOK = input.readBool(); + mapId = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -536,6 +584,18 @@ public final class RogueAreaOuterClass { } break; } + case 222364695: + case -1980321081: { + if (input.isAtField(FieldNames.hasTakenRewards)) { + if (!input.trySkipNullValue()) { + hasTakenRewards = input.readBool(); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -588,15 +648,17 @@ public final class RogueAreaOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName rogueAreaStatus = FieldName.forField("rogueAreaStatus", "rogue_area_status"); + + static final FieldName areaId = FieldName.forField("areaId", "area_id"); + + static final FieldName rogueStatus = FieldName.forField("rogueStatus", "rogue_status"); + static final FieldName curReachRoomNum = FieldName.forField("curReachRoomNum", "cur_reach_room_num"); static final FieldName mapId = FieldName.forField("mapId", "map_id"); - static final FieldName areaId = FieldName.forField("areaId", "area_id"); - - static final FieldName rogueAreaStatus = FieldName.forField("rogueAreaStatus", "rogue_area_status"); - - static final FieldName cMJFDLMBIOK = FieldName.forField("CMJFDLMBIOK"); + static final FieldName hasTakenRewards = FieldName.forField("hasTakenRewards", "has_taken_rewards"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueAvatarInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAvatarInfoOuterClass.java index 66c7e2e..31ad009 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAvatarInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAvatarInfoOuterClass.java @@ -20,25 +20,10 @@ public final class RogueAvatarInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .CLPDAOOAHOE AJJJNLPCEED = 2; - */ - private final CLPDAOOAHOE aJJJNLPCEED = CLPDAOOAHOE.newInstance(); - - /** - * repeated uint32 DDDICOEFHPM = 7; - */ - private final RepeatedInt dDDICOEFHPM = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 base_avatar_id_list = 11; + * repeated uint32 base_avatar_id_list = 8; */ private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance(); - /** - * repeated uint32 POGOCOKADMA = 14; - */ - private final RepeatedInt pOGOCOKADMA = RepeatedInt.newEmptyInstance(); - private RogueAvatarInfo() { } @@ -50,150 +35,25 @@ public final class RogueAvatarInfoOuterClass { } /** - * optional .CLPDAOOAHOE AJJJNLPCEED = 2; - * @return whether the aJJJNLPCEED field is set + * repeated uint32 base_avatar_id_list = 8; + * @return whether the baseAvatarIdList field is set */ - public boolean hasAJJJNLPCEED() { + public boolean hasBaseAvatarIdList() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .CLPDAOOAHOE AJJJNLPCEED = 2; - * @return this - */ - public RogueAvatarInfo clearAJJJNLPCEED() { - bitField0_ &= ~0x00000001; - aJJJNLPCEED.clear(); - return this; - } - - /** - * optional .CLPDAOOAHOE AJJJNLPCEED = 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 #getMutableAJJJNLPCEED()} if you want to modify it. - * - * @return internal storage object for reading - */ - public CLPDAOOAHOE getAJJJNLPCEED() { - return aJJJNLPCEED; - } - - /** - * optional .CLPDAOOAHOE AJJJNLPCEED = 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 CLPDAOOAHOE getMutableAJJJNLPCEED() { - bitField0_ |= 0x00000001; - return aJJJNLPCEED; - } - - /** - * optional .CLPDAOOAHOE AJJJNLPCEED = 2; - * @param value the aJJJNLPCEED to set - * @return this - */ - public RogueAvatarInfo setAJJJNLPCEED(final CLPDAOOAHOE value) { - bitField0_ |= 0x00000001; - aJJJNLPCEED.copyFrom(value); - return this; - } - - /** - * repeated uint32 DDDICOEFHPM = 7; - * @return whether the dDDICOEFHPM field is set - */ - public boolean hasDDDICOEFHPM() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * repeated uint32 DDDICOEFHPM = 7; - * @return this - */ - public RogueAvatarInfo clearDDDICOEFHPM() { - bitField0_ &= ~0x00000002; - dDDICOEFHPM.clear(); - return this; - } - - /** - * repeated uint32 DDDICOEFHPM = 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 #getMutableDDDICOEFHPM()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getDDDICOEFHPM() { - return dDDICOEFHPM; - } - - /** - * repeated uint32 DDDICOEFHPM = 7; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableDDDICOEFHPM() { - bitField0_ |= 0x00000002; - return dDDICOEFHPM; - } - - /** - * repeated uint32 DDDICOEFHPM = 7; - * @param value the dDDICOEFHPM to add - * @return this - */ - public RogueAvatarInfo addDDDICOEFHPM(final int value) { - bitField0_ |= 0x00000002; - dDDICOEFHPM.add(value); - return this; - } - - /** - * repeated uint32 DDDICOEFHPM = 7; - * @param values the dDDICOEFHPM to add - * @return this - */ - public RogueAvatarInfo addAllDDDICOEFHPM(final int... values) { - bitField0_ |= 0x00000002; - dDDICOEFHPM.addAll(values); - return this; - } - - /** - * repeated uint32 base_avatar_id_list = 11; - * @return whether the baseAvatarIdList field is set - */ - public boolean hasBaseAvatarIdList() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated uint32 base_avatar_id_list = 11; + * repeated uint32 base_avatar_id_list = 8; * @return this */ public RogueAvatarInfo clearBaseAvatarIdList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; baseAvatarIdList.clear(); return this; } /** - * repeated uint32 base_avatar_id_list = 11; + * repeated uint32 base_avatar_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. @@ -207,7 +67,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 11; + * repeated uint32 base_avatar_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 @@ -216,109 +76,38 @@ public final class RogueAvatarInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableBaseAvatarIdList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; return baseAvatarIdList; } /** - * repeated uint32 base_avatar_id_list = 11; + * repeated uint32 base_avatar_id_list = 8; * @param value the baseAvatarIdList to add * @return this */ public RogueAvatarInfo addBaseAvatarIdList(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; baseAvatarIdList.add(value); return this; } /** - * repeated uint32 base_avatar_id_list = 11; + * repeated uint32 base_avatar_id_list = 8; * @param values the baseAvatarIdList to add * @return this */ public RogueAvatarInfo addAllBaseAvatarIdList(final int... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; baseAvatarIdList.addAll(values); return this; } - /** - * repeated uint32 POGOCOKADMA = 14; - * @return whether the pOGOCOKADMA field is set - */ - public boolean hasPOGOCOKADMA() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated uint32 POGOCOKADMA = 14; - * @return this - */ - public RogueAvatarInfo clearPOGOCOKADMA() { - bitField0_ &= ~0x00000008; - pOGOCOKADMA.clear(); - return this; - } - - /** - * repeated uint32 POGOCOKADMA = 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 #getMutablePOGOCOKADMA()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getPOGOCOKADMA() { - return pOGOCOKADMA; - } - - /** - * repeated uint32 POGOCOKADMA = 14; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutablePOGOCOKADMA() { - bitField0_ |= 0x00000008; - return pOGOCOKADMA; - } - - /** - * repeated uint32 POGOCOKADMA = 14; - * @param value the pOGOCOKADMA to add - * @return this - */ - public RogueAvatarInfo addPOGOCOKADMA(final int value) { - bitField0_ |= 0x00000008; - pOGOCOKADMA.add(value); - return this; - } - - /** - * repeated uint32 POGOCOKADMA = 14; - * @param values the pOGOCOKADMA to add - * @return this - */ - public RogueAvatarInfo addAllPOGOCOKADMA(final int... values) { - bitField0_ |= 0x00000008; - pOGOCOKADMA.addAll(values); - return this; - } - @Override public RogueAvatarInfo copyFrom(final RogueAvatarInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - aJJJNLPCEED.copyFrom(other.aJJJNLPCEED); - dDDICOEFHPM.copyFrom(other.dDDICOEFHPM); baseAvatarIdList.copyFrom(other.baseAvatarIdList); - pOGOCOKADMA.copyFrom(other.pOGOCOKADMA); } return this; } @@ -329,18 +118,9 @@ public final class RogueAvatarInfoOuterClass { return this; } cachedSize = -1; - if (other.hasAJJJNLPCEED()) { - getMutableAJJJNLPCEED().mergeFrom(other.aJJJNLPCEED); - } - if (other.hasDDDICOEFHPM()) { - getMutableDDDICOEFHPM().addAll(other.dDDICOEFHPM); - } if (other.hasBaseAvatarIdList()) { getMutableBaseAvatarIdList().addAll(other.baseAvatarIdList); } - if (other.hasPOGOCOKADMA()) { - getMutablePOGOCOKADMA().addAll(other.pOGOCOKADMA); - } return this; } @@ -351,10 +131,7 @@ public final class RogueAvatarInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - aJJJNLPCEED.clear(); - dDDICOEFHPM.clear(); baseAvatarIdList.clear(); - pOGOCOKADMA.clear(); return this; } @@ -365,10 +142,7 @@ public final class RogueAvatarInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - aJJJNLPCEED.clearQuick(); - dDDICOEFHPM.clear(); baseAvatarIdList.clear(); - pOGOCOKADMA.clear(); return this; } @@ -382,53 +156,25 @@ public final class RogueAvatarInfoOuterClass { } RogueAvatarInfo other = (RogueAvatarInfo) o; return bitField0_ == other.bitField0_ - && (!hasAJJJNLPCEED() || aJJJNLPCEED.equals(other.aJJJNLPCEED)) - && (!hasDDDICOEFHPM() || dDDICOEFHPM.equals(other.dDDICOEFHPM)) - && (!hasBaseAvatarIdList() || baseAvatarIdList.equals(other.baseAvatarIdList)) - && (!hasPOGOCOKADMA() || pOGOCOKADMA.equals(other.pOGOCOKADMA)); + && (!hasBaseAvatarIdList() || baseAvatarIdList.equals(other.baseAvatarIdList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(aJJJNLPCEED); - } - if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < dDDICOEFHPM.length(); i++) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(dDDICOEFHPM.array()[i]); - } - } - if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < baseAvatarIdList.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(baseAvatarIdList.array()[i]); } } - if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < pOGOCOKADMA.length(); i++) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(pOGOCOKADMA.array()[i]); - } - } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(aJJJNLPCEED); - } - if ((bitField0_ & 0x00000002) != 0) { - size += (1 * dDDICOEFHPM.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(dDDICOEFHPM); - } - if ((bitField0_ & 0x00000004) != 0) { size += (1 * baseAvatarIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(baseAvatarIdList); } - if ((bitField0_ & 0x00000008) != 0) { - size += (1 * pOGOCOKADMA.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(pOGOCOKADMA); - } return size; } @@ -439,37 +185,10 @@ public final class RogueAvatarInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { - // aJJJNLPCEED - input.readMessage(aJJJNLPCEED); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { - // dDDICOEFHPM [packed=true] - input.readPackedUInt32(dDDICOEFHPM, tag); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { + case 66: { // baseAvatarIdList [packed=true] input.readPackedUInt32(baseAvatarIdList, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { - // pOGOCOKADMA [packed=true] - input.readPackedUInt32(pOGOCOKADMA, tag); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { break; @@ -485,22 +204,10 @@ public final class RogueAvatarInfoOuterClass { tag = input.readTag(); break; } - case 56: { - // dDDICOEFHPM [packed=false] - tag = input.readRepeatedUInt32(dDDICOEFHPM, tag); - bitField0_ |= 0x00000002; - break; - } - case 88: { + case 64: { // baseAvatarIdList [packed=false] tag = input.readRepeatedUInt32(baseAvatarIdList, tag); - bitField0_ |= 0x00000004; - break; - } - case 112: { - // pOGOCOKADMA [packed=false] - tag = input.readRepeatedUInt32(pOGOCOKADMA, tag); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; break; } } @@ -511,17 +218,8 @@ public final class RogueAvatarInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.aJJJNLPCEED, aJJJNLPCEED); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedUInt32(FieldNames.dDDICOEFHPM, dDDICOEFHPM); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedUInt32(FieldNames.baseAvatarIdList, baseAvatarIdList); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.pOGOCOKADMA, pOGOCOKADMA); - } output.endObject(); } @@ -532,45 +230,12 @@ public final class RogueAvatarInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -225944950: { - if (input.isAtField(FieldNames.aJJJNLPCEED)) { - if (!input.trySkipNullValue()) { - input.readMessage(aJJJNLPCEED); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case -727553421: { - if (input.isAtField(FieldNames.dDDICOEFHPM)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(dDDICOEFHPM); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -1212654461: case 914628490: { if (input.isAtField(FieldNames.baseAvatarIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(baseAvatarIdList); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 2062105039: { - if (input.isAtField(FieldNames.pOGOCOKADMA)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(pOGOCOKADMA); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -630,558 +295,7 @@ public final class RogueAvatarInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName aJJJNLPCEED = FieldName.forField("AJJJNLPCEED"); - - static final FieldName dDDICOEFHPM = FieldName.forField("DDDICOEFHPM"); - static final FieldName baseAvatarIdList = FieldName.forField("baseAvatarIdList", "base_avatar_id_list"); - - static final FieldName pOGOCOKADMA = FieldName.forField("POGOCOKADMA"); - } - } - - /** - * Protobuf type {@code CLPDAOOAHOE} - */ - public static final class CLPDAOOAHOE extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 DJGJDMBOFEH = 11; - */ - private int dJGJDMBOFEH; - - /** - * optional uint32 KKNMDMPJLBG = 15; - */ - private int kKNMDMPJLBG; - - /** - * optional .ItemCostList MGEFFLOEPBK = 7; - */ - private final ItemCostListOuterClass.ItemCostList mGEFFLOEPBK = ItemCostListOuterClass.ItemCostList.newInstance(); - - /** - * repeated uint32 PFIDJJKFGJH = 12; - */ - private final RepeatedInt pFIDJJKFGJH = RepeatedInt.newEmptyInstance(); - - private CLPDAOOAHOE() { - } - - /** - * @return a new empty instance of {@code CLPDAOOAHOE} - */ - public static CLPDAOOAHOE newInstance() { - return new CLPDAOOAHOE(); - } - - /** - * optional uint32 DJGJDMBOFEH = 11; - * @return whether the dJGJDMBOFEH field is set - */ - public boolean hasDJGJDMBOFEH() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 DJGJDMBOFEH = 11; - * @return this - */ - public CLPDAOOAHOE clearDJGJDMBOFEH() { - bitField0_ &= ~0x00000001; - dJGJDMBOFEH = 0; - return this; - } - - /** - * optional uint32 DJGJDMBOFEH = 11; - * @return the dJGJDMBOFEH - */ - public int getDJGJDMBOFEH() { - return dJGJDMBOFEH; - } - - /** - * optional uint32 DJGJDMBOFEH = 11; - * @param value the dJGJDMBOFEH to set - * @return this - */ - public CLPDAOOAHOE setDJGJDMBOFEH(final int value) { - bitField0_ |= 0x00000001; - dJGJDMBOFEH = value; - return this; - } - - /** - * optional uint32 KKNMDMPJLBG = 15; - * @return whether the kKNMDMPJLBG field is set - */ - public boolean hasKKNMDMPJLBG() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 KKNMDMPJLBG = 15; - * @return this - */ - public CLPDAOOAHOE clearKKNMDMPJLBG() { - bitField0_ &= ~0x00000002; - kKNMDMPJLBG = 0; - return this; - } - - /** - * optional uint32 KKNMDMPJLBG = 15; - * @return the kKNMDMPJLBG - */ - public int getKKNMDMPJLBG() { - return kKNMDMPJLBG; - } - - /** - * optional uint32 KKNMDMPJLBG = 15; - * @param value the kKNMDMPJLBG to set - * @return this - */ - public CLPDAOOAHOE setKKNMDMPJLBG(final int value) { - bitField0_ |= 0x00000002; - kKNMDMPJLBG = value; - return this; - } - - /** - * optional .ItemCostList MGEFFLOEPBK = 7; - * @return whether the mGEFFLOEPBK field is set - */ - public boolean hasMGEFFLOEPBK() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .ItemCostList MGEFFLOEPBK = 7; - * @return this - */ - public CLPDAOOAHOE clearMGEFFLOEPBK() { - bitField0_ &= ~0x00000004; - mGEFFLOEPBK.clear(); - return this; - } - - /** - * optional .ItemCostList MGEFFLOEPBK = 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 #getMutableMGEFFLOEPBK()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ItemCostListOuterClass.ItemCostList getMGEFFLOEPBK() { - return mGEFFLOEPBK; - } - - /** - * optional .ItemCostList MGEFFLOEPBK = 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 ItemCostListOuterClass.ItemCostList getMutableMGEFFLOEPBK() { - bitField0_ |= 0x00000004; - return mGEFFLOEPBK; - } - - /** - * optional .ItemCostList MGEFFLOEPBK = 7; - * @param value the mGEFFLOEPBK to set - * @return this - */ - public CLPDAOOAHOE setMGEFFLOEPBK(final ItemCostListOuterClass.ItemCostList value) { - bitField0_ |= 0x00000004; - mGEFFLOEPBK.copyFrom(value); - return this; - } - - /** - * repeated uint32 PFIDJJKFGJH = 12; - * @return whether the pFIDJJKFGJH field is set - */ - public boolean hasPFIDJJKFGJH() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated uint32 PFIDJJKFGJH = 12; - * @return this - */ - public CLPDAOOAHOE clearPFIDJJKFGJH() { - bitField0_ &= ~0x00000008; - pFIDJJKFGJH.clear(); - return this; - } - - /** - * repeated uint32 PFIDJJKFGJH = 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 #getMutablePFIDJJKFGJH()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getPFIDJJKFGJH() { - return pFIDJJKFGJH; - } - - /** - * repeated uint32 PFIDJJKFGJH = 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 getMutablePFIDJJKFGJH() { - bitField0_ |= 0x00000008; - return pFIDJJKFGJH; - } - - /** - * repeated uint32 PFIDJJKFGJH = 12; - * @param value the pFIDJJKFGJH to add - * @return this - */ - public CLPDAOOAHOE addPFIDJJKFGJH(final int value) { - bitField0_ |= 0x00000008; - pFIDJJKFGJH.add(value); - return this; - } - - /** - * repeated uint32 PFIDJJKFGJH = 12; - * @param values the pFIDJJKFGJH to add - * @return this - */ - public CLPDAOOAHOE addAllPFIDJJKFGJH(final int... values) { - bitField0_ |= 0x00000008; - pFIDJJKFGJH.addAll(values); - return this; - } - - @Override - public CLPDAOOAHOE copyFrom(final CLPDAOOAHOE other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - dJGJDMBOFEH = other.dJGJDMBOFEH; - kKNMDMPJLBG = other.kKNMDMPJLBG; - mGEFFLOEPBK.copyFrom(other.mGEFFLOEPBK); - pFIDJJKFGJH.copyFrom(other.pFIDJJKFGJH); - } - return this; - } - - @Override - public CLPDAOOAHOE mergeFrom(final CLPDAOOAHOE other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasDJGJDMBOFEH()) { - setDJGJDMBOFEH(other.dJGJDMBOFEH); - } - if (other.hasKKNMDMPJLBG()) { - setKKNMDMPJLBG(other.kKNMDMPJLBG); - } - if (other.hasMGEFFLOEPBK()) { - getMutableMGEFFLOEPBK().mergeFrom(other.mGEFFLOEPBK); - } - if (other.hasPFIDJJKFGJH()) { - getMutablePFIDJJKFGJH().addAll(other.pFIDJJKFGJH); - } - return this; - } - - @Override - public CLPDAOOAHOE clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - dJGJDMBOFEH = 0; - kKNMDMPJLBG = 0; - mGEFFLOEPBK.clear(); - pFIDJJKFGJH.clear(); - return this; - } - - @Override - public CLPDAOOAHOE clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - mGEFFLOEPBK.clearQuick(); - pFIDJJKFGJH.clear(); - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof CLPDAOOAHOE)) { - return false; - } - CLPDAOOAHOE other = (CLPDAOOAHOE) o; - return bitField0_ == other.bitField0_ - && (!hasDJGJDMBOFEH() || dJGJDMBOFEH == other.dJGJDMBOFEH) - && (!hasKKNMDMPJLBG() || kKNMDMPJLBG == other.kKNMDMPJLBG) - && (!hasMGEFFLOEPBK() || mGEFFLOEPBK.equals(other.mGEFFLOEPBK)) - && (!hasPFIDJJKFGJH() || pFIDJJKFGJH.equals(other.pFIDJJKFGJH)); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(dJGJDMBOFEH); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(kKNMDMPJLBG); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(mGEFFLOEPBK); - } - if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < pFIDJJKFGJH.length(); i++) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(pFIDJJKFGJH.array()[i]); - } - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dJGJDMBOFEH); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kKNMDMPJLBG); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(mGEFFLOEPBK); - } - if ((bitField0_ & 0x00000008) != 0) { - size += (1 * pFIDJJKFGJH.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(pFIDJJKFGJH); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public CLPDAOOAHOE mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 88: { - // dJGJDMBOFEH - dJGJDMBOFEH = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // kKNMDMPJLBG - kKNMDMPJLBG = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { - // mGEFFLOEPBK - input.readMessage(mGEFFLOEPBK); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { - // pFIDJJKFGJH [packed=true] - input.readPackedUInt32(pFIDJJKFGJH, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - case 96: { - // pFIDJJKFGJH [packed=false] - tag = input.readRepeatedUInt32(pFIDJJKFGJH, tag); - bitField0_ |= 0x00000008; - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.dJGJDMBOFEH, dJGJDMBOFEH); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.kKNMDMPJLBG, kKNMDMPJLBG); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.mGEFFLOEPBK, mGEFFLOEPBK); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.pFIDJJKFGJH, pFIDJJKFGJH); - } - output.endObject(); - } - - @Override - public CLPDAOOAHOE mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case -463479542: { - if (input.isAtField(FieldNames.dJGJDMBOFEH)) { - if (!input.trySkipNullValue()) { - dJGJDMBOFEH = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 825219695: { - if (input.isAtField(FieldNames.kKNMDMPJLBG)) { - if (!input.trySkipNullValue()) { - kKNMDMPJLBG = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -464868894: { - if (input.isAtField(FieldNames.mGEFFLOEPBK)) { - if (!input.trySkipNullValue()) { - input.readMessage(mGEFFLOEPBK); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -662375: { - if (input.isAtField(FieldNames.pFIDJJKFGJH)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(pFIDJJKFGJH); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public CLPDAOOAHOE clone() { - return new CLPDAOOAHOE().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static CLPDAOOAHOE parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new CLPDAOOAHOE(), data).checkInitialized(); - } - - public static CLPDAOOAHOE parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new CLPDAOOAHOE(), input).checkInitialized(); - } - - public static CLPDAOOAHOE parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new CLPDAOOAHOE(), input).checkInitialized(); - } - - /** - * @return factory for creating CLPDAOOAHOE messages - */ - public static MessageFactory getFactory() { - return CLPDAOOAHOEFactory.INSTANCE; - } - - private enum CLPDAOOAHOEFactory implements MessageFactory { - INSTANCE; - - @Override - public CLPDAOOAHOE create() { - return CLPDAOOAHOE.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName dJGJDMBOFEH = FieldName.forField("DJGJDMBOFEH"); - - static final FieldName kKNMDMPJLBG = FieldName.forField("KKNMDMPJLBG"); - - static final FieldName mGEFFLOEPBK = FieldName.forField("MGEFFLOEPBK"); - - static final FieldName pFIDJJKFGJH = FieldName.forField("PFIDJJKFGJH"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueBonusSelectInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBonusSelectInfoOuterClass.java index 79baa2b..c56df24 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBonusSelectInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBonusSelectInfoOuterClass.java @@ -20,7 +20,7 @@ public final class RogueBonusSelectInfoOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 bonus_info = 5; + * repeated uint32 bonus_info = 11; */ private final RepeatedInt bonusInfo = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 5; + * repeated uint32 bonus_info = 11; * @return whether the bonusInfo field is set */ public boolean hasBonusInfo() { @@ -43,7 +43,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 5; + * repeated uint32 bonus_info = 11; * @return this */ public RogueBonusSelectInfo clearBonusInfo() { @@ -53,7 +53,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 5; + * repeated uint32 bonus_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. @@ -67,7 +67,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 5; + * repeated uint32 bonus_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 @@ -81,7 +81,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 5; + * repeated uint32 bonus_info = 11; * @param value the bonusInfo to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 5; + * repeated uint32 bonus_info = 11; * @param values the bonusInfo to add * @return this */ @@ -163,7 +163,7 @@ public final class RogueBonusSelectInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < bonusInfo.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(bonusInfo.array()[i]); } } @@ -185,7 +185,7 @@ public final class RogueBonusSelectInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 42: { + case 90: { // bonusInfo [packed=true] input.readPackedUInt32(bonusInfo, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class RogueBonusSelectInfoOuterClass { tag = input.readTag(); break; } - case 40: { + case 88: { // bonusInfo [packed=false] tag = input.readRepeatedUInt32(bonusInfo, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java index a2c760f..5cafe33 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java @@ -19,7 +19,7 @@ public final class RogueBonusSelectResultOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 bonus_id = 9; + * optional uint32 bonus_id = 12; */ private int bonusId; @@ -34,7 +34,7 @@ public final class RogueBonusSelectResultOuterClass { } /** - * optional uint32 bonus_id = 9; + * optional uint32 bonus_id = 12; * @return whether the bonusId field is set */ public boolean hasBonusId() { @@ -42,7 +42,7 @@ public final class RogueBonusSelectResultOuterClass { } /** - * optional uint32 bonus_id = 9; + * optional uint32 bonus_id = 12; * @return this */ public RogueBonusSelectResult clearBonusId() { @@ -52,7 +52,7 @@ public final class RogueBonusSelectResultOuterClass { } /** - * optional uint32 bonus_id = 9; + * optional uint32 bonus_id = 12; * @return the bonusId */ public int getBonusId() { @@ -60,7 +60,7 @@ public final class RogueBonusSelectResultOuterClass { } /** - * optional uint32 bonus_id = 9; + * optional uint32 bonus_id = 12; * @param value the bonusId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueBonusSelectResultOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(bonusId); } } @@ -150,7 +150,7 @@ public final class RogueBonusSelectResultOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 96: { // bonusId bonusId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceInfoOuterClass.java index 3b5915f..d081de1 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 HNHFMFCDCOC = 7; + * optional float unk_float = 14; */ - private float hNHFMFCDCOC; + private float unkFloat; /** - * optional uint32 buff_id = 11; + * optional uint32 buff_id = 9; */ private int buffId; /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 8; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -45,44 +45,44 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional float HNHFMFCDCOC = 7; - * @return whether the hNHFMFCDCOC field is set + * optional float unk_float = 14; + * @return whether the unkFloat field is set */ - public boolean hasHNHFMFCDCOC() { + public boolean hasUnkFloat() { return (bitField0_ & 0x00000001) != 0; } /** - * optional float HNHFMFCDCOC = 7; + * optional float unk_float = 14; * @return this */ - public RogueBuffEnhanceInfo clearHNHFMFCDCOC() { + public RogueBuffEnhanceInfo clearUnkFloat() { bitField0_ &= ~0x00000001; - hNHFMFCDCOC = 0F; + unkFloat = 0F; return this; } /** - * optional float HNHFMFCDCOC = 7; - * @return the hNHFMFCDCOC + * optional float unk_float = 14; + * @return the unkFloat */ - public float getHNHFMFCDCOC() { - return hNHFMFCDCOC; + public float getUnkFloat() { + return unkFloat; } /** - * optional float HNHFMFCDCOC = 7; - * @param value the hNHFMFCDCOC to set + * optional float unk_float = 14; + * @param value the unkFloat to set * @return this */ - public RogueBuffEnhanceInfo setHNHFMFCDCOC(final float value) { + public RogueBuffEnhanceInfo setUnkFloat(final float value) { bitField0_ |= 0x00000001; - hNHFMFCDCOC = value; + unkFloat = value; return this; } /** - * optional uint32 buff_id = 11; + * optional uint32 buff_id = 9; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -90,7 +90,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 11; + * optional uint32 buff_id = 9; * @return this */ public RogueBuffEnhanceInfo clearBuffId() { @@ -100,7 +100,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 11; + * optional uint32 buff_id = 9; * @return the buffId */ public int getBuffId() { @@ -108,7 +108,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 11; + * optional uint32 buff_id = 9; * @param value the buffId to set * @return this */ @@ -119,7 +119,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 8; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -127,7 +127,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 8; * @return this */ public RogueBuffEnhanceInfo clearItemCostList() { @@ -137,7 +137,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * 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. @@ -151,7 +151,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * 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 @@ -165,7 +165,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 8; * @param value the itemCostList to set * @return this */ @@ -180,7 +180,7 @@ public final class RogueBuffEnhanceInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - hNHFMFCDCOC = other.hNHFMFCDCOC; + unkFloat = other.unkFloat; buffId = other.buffId; itemCostList.copyFrom(other.itemCostList); } @@ -193,8 +193,8 @@ public final class RogueBuffEnhanceInfoOuterClass { return this; } cachedSize = -1; - if (other.hasHNHFMFCDCOC()) { - setHNHFMFCDCOC(other.hNHFMFCDCOC); + if (other.hasUnkFloat()) { + setUnkFloat(other.unkFloat); } if (other.hasBuffId()) { setBuffId(other.buffId); @@ -212,7 +212,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - hNHFMFCDCOC = 0F; + unkFloat = 0F; buffId = 0; itemCostList.clear(); return this; @@ -239,7 +239,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } RogueBuffEnhanceInfo other = (RogueBuffEnhanceInfo) o; return bitField0_ == other.bitField0_ - && (!hasHNHFMFCDCOC() || ProtoUtil.isEqual(hNHFMFCDCOC, other.hNHFMFCDCOC)) + && (!hasUnkFloat() || ProtoUtil.isEqual(unkFloat, other.unkFloat)) && (!hasBuffId() || buffId == other.buffId) && (!hasItemCostList() || itemCostList.equals(other.itemCostList)); } @@ -247,15 +247,15 @@ public final class RogueBuffEnhanceInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 61); - output.writeFloatNoTag(hNHFMFCDCOC); + output.writeRawByte((byte) 117); + output.writeFloatNoTag(unkFloat); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(buffId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 66); output.writeMessageNoTag(itemCostList); } } @@ -282,25 +282,25 @@ public final class RogueBuffEnhanceInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 61: { - // hNHFMFCDCOC - hNHFMFCDCOC = input.readFloat(); + case 117: { + // unkFloat + unkFloat = input.readFloat(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 72) { break; } } - case 88: { + case 72: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 34) { + if (tag != 66) { break; } } - case 34: { + case 66: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000004; @@ -327,7 +327,7 @@ public final class RogueBuffEnhanceInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeFloat(FieldNames.hNHFMFCDCOC, hNHFMFCDCOC); + output.writeFloat(FieldNames.unkFloat, unkFloat); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.buffId, buffId); @@ -345,10 +345,11 @@ public final class RogueBuffEnhanceInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -838377895: { - if (input.isAtField(FieldNames.hNHFMFCDCOC)) { + case -277171062: + case 707742927: { + if (input.isAtField(FieldNames.unkFloat)) { if (!input.trySkipNullValue()) { - hNHFMFCDCOC = input.readFloat(); + unkFloat = input.readFloat(); bitField0_ |= 0x00000001; } } else { @@ -433,7 +434,7 @@ public final class RogueBuffEnhanceInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName hNHFMFCDCOC = FieldName.forField("HNHFMFCDCOC"); + static final FieldName unkFloat = FieldName.forField("unkFloat", "unk_float"); static final FieldName buffId = FieldName.forField("buffId", "buff_id"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceShopInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceShopInfoOuterClass.java index a134a3d..3402b21 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 = 2; + * repeated .RogueBuffEnhanceInfo buff_info = 11; */ private final RepeatedMessage buffInfo = RepeatedMessage.newEmptyInstance(RogueBuffEnhanceInfoOuterClass.RogueBuffEnhanceInfo.getFactory()); @@ -35,7 +35,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 2; + * repeated .RogueBuffEnhanceInfo buff_info = 11; * @return whether the buffInfo field is set */ public boolean hasBuffInfo() { @@ -43,7 +43,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 2; + * repeated .RogueBuffEnhanceInfo buff_info = 11; * @return this */ public RogueBuffEnhanceShopInfo clearBuffInfo() { @@ -53,7 +53,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 2; + * repeated .RogueBuffEnhanceInfo buff_info = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 2; + * repeated .RogueBuffEnhanceInfo buff_info = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -82,7 +82,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 2; + * repeated .RogueBuffEnhanceInfo buff_info = 11; * @param value the buffInfo to add * @return this */ @@ -94,7 +94,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 2; + * repeated .RogueBuffEnhanceInfo buff_info = 11; * @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) 18); + output.writeRawByte((byte) 90); output.writeMessageNoTag(buffInfo.get(i)); } } @@ -188,7 +188,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 90: { // buffInfo tag = input.readRepeatedMessage(buffInfo, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffInfoOuterClass.java index a8bcf30..c8fcd7a 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBuffInfoOuterClass.java @@ -20,7 +20,7 @@ public final class RogueBuffInfoOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .RogueBuff maze_buff_list = 1; + * repeated .RogueBuff maze_buff_list = 10; */ private final RepeatedMessage mazeBuffList = RepeatedMessage.newEmptyInstance(RogueBuffOuterClass.RogueBuff.getFactory()); @@ -35,7 +35,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 1; + * repeated .RogueBuff maze_buff_list = 10; * @return whether the mazeBuffList field is set */ public boolean hasMazeBuffList() { @@ -43,7 +43,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 1; + * repeated .RogueBuff maze_buff_list = 10; * @return this */ public RogueBuffInfo clearMazeBuffList() { @@ -53,7 +53,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 1; + * repeated .RogueBuff maze_buff_list = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 1; + * repeated .RogueBuff maze_buff_list = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 1; + * repeated .RogueBuff maze_buff_list = 10; * @param value the mazeBuffList to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 1; + * repeated .RogueBuff maze_buff_list = 10; * @param values the mazeBuffList to add * @return this */ @@ -163,7 +163,7 @@ public final class RogueBuffInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < mazeBuffList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 82); output.writeMessageNoTag(mazeBuffList.get(i)); } } @@ -185,7 +185,7 @@ public final class RogueBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 82: { // 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 fa0d62a..fdf7913 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBuffOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBuffOuterClass.java @@ -19,15 +19,15 @@ public final class RogueBuffOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 level = 10; - */ - private int level; - - /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 2; */ private int buffId; + /** + * optional uint32 level = 8; + */ + private int level; + private RogueBuff() { } @@ -39,62 +39,25 @@ public final class RogueBuffOuterClass { } /** - * optional uint32 level = 10; - * @return whether the level field is set + * optional uint32 buff_id = 2; + * @return whether the buffId field is set */ - public boolean hasLevel() { + public boolean hasBuffId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 level = 10; - * @return this - */ - public RogueBuff clearLevel() { - bitField0_ &= ~0x00000001; - 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 RogueBuff setLevel(final int value) { - bitField0_ |= 0x00000001; - level = value; - return this; - } - - /** - * optional uint32 buff_id = 15; - * @return whether the buffId field is set - */ - public boolean hasBuffId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 2; * @return this */ public RogueBuff clearBuffId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; buffId = 0; return this; } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 2; * @return the buffId */ public int getBuffId() { @@ -102,23 +65,60 @@ public final class RogueBuffOuterClass { } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 2; * @param value the buffId to set * @return this */ public RogueBuff setBuffId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; buffId = value; return this; } + /** + * optional uint32 level = 8; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 level = 8; + * @return this + */ + public RogueBuff clearLevel() { + bitField0_ &= ~0x00000002; + level = 0; + return this; + } + + /** + * optional uint32 level = 8; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 8; + * @param value the level to set + * @return this + */ + public RogueBuff setLevel(final int value) { + bitField0_ |= 0x00000002; + level = value; + return this; + } + @Override public RogueBuff copyFrom(final RogueBuff other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - level = other.level; buffId = other.buffId; + level = other.level; } return this; } @@ -129,12 +129,12 @@ public final class RogueBuffOuterClass { return this; } cachedSize = -1; - if (other.hasLevel()) { - setLevel(other.level); - } if (other.hasBuffId()) { setBuffId(other.buffId); } + if (other.hasLevel()) { + setLevel(other.level); + } return this; } @@ -145,8 +145,8 @@ public final class RogueBuffOuterClass { } cachedSize = -1; bitField0_ = 0; - level = 0; buffId = 0; + level = 0; return this; } @@ -170,19 +170,19 @@ public final class RogueBuffOuterClass { } RogueBuff other = (RogueBuff) o; return bitField0_ == other.bitField0_ - && (!hasLevel() || level == other.level) - && (!hasBuffId() || buffId == other.buffId); + && (!hasBuffId() || buffId == other.buffId) + && (!hasLevel() || level == other.level); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(buffId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(buffId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(level); } } @@ -190,10 +190,10 @@ public final class RogueBuffOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } return size; } @@ -205,18 +205,18 @@ public final class RogueBuffOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { - // level - level = input.readUInt32(); + case 16: { + // buffId + buffId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 64) { break; } } - case 120: { - // buffId - buffId = input.readUInt32(); + case 64: { + // level + level = 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.level, level); + output.writeUInt32(FieldNames.buffId, buffId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.buffId, buffId); + output.writeUInt32(FieldNames.level, level); } output.endObject(); } @@ -256,10 +256,11 @@ public final class RogueBuffOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class RogueBuffOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public final class RogueBuffOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName level = FieldName.forField("level"); - static final FieldName buffId = FieldName.forField("buffId", "buff_id"); + + static final FieldName level = FieldName.forField("level"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonActionResultDisplayTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonActionResultDisplayTypeOuterClass.java new file mode 100644 index 0000000..15d3664 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonActionResultDisplayTypeOuterClass.java @@ -0,0 +1,133 @@ +// 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 RogueCommonActionResultDisplayTypeOuterClass { + /** + * Protobuf enum {@code RogueCommonActionResultDisplayType} + */ + public enum RogueCommonActionResultDisplayType implements ProtoEnum { + /** + * ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_NONE = 0; + */ + ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_NONE("ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_NONE", 0), + + /** + * ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_SINGLE = 1; + */ + ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_SINGLE("ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_SINGLE", 1), + + /** + * ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_MULTI = 2; + */ + ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_MULTI("ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_MULTI", 2); + + /** + * ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_NONE = 0; + */ + public static final int ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_NONE_VALUE = 0; + + /** + * ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_SINGLE = 1; + */ + public static final int ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_SINGLE_VALUE = 1; + + /** + * ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_MULTI = 2; + */ + public static final int ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_MULTI_VALUE = 2; + + private final String name; + + private final int number; + + private RogueCommonActionResultDisplayType(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 RogueCommonActionResultDisplayTypeConverter.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 RogueCommonActionResultDisplayType forNumber(int value) { + return RogueCommonActionResultDisplayTypeConverter.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 RogueCommonActionResultDisplayType forNumberOr(int number, + RogueCommonActionResultDisplayType other) { + RogueCommonActionResultDisplayType value = forNumber(number); + return value == null ? other : value; + } + + enum RogueCommonActionResultDisplayTypeConverter implements ProtoEnum.EnumConverter { + INSTANCE; + + private static final RogueCommonActionResultDisplayType[] lookup = new RogueCommonActionResultDisplayType[3]; + + static { + lookup[0] = ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_NONE; + lookup[1] = ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_SINGLE; + lookup[2] = ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_MULTI; + } + + @Override + public final RogueCommonActionResultDisplayType forNumber(final int value) { + if (value >= 0 && value < lookup.length) { + return lookup[value]; + } + return null; + } + + @Override + public final RogueCommonActionResultDisplayType forName(final CharSequence value) { + if (value.length() == 44) { + if (ProtoUtil.isEqual("ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_NONE", value)) { + return ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_NONE; + } + } + if (value.length() == 45) { + if (ProtoUtil.isEqual("ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_MULTI", value)) { + return ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_MULTI; + } + } + if (value.length() == 46) { + if (ProtoUtil.isEqual("ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_SINGLE", value)) { + return ROGUE_COMMON_ACTION_RESULT_DISPLAY_TYPE_SINGLE; + } + } + return null; + } + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java index 239824c..2ee3d28 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java @@ -18,16 +18,16 @@ public final class RogueCommonBuffOuterClass { public static final class RogueCommonBuff extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 buff_level = 2; + */ + private int buffLevel; + /** * optional uint32 buff_id = 5; */ private int buffId; - /** - * optional uint32 level = 9; - */ - private int level; - private RogueCommonBuff() { } @@ -38,12 +38,49 @@ public final class RogueCommonBuffOuterClass { return new RogueCommonBuff(); } + /** + * optional uint32 buff_level = 2; + * @return whether the buffLevel field is set + */ + public boolean hasBuffLevel() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 buff_level = 2; + * @return this + */ + public RogueCommonBuff clearBuffLevel() { + bitField0_ &= ~0x00000001; + buffLevel = 0; + return this; + } + + /** + * optional uint32 buff_level = 2; + * @return the buffLevel + */ + public int getBuffLevel() { + return buffLevel; + } + + /** + * optional uint32 buff_level = 2; + * @param value the buffLevel to set + * @return this + */ + public RogueCommonBuff setBuffLevel(final int value) { + bitField0_ |= 0x00000001; + buffLevel = value; + return this; + } + /** * optional uint32 buff_id = 5; * @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 RogueCommonBuffOuterClass { * @return this */ public RogueCommonBuff clearBuffId() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; buffId = 0; return this; } @@ -70,45 +107,8 @@ public final class RogueCommonBuffOuterClass { * @return this */ public RogueCommonBuff setBuffId(final int value) { - bitField0_ |= 0x00000001; - buffId = value; - return this; - } - - /** - * optional uint32 level = 9; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 level = 9; - * @return this - */ - public RogueCommonBuff clearLevel() { - bitField0_ &= ~0x00000002; - level = 0; - return this; - } - - /** - * optional uint32 level = 9; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 9; - * @param value the level to set - * @return this - */ - public RogueCommonBuff setLevel(final int value) { bitField0_ |= 0x00000002; - level = value; + buffId = value; return this; } @@ -117,8 +117,8 @@ public final class RogueCommonBuffOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + buffLevel = other.buffLevel; buffId = other.buffId; - level = other.level; } return this; } @@ -129,12 +129,12 @@ public final class RogueCommonBuffOuterClass { return this; } cachedSize = -1; + if (other.hasBuffLevel()) { + setBuffLevel(other.buffLevel); + } if (other.hasBuffId()) { setBuffId(other.buffId); } - if (other.hasLevel()) { - setLevel(other.level); - } return this; } @@ -145,8 +145,8 @@ public final class RogueCommonBuffOuterClass { } cachedSize = -1; bitField0_ = 0; + buffLevel = 0; buffId = 0; - level = 0; return this; } @@ -170,19 +170,19 @@ public final class RogueCommonBuffOuterClass { } RogueCommonBuff other = (RogueCommonBuff) o; return bitField0_ == other.bitField0_ - && (!hasBuffId() || buffId == other.buffId) - && (!hasLevel() || level == other.level); + && (!hasBuffLevel() || buffLevel == other.buffLevel) + && (!hasBuffId() || buffId == other.buffId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(buffId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(buffLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(buffId); } } @@ -190,10 +190,10 @@ public final class RogueCommonBuffOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buffLevel); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); } return size; } @@ -205,18 +205,18 @@ public final class RogueCommonBuffOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // buffId - buffId = input.readUInt32(); + case 16: { + // buffLevel + buffLevel = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 40) { break; } } - case 72: { - // level - level = input.readUInt32(); + case 40: { + // buffId + buffId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class RogueCommonBuffOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.buffId, buffId); + output.writeUInt32(FieldNames.buffLevel, buffLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.buffId, buffId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class RogueCommonBuffOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1378119474: - case 227990663: { - if (input.isAtField(FieldNames.buffId)) { + case 38049521: + case 1729463448: { + if (input.isAtField(FieldNames.buffLevel)) { if (!input.trySkipNullValue()) { - buffId = input.readUInt32(); + buffLevel = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,10 +268,11 @@ public final class RogueCommonBuffOuterClass { } 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 { @@ -332,9 +333,9 @@ public final class RogueCommonBuffOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName buffId = FieldName.forField("buffId", "buff_id"); + static final FieldName buffLevel = FieldName.forField("buffLevel", "buff_level"); - static final FieldName level = FieldName.forField("level"); + static final FieldName buffId = FieldName.forField("buffId", "buff_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java index c2d920d..24e945d 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java @@ -26,57 +26,57 @@ public final class RogueCommonBuffSelectInfoOuterClass { private int sourceTotalCount; /** - * optional uint32 select_buff_source_hint = 4; + * optional uint32 select_buff_source_hint = 6; */ private int selectBuffSourceHint; /** - * optional uint32 roll_buff_free_times = 8; - */ - private int rollBuffFreeTimes; - - /** - * optional uint32 roll_buff_max_times = 9; - */ - private int rollBuffMaxTimes; - - /** - * optional uint32 source_cur_count = 10; - */ - private int sourceCurCount; - - /** - * optional uint32 roll_buff_times = 11; + * optional uint32 roll_buff_times = 8; */ private int rollBuffTimes; /** - * optional .RogueCommonBuffSelectSource source_type = 14; + * optional uint32 roll_buff_max_times = 12; + */ + private int rollBuffMaxTimes; + + /** + * optional uint32 roll_buff_free_count = 13; + */ + private int rollBuffFreeCount; + + /** + * optional uint32 source_cur_count = 15; + */ + private int sourceCurCount; + + /** + * optional .RogueCommonBuffSelectSource source_type = 9; */ private int sourceType; /** - * optional bool can_roll = 2; + * optional bool can_roll = 14; */ private boolean canRoll; /** - * optional .ItemCostList roll_buffs_cost = 12; + * optional .ItemCostList roll_buffs_cost = 2; */ private final ItemCostListOuterClass.ItemCostList rollBuffsCost = ItemCostListOuterClass.ItemCostList.newInstance(); /** - * repeated uint32 first_buff_type_list = 6; + * repeated uint32 first_buff_type_list = 7; */ private final RepeatedInt firstBuffTypeList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 handbook_unlock_buff_id_list = 15; + * repeated uint32 handbook_unlock_buff_id_list = 11; */ private final RepeatedInt handbookUnlockBuffIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .RogueCommonBuff maze_buff_list = 7; + * repeated .RogueCommonBuff maze_buff_list = 5; */ private final RepeatedMessage mazeBuffList = RepeatedMessage.newEmptyInstance(RogueCommonBuffOuterClass.RogueCommonBuff.getFactory()); @@ -128,7 +128,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 select_buff_source_hint = 4; + * optional uint32 select_buff_source_hint = 6; * @return whether the selectBuffSourceHint field is set */ public boolean hasSelectBuffSourceHint() { @@ -136,7 +136,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 select_buff_source_hint = 4; + * optional uint32 select_buff_source_hint = 6; * @return this */ public RogueCommonBuffSelectInfo clearSelectBuffSourceHint() { @@ -146,7 +146,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 select_buff_source_hint = 4; + * optional uint32 select_buff_source_hint = 6; * @return the selectBuffSourceHint */ public int getSelectBuffSourceHint() { @@ -154,7 +154,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 select_buff_source_hint = 4; + * optional uint32 select_buff_source_hint = 6; * @param value the selectBuffSourceHint to set * @return this */ @@ -165,44 +165,44 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 roll_buff_free_times = 8; - * @return whether the rollBuffFreeTimes field is set + * optional uint32 roll_buff_times = 8; + * @return whether the rollBuffTimes field is set */ - public boolean hasRollBuffFreeTimes() { + public boolean hasRollBuffTimes() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 roll_buff_free_times = 8; + * optional uint32 roll_buff_times = 8; * @return this */ - public RogueCommonBuffSelectInfo clearRollBuffFreeTimes() { + public RogueCommonBuffSelectInfo clearRollBuffTimes() { bitField0_ &= ~0x00000004; - rollBuffFreeTimes = 0; + rollBuffTimes = 0; return this; } /** - * optional uint32 roll_buff_free_times = 8; - * @return the rollBuffFreeTimes + * optional uint32 roll_buff_times = 8; + * @return the rollBuffTimes */ - public int getRollBuffFreeTimes() { - return rollBuffFreeTimes; + public int getRollBuffTimes() { + return rollBuffTimes; } /** - * optional uint32 roll_buff_free_times = 8; - * @param value the rollBuffFreeTimes to set + * optional uint32 roll_buff_times = 8; + * @param value the rollBuffTimes to set * @return this */ - public RogueCommonBuffSelectInfo setRollBuffFreeTimes(final int value) { + public RogueCommonBuffSelectInfo setRollBuffTimes(final int value) { bitField0_ |= 0x00000004; - rollBuffFreeTimes = value; + rollBuffTimes = value; return this; } /** - * optional uint32 roll_buff_max_times = 9; + * optional uint32 roll_buff_max_times = 12; * @return whether the rollBuffMaxTimes field is set */ public boolean hasRollBuffMaxTimes() { @@ -210,7 +210,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 roll_buff_max_times = 9; + * optional uint32 roll_buff_max_times = 12; * @return this */ public RogueCommonBuffSelectInfo clearRollBuffMaxTimes() { @@ -220,7 +220,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 roll_buff_max_times = 9; + * optional uint32 roll_buff_max_times = 12; * @return the rollBuffMaxTimes */ public int getRollBuffMaxTimes() { @@ -228,7 +228,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 roll_buff_max_times = 9; + * optional uint32 roll_buff_max_times = 12; * @param value the rollBuffMaxTimes to set * @return this */ @@ -239,25 +239,62 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 source_cur_count = 10; - * @return whether the sourceCurCount field is set + * optional uint32 roll_buff_free_count = 13; + * @return whether the rollBuffFreeCount field is set */ - public boolean hasSourceCurCount() { + public boolean hasRollBuffFreeCount() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 source_cur_count = 10; + * optional uint32 roll_buff_free_count = 13; + * @return this + */ + public RogueCommonBuffSelectInfo clearRollBuffFreeCount() { + bitField0_ &= ~0x00000010; + rollBuffFreeCount = 0; + return this; + } + + /** + * optional uint32 roll_buff_free_count = 13; + * @return the rollBuffFreeCount + */ + public int getRollBuffFreeCount() { + return rollBuffFreeCount; + } + + /** + * optional uint32 roll_buff_free_count = 13; + * @param value the rollBuffFreeCount to set + * @return this + */ + public RogueCommonBuffSelectInfo setRollBuffFreeCount(final int value) { + bitField0_ |= 0x00000010; + rollBuffFreeCount = value; + return this; + } + + /** + * optional uint32 source_cur_count = 15; + * @return whether the sourceCurCount field is set + */ + public boolean hasSourceCurCount() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 source_cur_count = 15; * @return this */ public RogueCommonBuffSelectInfo clearSourceCurCount() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000020; sourceCurCount = 0; return this; } /** - * optional uint32 source_cur_count = 10; + * optional uint32 source_cur_count = 15; * @return the sourceCurCount */ public int getSourceCurCount() { @@ -265,55 +302,18 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 source_cur_count = 10; + * optional uint32 source_cur_count = 15; * @param value the sourceCurCount to set * @return this */ public RogueCommonBuffSelectInfo setSourceCurCount(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; sourceCurCount = value; return this; } /** - * optional uint32 roll_buff_times = 11; - * @return whether the rollBuffTimes field is set - */ - public boolean hasRollBuffTimes() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 roll_buff_times = 11; - * @return this - */ - public RogueCommonBuffSelectInfo clearRollBuffTimes() { - bitField0_ &= ~0x00000020; - rollBuffTimes = 0; - return this; - } - - /** - * optional uint32 roll_buff_times = 11; - * @return the rollBuffTimes - */ - public int getRollBuffTimes() { - return rollBuffTimes; - } - - /** - * optional uint32 roll_buff_times = 11; - * @param value the rollBuffTimes to set - * @return this - */ - public RogueCommonBuffSelectInfo setRollBuffTimes(final int value) { - bitField0_ |= 0x00000020; - rollBuffTimes = value; - return this; - } - - /** - * optional .RogueCommonBuffSelectSource source_type = 14; + * optional .RogueCommonBuffSelectSource source_type = 9; * @return whether the sourceType field is set */ public boolean hasSourceType() { @@ -321,7 +321,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .RogueCommonBuffSelectSource source_type = 14; + * optional .RogueCommonBuffSelectSource source_type = 9; * @return this */ public RogueCommonBuffSelectInfo clearSourceType() { @@ -331,7 +331,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .RogueCommonBuffSelectSource source_type = 14; + * optional .RogueCommonBuffSelectSource source_type = 9; * @return the sourceType */ public RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource getSourceType() { @@ -364,7 +364,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .RogueCommonBuffSelectSource source_type = 14; + * optional .RogueCommonBuffSelectSource source_type = 9; * @param value the sourceType to set * @return this */ @@ -376,7 +376,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional bool can_roll = 2; + * optional bool can_roll = 14; * @return whether the canRoll field is set */ public boolean hasCanRoll() { @@ -384,7 +384,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional bool can_roll = 2; + * optional bool can_roll = 14; * @return this */ public RogueCommonBuffSelectInfo clearCanRoll() { @@ -394,7 +394,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional bool can_roll = 2; + * optional bool can_roll = 14; * @return the canRoll */ public boolean getCanRoll() { @@ -402,7 +402,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional bool can_roll = 2; + * optional bool can_roll = 14; * @param value the canRoll to set * @return this */ @@ -413,7 +413,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 12; + * optional .ItemCostList roll_buffs_cost = 2; * @return whether the rollBuffsCost field is set */ public boolean hasRollBuffsCost() { @@ -421,7 +421,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 12; + * optional .ItemCostList roll_buffs_cost = 2; * @return this */ public RogueCommonBuffSelectInfo clearRollBuffsCost() { @@ -431,7 +431,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 12; + * optional .ItemCostList roll_buffs_cost = 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. @@ -445,7 +445,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 12; + * optional .ItemCostList roll_buffs_cost = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -459,7 +459,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 12; + * optional .ItemCostList roll_buffs_cost = 2; * @param value the rollBuffsCost to set * @return this */ @@ -471,7 +471,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 6; + * repeated uint32 first_buff_type_list = 7; * @return whether the firstBuffTypeList field is set */ public boolean hasFirstBuffTypeList() { @@ -479,7 +479,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 6; + * repeated uint32 first_buff_type_list = 7; * @return this */ public RogueCommonBuffSelectInfo clearFirstBuffTypeList() { @@ -489,7 +489,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 6; + * repeated uint32 first_buff_type_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. @@ -503,7 +503,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 6; + * repeated uint32 first_buff_type_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 @@ -517,7 +517,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 6; + * repeated uint32 first_buff_type_list = 7; * @param value the firstBuffTypeList to add * @return this */ @@ -528,7 +528,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 6; + * repeated uint32 first_buff_type_list = 7; * @param values the firstBuffTypeList to add * @return this */ @@ -539,7 +539,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 handbook_unlock_buff_id_list = 15; + * repeated uint32 handbook_unlock_buff_id_list = 11; * @return whether the handbookUnlockBuffIdList field is set */ public boolean hasHandbookUnlockBuffIdList() { @@ -547,7 +547,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 handbook_unlock_buff_id_list = 15; + * repeated uint32 handbook_unlock_buff_id_list = 11; * @return this */ public RogueCommonBuffSelectInfo clearHandbookUnlockBuffIdList() { @@ -557,7 +557,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 handbook_unlock_buff_id_list = 15; + * repeated uint32 handbook_unlock_buff_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. @@ -571,7 +571,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 handbook_unlock_buff_id_list = 15; + * repeated uint32 handbook_unlock_buff_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 @@ -585,7 +585,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 handbook_unlock_buff_id_list = 15; + * repeated uint32 handbook_unlock_buff_id_list = 11; * @param value the handbookUnlockBuffIdList to add * @return this */ @@ -596,7 +596,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 handbook_unlock_buff_id_list = 15; + * repeated uint32 handbook_unlock_buff_id_list = 11; * @param values the handbookUnlockBuffIdList to add * @return this */ @@ -607,7 +607,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 7; + * repeated .RogueCommonBuff maze_buff_list = 5; * @return whether the mazeBuffList field is set */ public boolean hasMazeBuffList() { @@ -615,7 +615,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 7; + * repeated .RogueCommonBuff maze_buff_list = 5; * @return this */ public RogueCommonBuffSelectInfo clearMazeBuffList() { @@ -625,7 +625,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 7; + * repeated .RogueCommonBuff maze_buff_list = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -639,7 +639,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 7; + * repeated .RogueCommonBuff maze_buff_list = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -653,7 +653,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 7; + * repeated .RogueCommonBuff maze_buff_list = 5; * @param value the mazeBuffList to add * @return this */ @@ -665,7 +665,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 7; + * repeated .RogueCommonBuff maze_buff_list = 5; * @param values the mazeBuffList to add * @return this */ @@ -683,10 +683,10 @@ public final class RogueCommonBuffSelectInfoOuterClass { bitField0_ = other.bitField0_; sourceTotalCount = other.sourceTotalCount; selectBuffSourceHint = other.selectBuffSourceHint; - rollBuffFreeTimes = other.rollBuffFreeTimes; - rollBuffMaxTimes = other.rollBuffMaxTimes; - sourceCurCount = other.sourceCurCount; rollBuffTimes = other.rollBuffTimes; + rollBuffMaxTimes = other.rollBuffMaxTimes; + rollBuffFreeCount = other.rollBuffFreeCount; + sourceCurCount = other.sourceCurCount; sourceType = other.sourceType; canRoll = other.canRoll; rollBuffsCost.copyFrom(other.rollBuffsCost); @@ -709,18 +709,18 @@ public final class RogueCommonBuffSelectInfoOuterClass { if (other.hasSelectBuffSourceHint()) { setSelectBuffSourceHint(other.selectBuffSourceHint); } - if (other.hasRollBuffFreeTimes()) { - setRollBuffFreeTimes(other.rollBuffFreeTimes); + if (other.hasRollBuffTimes()) { + setRollBuffTimes(other.rollBuffTimes); } if (other.hasRollBuffMaxTimes()) { setRollBuffMaxTimes(other.rollBuffMaxTimes); } + if (other.hasRollBuffFreeCount()) { + setRollBuffFreeCount(other.rollBuffFreeCount); + } if (other.hasSourceCurCount()) { setSourceCurCount(other.sourceCurCount); } - if (other.hasRollBuffTimes()) { - setRollBuffTimes(other.rollBuffTimes); - } if (other.hasSourceType()) { setSourceTypeValue(other.sourceType); } @@ -751,10 +751,10 @@ public final class RogueCommonBuffSelectInfoOuterClass { bitField0_ = 0; sourceTotalCount = 0; selectBuffSourceHint = 0; - rollBuffFreeTimes = 0; - rollBuffMaxTimes = 0; - sourceCurCount = 0; rollBuffTimes = 0; + rollBuffMaxTimes = 0; + rollBuffFreeCount = 0; + sourceCurCount = 0; sourceType = 0; canRoll = false; rollBuffsCost.clear(); @@ -790,10 +790,10 @@ public final class RogueCommonBuffSelectInfoOuterClass { return bitField0_ == other.bitField0_ && (!hasSourceTotalCount() || sourceTotalCount == other.sourceTotalCount) && (!hasSelectBuffSourceHint() || selectBuffSourceHint == other.selectBuffSourceHint) - && (!hasRollBuffFreeTimes() || rollBuffFreeTimes == other.rollBuffFreeTimes) - && (!hasRollBuffMaxTimes() || rollBuffMaxTimes == other.rollBuffMaxTimes) - && (!hasSourceCurCount() || sourceCurCount == other.sourceCurCount) && (!hasRollBuffTimes() || rollBuffTimes == other.rollBuffTimes) + && (!hasRollBuffMaxTimes() || rollBuffMaxTimes == other.rollBuffMaxTimes) + && (!hasRollBuffFreeCount() || rollBuffFreeCount == other.rollBuffFreeCount) + && (!hasSourceCurCount() || sourceCurCount == other.sourceCurCount) && (!hasSourceType() || sourceType == other.sourceType) && (!hasCanRoll() || canRoll == other.canRoll) && (!hasRollBuffsCost() || rollBuffsCost.equals(other.rollBuffsCost)) @@ -809,52 +809,52 @@ public final class RogueCommonBuffSelectInfoOuterClass { output.writeUInt32NoTag(sourceTotalCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(selectBuffSourceHint); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 64); - output.writeUInt32NoTag(rollBuffFreeTimes); + output.writeUInt32NoTag(rollBuffTimes); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(rollBuffMaxTimes); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(sourceCurCount); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(rollBuffFreeCount); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(rollBuffTimes); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(sourceCurCount); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 72); output.writeEnumNoTag(sourceType); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 112); output.writeBoolNoTag(canRoll); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 18); output.writeMessageNoTag(rollBuffsCost); } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < firstBuffTypeList.length(); i++) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(firstBuffTypeList.array()[i]); } } if ((bitField0_ & 0x00000400) != 0) { for (int i = 0; i < handbookUnlockBuffIdList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(handbookUnlockBuffIdList.array()[i]); } } if ((bitField0_ & 0x00000800) != 0) { for (int i = 0; i < mazeBuffList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 42); output.writeMessageNoTag(mazeBuffList.get(i)); } } @@ -870,16 +870,16 @@ public final class RogueCommonBuffSelectInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(selectBuffSourceHint); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffFreeTimes); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffTimes); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffMaxTimes); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(sourceCurCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffFreeCount); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffTimes); + size += 1 + ProtoSink.computeUInt32SizeNoTag(sourceCurCount); } if ((bitField0_ & 0x00000040) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(sourceType); @@ -914,11 +914,11 @@ public final class RogueCommonBuffSelectInfoOuterClass { sourceTotalCount = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 48) { break; } } - case 32: { + case 48: { // selectBuffSourceHint selectBuffSourceHint = input.readUInt32(); bitField0_ |= 0x00000002; @@ -928,42 +928,42 @@ public final class RogueCommonBuffSelectInfoOuterClass { } } case 64: { - // rollBuffFreeTimes - rollBuffFreeTimes = input.readUInt32(); + // rollBuffTimes + rollBuffTimes = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // rollBuffMaxTimes + rollBuffMaxTimes = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // rollBuffFreeCount + rollBuffFreeCount = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // sourceCurCount + sourceCurCount = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); if (tag != 72) { break; } } case 72: { - // rollBuffMaxTimes - rollBuffMaxTimes = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // sourceCurCount - sourceCurCount = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // rollBuffTimes - rollBuffTimes = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { // sourceType final int value = input.readInt32(); if (RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource.forNumber(value) != null) { @@ -971,47 +971,47 @@ public final class RogueCommonBuffSelectInfoOuterClass { bitField0_ |= 0x00000040; } tag = input.readTag(); - if (tag != 16) { + if (tag != 112) { break; } } - case 16: { + case 112: { // canRoll canRoll = input.readBool(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 98) { + if (tag != 18) { break; } } - case 98: { + case 18: { // rollBuffsCost input.readMessage(rollBuffsCost); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { - // firstBuffTypeList [packed=true] - input.readPackedUInt32(firstBuffTypeList, tag); - bitField0_ |= 0x00000200; - tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { - // handbookUnlockBuffIdList [packed=true] - input.readPackedUInt32(handbookUnlockBuffIdList, tag); - bitField0_ |= 0x00000400; - tag = input.readTag(); if (tag != 58) { break; } } case 58: { + // firstBuffTypeList [packed=true] + input.readPackedUInt32(firstBuffTypeList, tag); + bitField0_ |= 0x00000200; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { + // handbookUnlockBuffIdList [packed=true] + input.readPackedUInt32(handbookUnlockBuffIdList, tag); + bitField0_ |= 0x00000400; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { // mazeBuffList tag = input.readRepeatedMessage(mazeBuffList, tag); bitField0_ |= 0x00000800; @@ -1029,13 +1029,13 @@ public final class RogueCommonBuffSelectInfoOuterClass { tag = input.readTag(); break; } - case 48: { + case 56: { // firstBuffTypeList [packed=false] tag = input.readRepeatedUInt32(firstBuffTypeList, tag); bitField0_ |= 0x00000200; break; } - case 120: { + case 88: { // handbookUnlockBuffIdList [packed=false] tag = input.readRepeatedUInt32(handbookUnlockBuffIdList, tag); bitField0_ |= 0x00000400; @@ -1055,16 +1055,16 @@ public final class RogueCommonBuffSelectInfoOuterClass { output.writeUInt32(FieldNames.selectBuffSourceHint, selectBuffSourceHint); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.rollBuffFreeTimes, rollBuffFreeTimes); + output.writeUInt32(FieldNames.rollBuffTimes, rollBuffTimes); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.rollBuffMaxTimes, rollBuffMaxTimes); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.sourceCurCount, sourceCurCount); + output.writeUInt32(FieldNames.rollBuffFreeCount, rollBuffFreeCount); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.rollBuffTimes, rollBuffTimes); + output.writeUInt32(FieldNames.sourceCurCount, sourceCurCount); } if ((bitField0_ & 0x00000040) != 0) { output.writeEnum(FieldNames.sourceType, sourceType, RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource.converter()); @@ -1118,11 +1118,11 @@ public final class RogueCommonBuffSelectInfoOuterClass { } break; } - case -212024406: - case -694689955: { - if (input.isAtField(FieldNames.rollBuffFreeTimes)) { + case -436216138: + case 2038334812: { + if (input.isAtField(FieldNames.rollBuffTimes)) { if (!input.trySkipNullValue()) { - rollBuffFreeTimes = input.readUInt32(); + rollBuffTimes = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -1142,11 +1142,11 @@ public final class RogueCommonBuffSelectInfoOuterClass { } break; } - case -831207446: - case 557368108: { - if (input.isAtField(FieldNames.sourceCurCount)) { + case -227537549: + case -710203098: { + if (input.isAtField(FieldNames.rollBuffFreeCount)) { if (!input.trySkipNullValue()) { - sourceCurCount = input.readUInt32(); + rollBuffFreeCount = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1154,11 +1154,11 @@ public final class RogueCommonBuffSelectInfoOuterClass { } break; } - case -436216138: - case 2038334812: { - if (input.isAtField(FieldNames.rollBuffTimes)) { + case -831207446: + case 557368108: { + if (input.isAtField(FieldNames.sourceCurCount)) { if (!input.trySkipNullValue()) { - rollBuffTimes = input.readUInt32(); + sourceCurCount = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -1300,13 +1300,13 @@ public final class RogueCommonBuffSelectInfoOuterClass { static final FieldName selectBuffSourceHint = FieldName.forField("selectBuffSourceHint", "select_buff_source_hint"); - static final FieldName rollBuffFreeTimes = FieldName.forField("rollBuffFreeTimes", "roll_buff_free_times"); + static final FieldName rollBuffTimes = FieldName.forField("rollBuffTimes", "roll_buff_times"); static final FieldName rollBuffMaxTimes = FieldName.forField("rollBuffMaxTimes", "roll_buff_max_times"); - static final FieldName sourceCurCount = FieldName.forField("sourceCurCount", "source_cur_count"); + static final FieldName rollBuffFreeCount = FieldName.forField("rollBuffFreeCount", "roll_buff_free_count"); - static final FieldName rollBuffTimes = FieldName.forField("rollBuffTimes", "roll_buff_times"); + static final FieldName sourceCurCount = FieldName.forField("sourceCurCount", "source_cur_count"); static final FieldName sourceType = FieldName.forField("sourceType", "source_type"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java index 30c8c2e..e0b0f26 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java @@ -19,7 +19,7 @@ public final class RogueCommonBuffSelectResultOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 1; */ private int buffId; @@ -34,7 +34,7 @@ public final class RogueCommonBuffSelectResultOuterClass { } /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 1; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -42,7 +42,7 @@ public final class RogueCommonBuffSelectResultOuterClass { } /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 1; * @return this */ public RogueCommonBuffSelectResult clearBuffId() { @@ -52,7 +52,7 @@ public final class RogueCommonBuffSelectResultOuterClass { } /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 1; * @return the buffId */ public int getBuffId() { @@ -60,7 +60,7 @@ public final class RogueCommonBuffSelectResultOuterClass { } /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 1; * @param value the buffId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueCommonBuffSelectResultOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(buffId); } } @@ -150,7 +150,7 @@ public final class RogueCommonBuffSelectResultOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 8: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java index c0d9548..eb9070c 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java @@ -19,16 +19,12 @@ public final class RogueCommonPendingActionOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     *  idk
-     *
- * - * optional uint32 GLFDHAJPJDF = 3; + * optional uint32 unique_id = 9; */ - private int gLFDHAJPJDF; + private int uniqueId; /** - * optional .RogueAction rogue_action = 7; + * optional .RogueAction rogue_action = 4; */ private final RogueActionOuterClass.RogueAction rogueAction = RogueActionOuterClass.RogueAction.newInstance(); @@ -43,60 +39,44 @@ public final class RogueCommonPendingActionOuterClass { } /** - * 
-     *  idk
-     *
- * - * optional uint32 GLFDHAJPJDF = 3; - * @return whether the gLFDHAJPJDF field is set + * optional uint32 unique_id = 9; + * @return whether the uniqueId field is set */ - public boolean hasGLFDHAJPJDF() { + public boolean hasUniqueId() { return (bitField0_ & 0x00000001) != 0; } /** - * 
-     *  idk
-     *
- * - * optional uint32 GLFDHAJPJDF = 3; + * optional uint32 unique_id = 9; * @return this */ - public RogueCommonPendingAction clearGLFDHAJPJDF() { + public RogueCommonPendingAction clearUniqueId() { bitField0_ &= ~0x00000001; - gLFDHAJPJDF = 0; + uniqueId = 0; return this; } /** - * 
-     *  idk
-     *
- * - * optional uint32 GLFDHAJPJDF = 3; - * @return the gLFDHAJPJDF + * optional uint32 unique_id = 9; + * @return the uniqueId */ - public int getGLFDHAJPJDF() { - return gLFDHAJPJDF; + public int getUniqueId() { + return uniqueId; } /** - * 
-     *  idk
-     *
- * - * optional uint32 GLFDHAJPJDF = 3; - * @param value the gLFDHAJPJDF to set + * optional uint32 unique_id = 9; + * @param value the uniqueId to set * @return this */ - public RogueCommonPendingAction setGLFDHAJPJDF(final int value) { + public RogueCommonPendingAction setUniqueId(final int value) { bitField0_ |= 0x00000001; - gLFDHAJPJDF = value; + uniqueId = value; return this; } /** - * optional .RogueAction rogue_action = 7; + * optional .RogueAction rogue_action = 4; * @return whether the rogueAction field is set */ public boolean hasRogueAction() { @@ -104,7 +84,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 7; + * optional .RogueAction rogue_action = 4; * @return this */ public RogueCommonPendingAction clearRogueAction() { @@ -114,7 +94,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 7; + * optional .RogueAction rogue_action = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -128,7 +108,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 7; + * optional .RogueAction rogue_action = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -142,7 +122,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 7; + * optional .RogueAction rogue_action = 4; * @param value the rogueAction to set * @return this */ @@ -157,7 +137,7 @@ public final class RogueCommonPendingActionOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - gLFDHAJPJDF = other.gLFDHAJPJDF; + uniqueId = other.uniqueId; rogueAction.copyFrom(other.rogueAction); } return this; @@ -169,8 +149,8 @@ public final class RogueCommonPendingActionOuterClass { return this; } cachedSize = -1; - if (other.hasGLFDHAJPJDF()) { - setGLFDHAJPJDF(other.gLFDHAJPJDF); + if (other.hasUniqueId()) { + setUniqueId(other.uniqueId); } if (other.hasRogueAction()) { getMutableRogueAction().mergeFrom(other.rogueAction); @@ -185,7 +165,7 @@ public final class RogueCommonPendingActionOuterClass { } cachedSize = -1; bitField0_ = 0; - gLFDHAJPJDF = 0; + uniqueId = 0; rogueAction.clear(); return this; } @@ -211,18 +191,18 @@ public final class RogueCommonPendingActionOuterClass { } RogueCommonPendingAction other = (RogueCommonPendingAction) o; return bitField0_ == other.bitField0_ - && (!hasGLFDHAJPJDF() || gLFDHAJPJDF == other.gLFDHAJPJDF) + && (!hasUniqueId() || uniqueId == other.uniqueId) && (!hasRogueAction() || rogueAction.equals(other.rogueAction)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(gLFDHAJPJDF); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(uniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 34); output.writeMessageNoTag(rogueAction); } } @@ -231,7 +211,7 @@ public final class RogueCommonPendingActionOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gLFDHAJPJDF); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAction); @@ -246,16 +226,16 @@ public final class RogueCommonPendingActionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // gLFDHAJPJDF - gLFDHAJPJDF = input.readUInt32(); + case 72: { + // uniqueId + uniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 34) { break; } } - case 58: { + case 34: { // rogueAction input.readMessage(rogueAction); bitField0_ |= 0x00000002; @@ -282,7 +262,7 @@ public final class RogueCommonPendingActionOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.gLFDHAJPJDF, gLFDHAJPJDF); + output.writeUInt32(FieldNames.uniqueId, uniqueId); } if ((bitField0_ & 0x00000002) != 0) { output.writeMessage(FieldNames.rogueAction, rogueAction); @@ -297,10 +277,11 @@ public final class RogueCommonPendingActionOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1202020394: { - if (input.isAtField(FieldNames.gLFDHAJPJDF)) { + case -294460212: + case -538310583: { + if (input.isAtField(FieldNames.uniqueId)) { if (!input.trySkipNullValue()) { - gLFDHAJPJDF = input.readUInt32(); + uniqueId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -373,7 +354,7 @@ public final class RogueCommonPendingActionOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName gLFDHAJPJDF = FieldName.forField("GLFDHAJPJDF"); + static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); static final FieldName rogueAction = FieldName.forField("rogueAction", "rogue_action"); } diff --git a/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java index 46cbcec..dd41e89 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java @@ -19,7 +19,7 @@ public final class RogueCurrentInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueStatus status = 9; + * optional .RogueStatus status = 4; */ private int status; @@ -29,43 +29,34 @@ public final class RogueCurrentInfoOuterClass { private final RogueBuffInfoOuterClass.RogueBuffInfo rogueBuffInfo = RogueBuffInfoOuterClass.RogueBuffInfo.newInstance(); /** - * optional .RogueVirtualItem rogue_virtual_item = 2; + * optional .RogueAeon rogue_aeon_info = 3; */ - private final RogueVirtualItemOuterClass.RogueVirtualItem rogueVirtualItem = RogueVirtualItemOuterClass.RogueVirtualItem.newInstance(); + private final RogueAeonOuterClass.RogueAeon rogueAeonInfo = RogueAeonOuterClass.RogueAeon.newInstance(); /** - * optional .RogueAeon rogue_aeon = 4; - */ - private final RogueAeonOuterClass.RogueAeon rogueAeon = RogueAeonOuterClass.RogueAeon.newInstance(); - - /** - * optional .RogueCommonPendingAction pending_action = 7; - */ - private final RogueCommonPendingActionOuterClass.RogueCommonPendingAction pendingAction = RogueCommonPendingActionOuterClass.RogueCommonPendingAction.newInstance(); - - /** - * optional .RogueAvatarInfo rogue_avatar_info = 8; + * optional .RogueAvatarInfo rogue_avatar_info = 6; */ private final RogueAvatarInfoOuterClass.RogueAvatarInfo rogueAvatarInfo = RogueAvatarInfoOuterClass.RogueAvatarInfo.newInstance(); + /** + * optional .RogueVirtualItem rogue_virtual_item = 9; + */ + private final RogueVirtualItemOuterClass.RogueVirtualItem rogueVirtualItem = RogueVirtualItemOuterClass.RogueVirtualItem.newInstance(); + /** * optional .RogueMapInfo room_map = 10; */ private final RogueMapInfoOuterClass.RogueMapInfo roomMap = RogueMapInfoOuterClass.RogueMapInfo.newInstance(); /** - * 
-     *  miracle
-     *
- * - * optional .RogueMiracleInfo rogue_miracle_info = 12; + * optional .RogueMiracleInfo rogue_miracle_info = 14; */ private final RogueMiracleInfoOuterClass.RogueMiracleInfo rogueMiracleInfo = RogueMiracleInfoOuterClass.RogueMiracleInfo.newInstance(); /** - * optional .LMDFPHAHJGL LBKELDKEMLF = 14; + * optional .RogueCommonPendingAction pending_action = 15; */ - private final LMDFPHAHJGLOuterClass.LMDFPHAHJGL lBKELDKEMLF = LMDFPHAHJGLOuterClass.LMDFPHAHJGL.newInstance(); + private final RogueCommonPendingActionOuterClass.RogueCommonPendingAction pendingAction = RogueCommonPendingActionOuterClass.RogueCommonPendingAction.newInstance(); private RogueCurrentInfo() { } @@ -78,7 +69,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueStatus status = 9; + * optional .RogueStatus status = 4; * @return whether the status field is set */ public boolean hasStatus() { @@ -86,7 +77,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueStatus status = 9; + * optional .RogueStatus status = 4; * @return this */ public RogueCurrentInfo clearStatus() { @@ -96,7 +87,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueStatus status = 9; + * optional .RogueStatus status = 4; * @return the status */ public RogueStatusOuterClass.RogueStatus getStatus() { @@ -129,7 +120,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueStatus status = 9; + * optional .RogueStatus status = 4; * @param value the status to set * @return this */ @@ -197,39 +188,39 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueVirtualItem rogue_virtual_item = 2; - * @return whether the rogueVirtualItem field is set + * optional .RogueAeon rogue_aeon_info = 3; + * @return whether the rogueAeonInfo field is set */ - public boolean hasRogueVirtualItem() { + public boolean hasRogueAeonInfo() { return (bitField0_ & 0x00000004) != 0; } /** - * optional .RogueVirtualItem rogue_virtual_item = 2; + * optional .RogueAeon rogue_aeon_info = 3; * @return this */ - public RogueCurrentInfo clearRogueVirtualItem() { + public RogueCurrentInfo clearRogueAeonInfo() { bitField0_ &= ~0x00000004; - rogueVirtualItem.clear(); + rogueAeonInfo.clear(); return this; } /** - * optional .RogueVirtualItem rogue_virtual_item = 2; + * optional .RogueAeon rogue_aeon_info = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableRogueVirtualItem()} if you want to modify it. + * Use {@link #getMutableRogueAeonInfo()} if you want to modify it. * * @return internal storage object for reading */ - public RogueVirtualItemOuterClass.RogueVirtualItem getRogueVirtualItem() { - return rogueVirtualItem; + public RogueAeonOuterClass.RogueAeon getRogueAeonInfo() { + return rogueAeonInfo; } /** - * optional .RogueVirtualItem rogue_virtual_item = 2; + * optional .RogueAeon rogue_aeon_info = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -237,158 +228,42 @@ public final class RogueCurrentInfoOuterClass { * * @return internal storage object for modifications */ - public RogueVirtualItemOuterClass.RogueVirtualItem getMutableRogueVirtualItem() { + public RogueAeonOuterClass.RogueAeon getMutableRogueAeonInfo() { bitField0_ |= 0x00000004; - return rogueVirtualItem; + return rogueAeonInfo; } /** - * optional .RogueVirtualItem rogue_virtual_item = 2; - * @param value the rogueVirtualItem to set + * optional .RogueAeon rogue_aeon_info = 3; + * @param value the rogueAeonInfo to set * @return this */ - public RogueCurrentInfo setRogueVirtualItem( - final RogueVirtualItemOuterClass.RogueVirtualItem value) { + public RogueCurrentInfo setRogueAeonInfo(final RogueAeonOuterClass.RogueAeon value) { bitField0_ |= 0x00000004; - rogueVirtualItem.copyFrom(value); + rogueAeonInfo.copyFrom(value); return this; } /** - * optional .RogueAeon rogue_aeon = 4; - * @return whether the rogueAeon field is set + * optional .RogueAvatarInfo rogue_avatar_info = 6; + * @return whether the rogueAvatarInfo field is set */ - public boolean hasRogueAeon() { + public boolean hasRogueAvatarInfo() { return (bitField0_ & 0x00000008) != 0; } /** - * optional .RogueAeon rogue_aeon = 4; - * @return this - */ - public RogueCurrentInfo clearRogueAeon() { - bitField0_ &= ~0x00000008; - rogueAeon.clear(); - return this; - } - - /** - * optional .RogueAeon rogue_aeon = 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 #getMutableRogueAeon()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueAeonOuterClass.RogueAeon getRogueAeon() { - return rogueAeon; - } - - /** - * optional .RogueAeon rogue_aeon = 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 RogueAeonOuterClass.RogueAeon getMutableRogueAeon() { - bitField0_ |= 0x00000008; - return rogueAeon; - } - - /** - * optional .RogueAeon rogue_aeon = 4; - * @param value the rogueAeon to set - * @return this - */ - public RogueCurrentInfo setRogueAeon(final RogueAeonOuterClass.RogueAeon value) { - bitField0_ |= 0x00000008; - rogueAeon.copyFrom(value); - return this; - } - - /** - * optional .RogueCommonPendingAction pending_action = 7; - * @return whether the pendingAction field is set - */ - public boolean hasPendingAction() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .RogueCommonPendingAction pending_action = 7; - * @return this - */ - public RogueCurrentInfo clearPendingAction() { - bitField0_ &= ~0x00000010; - pendingAction.clear(); - return this; - } - - /** - * optional .RogueCommonPendingAction pending_action = 7; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * 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 = 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 RogueCommonPendingActionOuterClass.RogueCommonPendingAction getMutablePendingAction() { - bitField0_ |= 0x00000010; - return pendingAction; - } - - /** - * optional .RogueCommonPendingAction pending_action = 7; - * @param value the pendingAction to set - * @return this - */ - public RogueCurrentInfo setPendingAction( - final RogueCommonPendingActionOuterClass.RogueCommonPendingAction value) { - bitField0_ |= 0x00000010; - pendingAction.copyFrom(value); - return this; - } - - /** - * optional .RogueAvatarInfo rogue_avatar_info = 8; - * @return whether the rogueAvatarInfo field is set - */ - public boolean hasRogueAvatarInfo() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional .RogueAvatarInfo rogue_avatar_info = 8; + * optional .RogueAvatarInfo rogue_avatar_info = 6; * @return this */ public RogueCurrentInfo clearRogueAvatarInfo() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000008; rogueAvatarInfo.clear(); return this; } /** - * optional .RogueAvatarInfo rogue_avatar_info = 8; + * optional .RogueAvatarInfo rogue_avatar_info = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -402,7 +277,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueAvatarInfo rogue_avatar_info = 8; + * optional .RogueAvatarInfo rogue_avatar_info = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -411,28 +286,86 @@ public final class RogueCurrentInfoOuterClass { * @return internal storage object for modifications */ public RogueAvatarInfoOuterClass.RogueAvatarInfo getMutableRogueAvatarInfo() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; return rogueAvatarInfo; } /** - * optional .RogueAvatarInfo rogue_avatar_info = 8; + * optional .RogueAvatarInfo rogue_avatar_info = 6; * @param value the rogueAvatarInfo to set * @return this */ public RogueCurrentInfo setRogueAvatarInfo( final RogueAvatarInfoOuterClass.RogueAvatarInfo value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; rogueAvatarInfo.copyFrom(value); return this; } + /** + * optional .RogueVirtualItem rogue_virtual_item = 9; + * @return whether the rogueVirtualItem field is set + */ + public boolean hasRogueVirtualItem() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .RogueVirtualItem rogue_virtual_item = 9; + * @return this + */ + public RogueCurrentInfo clearRogueVirtualItem() { + bitField0_ &= ~0x00000010; + rogueVirtualItem.clear(); + return this; + } + + /** + * optional .RogueVirtualItem rogue_virtual_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 #getMutableRogueVirtualItem()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueVirtualItemOuterClass.RogueVirtualItem getRogueVirtualItem() { + return rogueVirtualItem; + } + + /** + * optional .RogueVirtualItem rogue_virtual_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 RogueVirtualItemOuterClass.RogueVirtualItem getMutableRogueVirtualItem() { + bitField0_ |= 0x00000010; + return rogueVirtualItem; + } + + /** + * optional .RogueVirtualItem rogue_virtual_item = 9; + * @param value the rogueVirtualItem to set + * @return this + */ + public RogueCurrentInfo setRogueVirtualItem( + final RogueVirtualItemOuterClass.RogueVirtualItem value) { + bitField0_ |= 0x00000010; + rogueVirtualItem.copyFrom(value); + return this; + } + /** * optional .RogueMapInfo room_map = 10; * @return whether the roomMap field is set */ public boolean hasRoomMap() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000020) != 0; } /** @@ -440,7 +373,7 @@ public final class RogueCurrentInfoOuterClass { * @return this */ public RogueCurrentInfo clearRoomMap() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000020; roomMap.clear(); return this; } @@ -469,7 +402,7 @@ public final class RogueCurrentInfoOuterClass { * @return internal storage object for modifications */ public RogueMapInfoOuterClass.RogueMapInfo getMutableRoomMap() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; return roomMap; } @@ -479,43 +412,31 @@ public final class RogueCurrentInfoOuterClass { * @return this */ public RogueCurrentInfo setRoomMap(final RogueMapInfoOuterClass.RogueMapInfo value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; roomMap.copyFrom(value); return this; } /** - * 
-     *  miracle
-     *
- * - * optional .RogueMiracleInfo rogue_miracle_info = 12; + * optional .RogueMiracleInfo rogue_miracle_info = 14; * @return whether the rogueMiracleInfo field is set */ public boolean hasRogueMiracleInfo() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000040) != 0; } /** - * 
-     *  miracle
-     *
- * - * optional .RogueMiracleInfo rogue_miracle_info = 12; + * optional .RogueMiracleInfo rogue_miracle_info = 14; * @return this */ public RogueCurrentInfo clearRogueMiracleInfo() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; rogueMiracleInfo.clear(); return this; } /** - * 
-     *  miracle
-     *
- * - * optional .RogueMiracleInfo rogue_miracle_info = 12; + * optional .RogueMiracleInfo rogue_miracle_info = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -529,11 +450,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * 
-     *  miracle
-     *
- * - * optional .RogueMiracleInfo rogue_miracle_info = 12; + * optional .RogueMiracleInfo rogue_miracle_info = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -542,60 +459,56 @@ public final class RogueCurrentInfoOuterClass { * @return internal storage object for modifications */ public RogueMiracleInfoOuterClass.RogueMiracleInfo getMutableRogueMiracleInfo() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; return rogueMiracleInfo; } /** - * 
-     *  miracle
-     *
- * - * optional .RogueMiracleInfo rogue_miracle_info = 12; + * optional .RogueMiracleInfo rogue_miracle_info = 14; * @param value the rogueMiracleInfo to set * @return this */ public RogueCurrentInfo setRogueMiracleInfo( final RogueMiracleInfoOuterClass.RogueMiracleInfo value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; rogueMiracleInfo.copyFrom(value); return this; } /** - * optional .LMDFPHAHJGL LBKELDKEMLF = 14; - * @return whether the lBKELDKEMLF field is set + * optional .RogueCommonPendingAction pending_action = 15; + * @return whether the pendingAction field is set */ - public boolean hasLBKELDKEMLF() { - return (bitField0_ & 0x00000100) != 0; + public boolean hasPendingAction() { + return (bitField0_ & 0x00000080) != 0; } /** - * optional .LMDFPHAHJGL LBKELDKEMLF = 14; + * optional .RogueCommonPendingAction pending_action = 15; * @return this */ - public RogueCurrentInfo clearLBKELDKEMLF() { - bitField0_ &= ~0x00000100; - lBKELDKEMLF.clear(); + public RogueCurrentInfo clearPendingAction() { + bitField0_ &= ~0x00000080; + pendingAction.clear(); return this; } /** - * optional .LMDFPHAHJGL LBKELDKEMLF = 14; + * optional .RogueCommonPendingAction 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. * - * Use {@link #getMutableLBKELDKEMLF()} if you want to modify it. + * Use {@link #getMutablePendingAction()} if you want to modify it. * * @return internal storage object for reading */ - public LMDFPHAHJGLOuterClass.LMDFPHAHJGL getLBKELDKEMLF() { - return lBKELDKEMLF; + public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getPendingAction() { + return pendingAction; } /** - * optional .LMDFPHAHJGL LBKELDKEMLF = 14; + * optional .RogueCommonPendingAction 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 @@ -603,19 +516,20 @@ public final class RogueCurrentInfoOuterClass { * * @return internal storage object for modifications */ - public LMDFPHAHJGLOuterClass.LMDFPHAHJGL getMutableLBKELDKEMLF() { - bitField0_ |= 0x00000100; - return lBKELDKEMLF; + public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getMutablePendingAction() { + bitField0_ |= 0x00000080; + return pendingAction; } /** - * optional .LMDFPHAHJGL LBKELDKEMLF = 14; - * @param value the lBKELDKEMLF to set + * optional .RogueCommonPendingAction pending_action = 15; + * @param value the pendingAction to set * @return this */ - public RogueCurrentInfo setLBKELDKEMLF(final LMDFPHAHJGLOuterClass.LMDFPHAHJGL value) { - bitField0_ |= 0x00000100; - lBKELDKEMLF.copyFrom(value); + public RogueCurrentInfo setPendingAction( + final RogueCommonPendingActionOuterClass.RogueCommonPendingAction value) { + bitField0_ |= 0x00000080; + pendingAction.copyFrom(value); return this; } @@ -626,13 +540,12 @@ public final class RogueCurrentInfoOuterClass { bitField0_ = other.bitField0_; status = other.status; rogueBuffInfo.copyFrom(other.rogueBuffInfo); - rogueVirtualItem.copyFrom(other.rogueVirtualItem); - rogueAeon.copyFrom(other.rogueAeon); - pendingAction.copyFrom(other.pendingAction); + rogueAeonInfo.copyFrom(other.rogueAeonInfo); rogueAvatarInfo.copyFrom(other.rogueAvatarInfo); + rogueVirtualItem.copyFrom(other.rogueVirtualItem); roomMap.copyFrom(other.roomMap); rogueMiracleInfo.copyFrom(other.rogueMiracleInfo); - lBKELDKEMLF.copyFrom(other.lBKELDKEMLF); + pendingAction.copyFrom(other.pendingAction); } return this; } @@ -649,26 +562,23 @@ public final class RogueCurrentInfoOuterClass { if (other.hasRogueBuffInfo()) { getMutableRogueBuffInfo().mergeFrom(other.rogueBuffInfo); } - if (other.hasRogueVirtualItem()) { - getMutableRogueVirtualItem().mergeFrom(other.rogueVirtualItem); - } - if (other.hasRogueAeon()) { - getMutableRogueAeon().mergeFrom(other.rogueAeon); - } - if (other.hasPendingAction()) { - getMutablePendingAction().mergeFrom(other.pendingAction); + if (other.hasRogueAeonInfo()) { + getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); } if (other.hasRogueAvatarInfo()) { getMutableRogueAvatarInfo().mergeFrom(other.rogueAvatarInfo); } + if (other.hasRogueVirtualItem()) { + getMutableRogueVirtualItem().mergeFrom(other.rogueVirtualItem); + } if (other.hasRoomMap()) { getMutableRoomMap().mergeFrom(other.roomMap); } if (other.hasRogueMiracleInfo()) { getMutableRogueMiracleInfo().mergeFrom(other.rogueMiracleInfo); } - if (other.hasLBKELDKEMLF()) { - getMutableLBKELDKEMLF().mergeFrom(other.lBKELDKEMLF); + if (other.hasPendingAction()) { + getMutablePendingAction().mergeFrom(other.pendingAction); } return this; } @@ -682,13 +592,12 @@ public final class RogueCurrentInfoOuterClass { bitField0_ = 0; status = 0; rogueBuffInfo.clear(); - rogueVirtualItem.clear(); - rogueAeon.clear(); - pendingAction.clear(); + rogueAeonInfo.clear(); rogueAvatarInfo.clear(); + rogueVirtualItem.clear(); roomMap.clear(); rogueMiracleInfo.clear(); - lBKELDKEMLF.clear(); + pendingAction.clear(); return this; } @@ -700,13 +609,12 @@ public final class RogueCurrentInfoOuterClass { cachedSize = -1; bitField0_ = 0; rogueBuffInfo.clearQuick(); - rogueVirtualItem.clearQuick(); - rogueAeon.clearQuick(); - pendingAction.clearQuick(); + rogueAeonInfo.clearQuick(); rogueAvatarInfo.clearQuick(); + rogueVirtualItem.clearQuick(); roomMap.clearQuick(); rogueMiracleInfo.clearQuick(); - lBKELDKEMLF.clearQuick(); + pendingAction.clearQuick(); return this; } @@ -722,19 +630,18 @@ public final class RogueCurrentInfoOuterClass { return bitField0_ == other.bitField0_ && (!hasStatus() || status == other.status) && (!hasRogueBuffInfo() || rogueBuffInfo.equals(other.rogueBuffInfo)) - && (!hasRogueVirtualItem() || rogueVirtualItem.equals(other.rogueVirtualItem)) - && (!hasRogueAeon() || rogueAeon.equals(other.rogueAeon)) - && (!hasPendingAction() || pendingAction.equals(other.pendingAction)) + && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)) && (!hasRogueAvatarInfo() || rogueAvatarInfo.equals(other.rogueAvatarInfo)) + && (!hasRogueVirtualItem() || rogueVirtualItem.equals(other.rogueVirtualItem)) && (!hasRoomMap() || roomMap.equals(other.roomMap)) && (!hasRogueMiracleInfo() || rogueMiracleInfo.equals(other.rogueMiracleInfo)) - && (!hasLBKELDKEMLF() || lBKELDKEMLF.equals(other.lBKELDKEMLF)); + && (!hasPendingAction() || pendingAction.equals(other.pendingAction)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 32); output.writeEnumNoTag(status); } if ((bitField0_ & 0x00000002) != 0) { @@ -742,32 +649,28 @@ public final class RogueCurrentInfoOuterClass { output.writeMessageNoTag(rogueBuffInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(rogueVirtualItem); + output.writeRawByte((byte) 26); + output.writeMessageNoTag(rogueAeonInfo); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(rogueAeon); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(pendingAction); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 50); output.writeMessageNoTag(rogueAvatarInfo); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(rogueVirtualItem); + } + if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 82); output.writeMessageNoTag(roomMap); } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 98); + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawByte((byte) 114); output.writeMessageNoTag(rogueMiracleInfo); } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(lBKELDKEMLF); + if ((bitField0_ & 0x00000080) != 0) { + output.writeRawByte((byte) 122); + output.writeMessageNoTag(pendingAction); } } @@ -781,25 +684,22 @@ public final class RogueCurrentInfoOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueBuffInfo); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItem); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeon); - } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(pendingAction); - } - if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAvatarInfo); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItem); + } + if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(roomMap); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000040) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMiracleInfo); } - if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(lBKELDKEMLF); + if ((bitField0_ & 0x00000080) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(pendingAction); } return size; } @@ -811,7 +711,7 @@ public final class RogueCurrentInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 32: { // status final int value = input.readInt32(); if (RogueStatusOuterClass.RogueStatus.forNumber(value) != null) { @@ -828,41 +728,32 @@ public final class RogueCurrentInfoOuterClass { input.readMessage(rogueBuffInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 26) { break; } } - case 18: { - // rogueVirtualItem - input.readMessage(rogueVirtualItem); + case 26: { + // rogueAeonInfo + input.readMessage(rogueAeonInfo); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 34) { + if (tag != 50) { break; } } - case 34: { - // rogueAeon - input.readMessage(rogueAeon); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { - // pendingAction - input.readMessage(pendingAction); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { + case 50: { // rogueAvatarInfo input.readMessage(rogueAvatarInfo); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // rogueVirtualItem + input.readMessage(rogueVirtualItem); + bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 82) { break; @@ -871,25 +762,25 @@ public final class RogueCurrentInfoOuterClass { case 82: { // roomMap input.readMessage(roomMap); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { - // rogueMiracleInfo - input.readMessage(rogueMiracleInfo); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 114) { break; } } case 114: { - // lBKELDKEMLF - input.readMessage(lBKELDKEMLF); - bitField0_ |= 0x00000100; + // rogueMiracleInfo + input.readMessage(rogueMiracleInfo); + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // pendingAction + input.readMessage(pendingAction); + bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 0) { break; @@ -919,25 +810,22 @@ public final class RogueCurrentInfoOuterClass { output.writeMessage(FieldNames.rogueBuffInfo, rogueBuffInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.rogueVirtualItem, rogueVirtualItem); + output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.rogueAeon, rogueAeon); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeMessage(FieldNames.pendingAction, pendingAction); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeMessage(FieldNames.rogueAvatarInfo, rogueAvatarInfo); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000010) != 0) { + output.writeMessage(FieldNames.rogueVirtualItem, rogueVirtualItem); + } + if ((bitField0_ & 0x00000020) != 0) { output.writeMessage(FieldNames.roomMap, roomMap); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000040) != 0) { output.writeMessage(FieldNames.rogueMiracleInfo, rogueMiracleInfo); } - if ((bitField0_ & 0x00000100) != 0) { - output.writeMessage(FieldNames.lBKELDKEMLF, lBKELDKEMLF); + if ((bitField0_ & 0x00000080) != 0) { + output.writeMessage(FieldNames.pendingAction, pendingAction); } output.endObject(); } @@ -977,11 +865,11 @@ public final class RogueCurrentInfoOuterClass { } break; } - case 2090167940: - case -856063476: { - if (input.isAtField(FieldNames.rogueVirtualItem)) { + case -1685018549: + case -1375922619: { + if (input.isAtField(FieldNames.rogueAeonInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueVirtualItem); + input.readMessage(rogueAeonInfo); bitField0_ |= 0x00000004; } } else { @@ -989,36 +877,24 @@ public final class RogueCurrentInfoOuterClass { } break; } - case 655562237: - case -1124830136: { - if (input.isAtField(FieldNames.rogueAeon)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueAeon); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case -110680403: - case 1646545374: { - if (input.isAtField(FieldNames.pendingAction)) { - if (!input.trySkipNullValue()) { - input.readMessage(pendingAction); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } case -1966631135: case 667955439: { if (input.isAtField(FieldNames.rogueAvatarInfo)) { if (!input.trySkipNullValue()) { input.readMessage(rogueAvatarInfo); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 2090167940: + case -856063476: { + if (input.isAtField(FieldNames.rogueVirtualItem)) { + if (!input.trySkipNullValue()) { + input.readMessage(rogueVirtualItem); + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -1030,7 +906,7 @@ public final class RogueCurrentInfoOuterClass { if (input.isAtField(FieldNames.roomMap)) { if (!input.trySkipNullValue()) { input.readMessage(roomMap); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -1042,18 +918,19 @@ public final class RogueCurrentInfoOuterClass { if (input.isAtField(FieldNames.rogueMiracleInfo)) { if (!input.trySkipNullValue()) { input.readMessage(rogueMiracleInfo); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); } break; } - case -885627611: { - if (input.isAtField(FieldNames.lBKELDKEMLF)) { + case -110680403: + case 1646545374: { + if (input.isAtField(FieldNames.pendingAction)) { if (!input.trySkipNullValue()) { - input.readMessage(lBKELDKEMLF); - bitField0_ |= 0x00000100; + input.readMessage(pendingAction); + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1117,19 +994,17 @@ public final class RogueCurrentInfoOuterClass { static final FieldName rogueBuffInfo = FieldName.forField("rogueBuffInfo", "rogue_buff_info"); - static final FieldName rogueVirtualItem = FieldName.forField("rogueVirtualItem", "rogue_virtual_item"); - - static final FieldName rogueAeon = FieldName.forField("rogueAeon", "rogue_aeon"); - - static final FieldName pendingAction = FieldName.forField("pendingAction", "pending_action"); + static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); static final FieldName rogueAvatarInfo = FieldName.forField("rogueAvatarInfo", "rogue_avatar_info"); + static final FieldName rogueVirtualItem = FieldName.forField("rogueVirtualItem", "rogue_virtual_item"); + static final FieldName roomMap = FieldName.forField("roomMap", "room_map"); static final FieldName rogueMiracleInfo = FieldName.forField("rogueMiracleInfo", "rogue_miracle_info"); - static final FieldName lBKELDKEMLF = FieldName.forField("LBKELDKEMLF"); + static final FieldName pendingAction = FieldName.forField("pendingAction", "pending_action"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java index 7685a4d..4673889 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java @@ -21,32 +21,32 @@ public final class RogueDialogueEventOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 npc_id = 1; + * optional uint32 KKCPLMGIADL = 1; */ - private int npcId; + private int kKCPLMGIADL; /** - * optional uint32 GBMDBBBMBEJ = 6; - */ - private int gBMDBBBMBEJ; - - /** - * optional uint32 INJPFALMDHJ = 7; - */ - private int iNJPFALMDHJ; - - /** - * optional uint32 game_mode_type = 13; + * optional uint32 game_mode_type = 2; */ private int gameModeType; /** - * repeated uint32 select_event_id = 8; + * optional uint32 npc_id = 10; + */ + private int npcId; + + /** + * optional uint32 MBNBIEJIBFJ = 13; + */ + private int mBNBIEJIBFJ; + + /** + * repeated uint32 select_event_id = 15; */ private final RepeatedInt selectEventId = RepeatedInt.newEmptyInstance(); /** - * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 15; + * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 12; */ private final RepeatedMessage rogueDialogueEventParam = RepeatedMessage.newEmptyInstance(RogueDialogueEventParamOuterClass.RogueDialogueEventParam.getFactory()); @@ -61,136 +61,62 @@ public final class RogueDialogueEventOuterClass { } /** - * optional uint32 npc_id = 1; - * @return whether the npcId field is set + * optional uint32 KKCPLMGIADL = 1; + * @return whether the kKCPLMGIADL field is set */ - public boolean hasNpcId() { + public boolean hasKKCPLMGIADL() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 npc_id = 1; + * optional uint32 KKCPLMGIADL = 1; * @return this */ - public RogueDialogueEvent clearNpcId() { + public RogueDialogueEvent clearKKCPLMGIADL() { bitField0_ &= ~0x00000001; - npcId = 0; + kKCPLMGIADL = 0; return this; } /** - * optional uint32 npc_id = 1; - * @return the npcId + * optional uint32 KKCPLMGIADL = 1; + * @return the kKCPLMGIADL */ - public int getNpcId() { - return npcId; + public int getKKCPLMGIADL() { + return kKCPLMGIADL; } /** - * optional uint32 npc_id = 1; - * @param value the npcId to set + * optional uint32 KKCPLMGIADL = 1; + * @param value the kKCPLMGIADL to set * @return this */ - public RogueDialogueEvent setNpcId(final int value) { + public RogueDialogueEvent setKKCPLMGIADL(final int value) { bitField0_ |= 0x00000001; - npcId = value; + kKCPLMGIADL = value; return this; } /** - * optional uint32 GBMDBBBMBEJ = 6; - * @return whether the gBMDBBBMBEJ field is set + * optional uint32 game_mode_type = 2; + * @return whether the gameModeType field is set */ - public boolean hasGBMDBBBMBEJ() { + public boolean hasGameModeType() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 GBMDBBBMBEJ = 6; - * @return this - */ - public RogueDialogueEvent clearGBMDBBBMBEJ() { - bitField0_ &= ~0x00000002; - gBMDBBBMBEJ = 0; - return this; - } - - /** - * optional uint32 GBMDBBBMBEJ = 6; - * @return the gBMDBBBMBEJ - */ - public int getGBMDBBBMBEJ() { - return gBMDBBBMBEJ; - } - - /** - * optional uint32 GBMDBBBMBEJ = 6; - * @param value the gBMDBBBMBEJ to set - * @return this - */ - public RogueDialogueEvent setGBMDBBBMBEJ(final int value) { - bitField0_ |= 0x00000002; - gBMDBBBMBEJ = value; - return this; - } - - /** - * optional uint32 INJPFALMDHJ = 7; - * @return whether the iNJPFALMDHJ field is set - */ - public boolean hasINJPFALMDHJ() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 INJPFALMDHJ = 7; - * @return this - */ - public RogueDialogueEvent clearINJPFALMDHJ() { - bitField0_ &= ~0x00000004; - iNJPFALMDHJ = 0; - return this; - } - - /** - * optional uint32 INJPFALMDHJ = 7; - * @return the iNJPFALMDHJ - */ - public int getINJPFALMDHJ() { - return iNJPFALMDHJ; - } - - /** - * optional uint32 INJPFALMDHJ = 7; - * @param value the iNJPFALMDHJ to set - * @return this - */ - public RogueDialogueEvent setINJPFALMDHJ(final int value) { - bitField0_ |= 0x00000004; - iNJPFALMDHJ = value; - return this; - } - - /** - * optional uint32 game_mode_type = 13; - * @return whether the gameModeType field is set - */ - public boolean hasGameModeType() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 game_mode_type = 13; + * optional uint32 game_mode_type = 2; * @return this */ public RogueDialogueEvent clearGameModeType() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; gameModeType = 0; return this; } /** - * optional uint32 game_mode_type = 13; + * optional uint32 game_mode_type = 2; * @return the gameModeType */ public int getGameModeType() { @@ -198,18 +124,92 @@ public final class RogueDialogueEventOuterClass { } /** - * optional uint32 game_mode_type = 13; + * optional uint32 game_mode_type = 2; * @param value the gameModeType to set * @return this */ public RogueDialogueEvent setGameModeType(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; gameModeType = value; return this; } /** - * repeated uint32 select_event_id = 8; + * optional uint32 npc_id = 10; + * @return whether the npcId field is set + */ + public boolean hasNpcId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 npc_id = 10; + * @return this + */ + public RogueDialogueEvent clearNpcId() { + bitField0_ &= ~0x00000004; + npcId = 0; + return this; + } + + /** + * optional uint32 npc_id = 10; + * @return the npcId + */ + public int getNpcId() { + return npcId; + } + + /** + * optional uint32 npc_id = 10; + * @param value the npcId to set + * @return this + */ + public RogueDialogueEvent setNpcId(final int value) { + bitField0_ |= 0x00000004; + npcId = value; + return this; + } + + /** + * optional uint32 MBNBIEJIBFJ = 13; + * @return whether the mBNBIEJIBFJ field is set + */ + public boolean hasMBNBIEJIBFJ() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 MBNBIEJIBFJ = 13; + * @return this + */ + public RogueDialogueEvent clearMBNBIEJIBFJ() { + bitField0_ &= ~0x00000008; + mBNBIEJIBFJ = 0; + return this; + } + + /** + * optional uint32 MBNBIEJIBFJ = 13; + * @return the mBNBIEJIBFJ + */ + public int getMBNBIEJIBFJ() { + return mBNBIEJIBFJ; + } + + /** + * optional uint32 MBNBIEJIBFJ = 13; + * @param value the mBNBIEJIBFJ to set + * @return this + */ + public RogueDialogueEvent setMBNBIEJIBFJ(final int value) { + bitField0_ |= 0x00000008; + mBNBIEJIBFJ = value; + return this; + } + + /** + * repeated uint32 select_event_id = 15; * @return whether the selectEventId field is set */ public boolean hasSelectEventId() { @@ -217,7 +217,7 @@ public final class RogueDialogueEventOuterClass { } /** - * repeated uint32 select_event_id = 8; + * repeated uint32 select_event_id = 15; * @return this */ public RogueDialogueEvent clearSelectEventId() { @@ -227,7 +227,7 @@ public final class RogueDialogueEventOuterClass { } /** - * repeated uint32 select_event_id = 8; + * repeated uint32 select_event_id = 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. @@ -241,7 +241,7 @@ public final class RogueDialogueEventOuterClass { } /** - * repeated uint32 select_event_id = 8; + * repeated uint32 select_event_id = 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 @@ -255,7 +255,7 @@ public final class RogueDialogueEventOuterClass { } /** - * repeated uint32 select_event_id = 8; + * repeated uint32 select_event_id = 15; * @param value the selectEventId to add * @return this */ @@ -266,7 +266,7 @@ public final class RogueDialogueEventOuterClass { } /** - * repeated uint32 select_event_id = 8; + * repeated uint32 select_event_id = 15; * @param values the selectEventId to add * @return this */ @@ -277,7 +277,7 @@ public final class RogueDialogueEventOuterClass { } /** - * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 15; + * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 12; * @return whether the rogueDialogueEventParam field is set */ public boolean hasRogueDialogueEventParam() { @@ -285,7 +285,7 @@ public final class RogueDialogueEventOuterClass { } /** - * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 15; + * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 12; * @return this */ public RogueDialogueEvent clearRogueDialogueEventParam() { @@ -295,7 +295,7 @@ public final class RogueDialogueEventOuterClass { } /** - * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 15; + * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 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. @@ -310,7 +310,7 @@ public final class RogueDialogueEventOuterClass { } /** - * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 15; + * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 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 @@ -325,7 +325,7 @@ public final class RogueDialogueEventOuterClass { } /** - * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 15; + * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 12; * @param value the rogueDialogueEventParam to add * @return this */ @@ -337,7 +337,7 @@ public final class RogueDialogueEventOuterClass { } /** - * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 15; + * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 12; * @param values the rogueDialogueEventParam to add * @return this */ @@ -353,10 +353,10 @@ public final class RogueDialogueEventOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - npcId = other.npcId; - gBMDBBBMBEJ = other.gBMDBBBMBEJ; - iNJPFALMDHJ = other.iNJPFALMDHJ; + kKCPLMGIADL = other.kKCPLMGIADL; gameModeType = other.gameModeType; + npcId = other.npcId; + mBNBIEJIBFJ = other.mBNBIEJIBFJ; selectEventId.copyFrom(other.selectEventId); rogueDialogueEventParam.copyFrom(other.rogueDialogueEventParam); } @@ -369,18 +369,18 @@ public final class RogueDialogueEventOuterClass { return this; } cachedSize = -1; - if (other.hasNpcId()) { - setNpcId(other.npcId); - } - if (other.hasGBMDBBBMBEJ()) { - setGBMDBBBMBEJ(other.gBMDBBBMBEJ); - } - if (other.hasINJPFALMDHJ()) { - setINJPFALMDHJ(other.iNJPFALMDHJ); + if (other.hasKKCPLMGIADL()) { + setKKCPLMGIADL(other.kKCPLMGIADL); } if (other.hasGameModeType()) { setGameModeType(other.gameModeType); } + if (other.hasNpcId()) { + setNpcId(other.npcId); + } + if (other.hasMBNBIEJIBFJ()) { + setMBNBIEJIBFJ(other.mBNBIEJIBFJ); + } if (other.hasSelectEventId()) { getMutableSelectEventId().addAll(other.selectEventId); } @@ -397,10 +397,10 @@ public final class RogueDialogueEventOuterClass { } cachedSize = -1; bitField0_ = 0; - npcId = 0; - gBMDBBBMBEJ = 0; - iNJPFALMDHJ = 0; + kKCPLMGIADL = 0; gameModeType = 0; + npcId = 0; + mBNBIEJIBFJ = 0; selectEventId.clear(); rogueDialogueEventParam.clear(); return this; @@ -428,10 +428,10 @@ public final class RogueDialogueEventOuterClass { } RogueDialogueEvent other = (RogueDialogueEvent) o; return bitField0_ == other.bitField0_ - && (!hasNpcId() || npcId == other.npcId) - && (!hasGBMDBBBMBEJ() || gBMDBBBMBEJ == other.gBMDBBBMBEJ) - && (!hasINJPFALMDHJ() || iNJPFALMDHJ == other.iNJPFALMDHJ) + && (!hasKKCPLMGIADL() || kKCPLMGIADL == other.kKCPLMGIADL) && (!hasGameModeType() || gameModeType == other.gameModeType) + && (!hasNpcId() || npcId == other.npcId) + && (!hasMBNBIEJIBFJ() || mBNBIEJIBFJ == other.mBNBIEJIBFJ) && (!hasSelectEventId() || selectEventId.equals(other.selectEventId)) && (!hasRogueDialogueEventParam() || rogueDialogueEventParam.equals(other.rogueDialogueEventParam)); } @@ -440,29 +440,29 @@ public final class RogueDialogueEventOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(npcId); + output.writeUInt32NoTag(kKCPLMGIADL); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(gBMDBBBMBEJ); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(gameModeType); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(iNJPFALMDHJ); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(npcId); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(gameModeType); + output.writeUInt32NoTag(mBNBIEJIBFJ); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < selectEventId.length(); i++) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(selectEventId.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < rogueDialogueEventParam.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 98); output.writeMessageNoTag(rogueDialogueEventParam.get(i)); } } @@ -472,16 +472,16 @@ public final class RogueDialogueEventOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(kKCPLMGIADL); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gBMDBBBMBEJ); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gameModeType); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(iNJPFALMDHJ); + size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gameModeType); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mBNBIEJIBFJ); } if ((bitField0_ & 0x00000010) != 0) { size += (1 * selectEventId.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(selectEventId); @@ -500,26 +500,26 @@ public final class RogueDialogueEventOuterClass { while (true) { switch (tag) { case 8: { - // npcId - npcId = input.readUInt32(); + // kKCPLMGIADL + kKCPLMGIADL = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 16) { break; } } - case 48: { - // gBMDBBBMBEJ - gBMDBBBMBEJ = input.readUInt32(); + case 16: { + // gameModeType + gameModeType = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 56) { + if (tag != 80) { break; } } - case 56: { - // iNJPFALMDHJ - iNJPFALMDHJ = input.readUInt32(); + case 80: { + // npcId + npcId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 104) { @@ -527,24 +527,24 @@ public final class RogueDialogueEventOuterClass { } } case 104: { - // gameModeType - gameModeType = input.readUInt32(); + // mBNBIEJIBFJ + mBNBIEJIBFJ = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { - // selectEventId [packed=true] - input.readPackedUInt32(selectEventId, tag); - bitField0_ |= 0x00000010; - tag = input.readTag(); if (tag != 122) { break; } } case 122: { + // selectEventId [packed=true] + input.readPackedUInt32(selectEventId, tag); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { // rogueDialogueEventParam tag = input.readRepeatedMessage(rogueDialogueEventParam, tag); bitField0_ |= 0x00000020; @@ -562,7 +562,7 @@ public final class RogueDialogueEventOuterClass { tag = input.readTag(); break; } - case 64: { + case 120: { // selectEventId [packed=false] tag = input.readRepeatedUInt32(selectEventId, tag); bitField0_ |= 0x00000010; @@ -576,16 +576,16 @@ public final class RogueDialogueEventOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.npcId, npcId); + output.writeUInt32(FieldNames.kKCPLMGIADL, kKCPLMGIADL); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.gBMDBBBMBEJ, gBMDBBBMBEJ); + output.writeUInt32(FieldNames.gameModeType, gameModeType); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.iNJPFALMDHJ, iNJPFALMDHJ); + output.writeUInt32(FieldNames.npcId, npcId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.gameModeType, gameModeType); + output.writeUInt32(FieldNames.mBNBIEJIBFJ, mBNBIEJIBFJ); } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedUInt32(FieldNames.selectEventId, selectEventId); @@ -603,11 +603,10 @@ public final class RogueDialogueEventOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 105021404: - case -1039282375: { - if (input.isAtField(FieldNames.npcId)) { + case -1332411111: { + if (input.isAtField(FieldNames.kKCPLMGIADL)) { if (!input.trySkipNullValue()) { - npcId = input.readUInt32(); + kKCPLMGIADL = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -615,33 +614,34 @@ public final class RogueDialogueEventOuterClass { } break; } - case -1904002038: { - if (input.isAtField(FieldNames.gBMDBBBMBEJ)) { - if (!input.trySkipNullValue()) { - gBMDBBBMBEJ = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 535806911: { - if (input.isAtField(FieldNames.iNJPFALMDHJ)) { - if (!input.trySkipNullValue()) { - iNJPFALMDHJ = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -464498289: case 1937775689: { if (input.isAtField(FieldNames.gameModeType)) { if (!input.trySkipNullValue()) { gameModeType = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 105021404: + case -1039282375: { + if (input.isAtField(FieldNames.npcId)) { + if (!input.trySkipNullValue()) { + npcId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1211798818: { + if (input.isAtField(FieldNames.mBNBIEJIBFJ)) { + if (!input.trySkipNullValue()) { + mBNBIEJIBFJ = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -726,14 +726,14 @@ public final class RogueDialogueEventOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName npcId = FieldName.forField("npcId", "npc_id"); - - static final FieldName gBMDBBBMBEJ = FieldName.forField("GBMDBBBMBEJ"); - - static final FieldName iNJPFALMDHJ = FieldName.forField("INJPFALMDHJ"); + static final FieldName kKCPLMGIADL = FieldName.forField("KKCPLMGIADL"); static final FieldName gameModeType = FieldName.forField("gameModeType", "game_mode_type"); + static final FieldName npcId = FieldName.forField("npcId", "npc_id"); + + static final FieldName mBNBIEJIBFJ = FieldName.forField("MBNBIEJIBFJ"); + static final FieldName selectEventId = FieldName.forField("selectEventId", "select_event_id"); static final FieldName rogueDialogueEventParam = FieldName.forField("rogueDialogueEventParam", "rogue_dialogue_event_param"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java index 89c6969..32b0b37 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java @@ -25,22 +25,22 @@ public final class RogueDialogueEventParamOuterClass { private float ratio; /** - * optional uint32 dialogue_event_id = 3; - */ - private int dialogueEventId; - - /** - * optional uint32 arg_id = 9; - */ - private int argId; - - /** - * optional sint32 int_value = 4; + * optional int32 int_value = 10; */ private int intValue; /** - * optional bool is_valid = 1; + * optional uint32 dialogue_event_id = 7; + */ + private int dialogueEventId; + + /** + * optional uint32 arg_id = 11; + */ + private int argId; + + /** + * optional bool is_valid = 15; */ private boolean isValid; @@ -92,99 +92,25 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 dialogue_event_id = 3; - * @return whether the dialogueEventId field is set + * optional int32 int_value = 10; + * @return whether the intValue field is set */ - public boolean hasDialogueEventId() { + public boolean hasIntValue() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 dialogue_event_id = 3; - * @return this - */ - public RogueDialogueEventParam clearDialogueEventId() { - bitField0_ &= ~0x00000002; - dialogueEventId = 0; - return this; - } - - /** - * optional uint32 dialogue_event_id = 3; - * @return the dialogueEventId - */ - public int getDialogueEventId() { - return dialogueEventId; - } - - /** - * optional uint32 dialogue_event_id = 3; - * @param value the dialogueEventId to set - * @return this - */ - public RogueDialogueEventParam setDialogueEventId(final int value) { - bitField0_ |= 0x00000002; - dialogueEventId = value; - return this; - } - - /** - * optional uint32 arg_id = 9; - * @return whether the argId field is set - */ - public boolean hasArgId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 arg_id = 9; - * @return this - */ - public RogueDialogueEventParam clearArgId() { - bitField0_ &= ~0x00000004; - argId = 0; - return this; - } - - /** - * optional uint32 arg_id = 9; - * @return the argId - */ - public int getArgId() { - return argId; - } - - /** - * optional uint32 arg_id = 9; - * @param value the argId to set - * @return this - */ - public RogueDialogueEventParam setArgId(final int value) { - bitField0_ |= 0x00000004; - argId = value; - return this; - } - - /** - * optional sint32 int_value = 4; - * @return whether the intValue field is set - */ - public boolean hasIntValue() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional sint32 int_value = 4; + * optional int32 int_value = 10; * @return this */ public RogueDialogueEventParam clearIntValue() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; intValue = 0; return this; } /** - * optional sint32 int_value = 4; + * optional int32 int_value = 10; * @return the intValue */ public int getIntValue() { @@ -192,18 +118,92 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional sint32 int_value = 4; + * optional int32 int_value = 10; * @param value the intValue to set * @return this */ public RogueDialogueEventParam setIntValue(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; intValue = value; return this; } /** - * optional bool is_valid = 1; + * optional uint32 dialogue_event_id = 7; + * @return whether the dialogueEventId field is set + */ + public boolean hasDialogueEventId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 dialogue_event_id = 7; + * @return this + */ + public RogueDialogueEventParam clearDialogueEventId() { + bitField0_ &= ~0x00000004; + dialogueEventId = 0; + return this; + } + + /** + * optional uint32 dialogue_event_id = 7; + * @return the dialogueEventId + */ + public int getDialogueEventId() { + return dialogueEventId; + } + + /** + * optional uint32 dialogue_event_id = 7; + * @param value the dialogueEventId to set + * @return this + */ + public RogueDialogueEventParam setDialogueEventId(final int value) { + bitField0_ |= 0x00000004; + dialogueEventId = value; + return this; + } + + /** + * optional uint32 arg_id = 11; + * @return whether the argId field is set + */ + public boolean hasArgId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 arg_id = 11; + * @return this + */ + public RogueDialogueEventParam clearArgId() { + bitField0_ &= ~0x00000008; + argId = 0; + return this; + } + + /** + * optional uint32 arg_id = 11; + * @return the argId + */ + public int getArgId() { + return argId; + } + + /** + * optional uint32 arg_id = 11; + * @param value the argId to set + * @return this + */ + public RogueDialogueEventParam setArgId(final int value) { + bitField0_ |= 0x00000008; + argId = value; + return this; + } + + /** + * optional bool is_valid = 15; * @return whether the isValid field is set */ public boolean hasIsValid() { @@ -211,7 +211,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 1; + * optional bool is_valid = 15; * @return this */ public RogueDialogueEventParam clearIsValid() { @@ -221,7 +221,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 1; + * optional bool is_valid = 15; * @return the isValid */ public boolean getIsValid() { @@ -229,7 +229,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 1; + * optional bool is_valid = 15; * @param value the isValid to set * @return this */ @@ -245,9 +245,9 @@ public final class RogueDialogueEventParamOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; ratio = other.ratio; + intValue = other.intValue; dialogueEventId = other.dialogueEventId; argId = other.argId; - intValue = other.intValue; isValid = other.isValid; } return this; @@ -262,15 +262,15 @@ public final class RogueDialogueEventParamOuterClass { if (other.hasRatio()) { setRatio(other.ratio); } + if (other.hasIntValue()) { + setIntValue(other.intValue); + } if (other.hasDialogueEventId()) { setDialogueEventId(other.dialogueEventId); } if (other.hasArgId()) { setArgId(other.argId); } - if (other.hasIntValue()) { - setIntValue(other.intValue); - } if (other.hasIsValid()) { setIsValid(other.isValid); } @@ -285,9 +285,9 @@ public final class RogueDialogueEventParamOuterClass { cachedSize = -1; bitField0_ = 0; ratio = 0F; + intValue = 0; dialogueEventId = 0; argId = 0; - intValue = 0; isValid = false; return this; } @@ -313,9 +313,9 @@ public final class RogueDialogueEventParamOuterClass { RogueDialogueEventParam other = (RogueDialogueEventParam) o; return bitField0_ == other.bitField0_ && (!hasRatio() || ProtoUtil.isEqual(ratio, other.ratio)) + && (!hasIntValue() || intValue == other.intValue) && (!hasDialogueEventId() || dialogueEventId == other.dialogueEventId) && (!hasArgId() || argId == other.argId) - && (!hasIntValue() || intValue == other.intValue) && (!hasIsValid() || isValid == other.isValid); } @@ -326,19 +326,19 @@ public final class RogueDialogueEventParamOuterClass { output.writeFloatNoTag(ratio); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(dialogueEventId); + output.writeRawByte((byte) 80); + output.writeInt32NoTag(intValue); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(argId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(dialogueEventId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 32); - output.writeSInt32NoTag(intValue); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(argId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 120); output.writeBoolNoTag(isValid); } } @@ -350,13 +350,13 @@ public final class RogueDialogueEventParamOuterClass { size += 5; } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueEventId); + size += 1 + ProtoSink.computeInt32SizeNoTag(intValue); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(argId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueEventId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeSInt32SizeNoTag(intValue); + size += 1 + ProtoSink.computeUInt32SizeNoTag(argId); } if ((bitField0_ & 0x00000010) != 0) { size += 2; @@ -376,38 +376,38 @@ public final class RogueDialogueEventParamOuterClass { ratio = input.readFloat(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 80) { break; } } - case 24: { - // dialogueEventId - dialogueEventId = input.readUInt32(); + case 80: { + // intValue + intValue = input.readInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 56) { break; } } - case 72: { - // argId - argId = input.readUInt32(); + case 56: { + // dialogueEventId + dialogueEventId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 32) { + if (tag != 88) { break; } } - case 32: { - // intValue - intValue = input.readSInt32(); + case 88: { + // argId + argId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 8) { + if (tag != 120) { break; } } - case 8: { + case 120: { // isValid isValid = input.readBool(); bitField0_ |= 0x00000010; @@ -437,13 +437,13 @@ public final class RogueDialogueEventParamOuterClass { output.writeFloat(FieldNames.ratio, ratio); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.dialogueEventId, dialogueEventId); + output.writeInt32(FieldNames.intValue, intValue); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.argId, argId); + output.writeUInt32(FieldNames.dialogueEventId, dialogueEventId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeSInt32(FieldNames.intValue, intValue); + output.writeUInt32(FieldNames.argId, argId); } if ((bitField0_ & 0x00000010) != 0) { output.writeBool(FieldNames.isValid, isValid); @@ -469,12 +469,24 @@ public final class RogueDialogueEventParamOuterClass { } break; } + case 556050114: + case 334404897: { + if (input.isAtField(FieldNames.intValue)) { + if (!input.trySkipNullValue()) { + intValue = input.readInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 88389725: case 1671736167: { if (input.isAtField(FieldNames.dialogueEventId)) { if (!input.trySkipNullValue()) { dialogueEventId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -486,18 +498,6 @@ public final class RogueDialogueEventParamOuterClass { if (input.isAtField(FieldNames.argId)) { if (!input.trySkipNullValue()) { argId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 556050114: - case 334404897: { - if (input.isAtField(FieldNames.intValue)) { - if (!input.trySkipNullValue()) { - intValue = input.readSInt32(); bitField0_ |= 0x00000008; } } else { @@ -572,12 +572,12 @@ public final class RogueDialogueEventParamOuterClass { static class FieldNames { static final FieldName ratio = FieldName.forField("ratio"); + static final FieldName intValue = FieldName.forField("intValue", "int_value"); + static final FieldName dialogueEventId = FieldName.forField("dialogueEventId", "dialogue_event_id"); static final FieldName argId = FieldName.forField("argId", "arg_id"); - static final FieldName intValue = FieldName.forField("intValue", "int_value"); - static final FieldName isValid = FieldName.forField("isValid", "is_valid"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java index b31b520..85b08c4 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java @@ -24,80 +24,42 @@ public final class RogueFinishInfoOuterClass { private int totalScore; /** - * optional uint32 ANBFGOKNEIA = 4; - */ - private int aNBFGOKNEIA; - - /** - * optional uint32 taken_score = 6; - */ - private int takenScore; - - /** - * optional uint32 BCKPHBOPCCN = 8; - */ - private int bCKPHBOPCCN; - - /** - * optional uint32 pass_room_count = 12; + * optional uint32 pass_room_count = 4; */ private int passRoomCount; + /** + * optional uint32 taken_score = 10; + */ + private int takenScore; + /** * optional uint32 area_id = 260; */ private int areaId; /** - * 
-     * HNNAOBNKFLO LAOLNLHIECJ = 7;
-     *
- * - * optional uint32 reach_room_count = 271; + * optional uint32 reach_room_count = 682; */ private int reachRoomCount; /** - * optional bool BFCBHPCPAOI = 2; - */ - private boolean bFCBHPCPAOI; - - /** - * optional bool is_win = 9; + * optional bool is_win = 8; */ private boolean isWin; /** - * optional .ItemList ICOCLPBLFNN = 3; - */ - private final ItemListOuterClass.ItemList iCOCLPBLFNN = ItemListOuterClass.ItemList.newInstance(); - - /** - * optional .RogueScoreRewardInfo score_reward_info = 5; - */ - private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo scoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); - - /** - * optional .RogueScoreRewardInfo cur_score_reward_info = 10; + * optional .RogueScoreRewardInfo cur_score_reward_info = 11; */ private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo curScoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); /** - * optional .ItemList LBLELCPPLCI = 13; + * optional .RogueScoreRewardInfo score_reward_info = 12; */ - private final ItemListOuterClass.ItemList lBLELCPPLCI = ItemListOuterClass.ItemList.newInstance(); + private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo scoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); /** - * 
-     * MMOCIHBBOMA LDFFDAMFFFO = 11;
-     *
- * - * optional .ItemList IPNGMMIOJJB = 14; - */ - private final ItemListOuterClass.ItemList iPNGMMIOJJB = ItemListOuterClass.ItemList.newInstance(); - - /** - * optional .RogueRecordInfo record_info = 15; + * optional .RogueRecordInfo record_info = 13; */ private final RogueRecordInfoOuterClass.RogueRecordInfo recordInfo = RogueRecordInfoOuterClass.RogueRecordInfo.newInstance(); @@ -149,44 +111,44 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 ANBFGOKNEIA = 4; - * @return whether the aNBFGOKNEIA field is set + * optional uint32 pass_room_count = 4; + * @return whether the passRoomCount field is set */ - public boolean hasANBFGOKNEIA() { + public boolean hasPassRoomCount() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 ANBFGOKNEIA = 4; + * optional uint32 pass_room_count = 4; * @return this */ - public RogueFinishInfo clearANBFGOKNEIA() { + public RogueFinishInfo clearPassRoomCount() { bitField0_ &= ~0x00000002; - aNBFGOKNEIA = 0; + passRoomCount = 0; return this; } /** - * optional uint32 ANBFGOKNEIA = 4; - * @return the aNBFGOKNEIA + * optional uint32 pass_room_count = 4; + * @return the passRoomCount */ - public int getANBFGOKNEIA() { - return aNBFGOKNEIA; + public int getPassRoomCount() { + return passRoomCount; } /** - * optional uint32 ANBFGOKNEIA = 4; - * @param value the aNBFGOKNEIA to set + * optional uint32 pass_room_count = 4; + * @param value the passRoomCount to set * @return this */ - public RogueFinishInfo setANBFGOKNEIA(final int value) { + public RogueFinishInfo setPassRoomCount(final int value) { bitField0_ |= 0x00000002; - aNBFGOKNEIA = value; + passRoomCount = value; return this; } /** - * optional uint32 taken_score = 6; + * optional uint32 taken_score = 10; * @return whether the takenScore field is set */ public boolean hasTakenScore() { @@ -194,7 +156,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 taken_score = 6; + * optional uint32 taken_score = 10; * @return this */ public RogueFinishInfo clearTakenScore() { @@ -204,7 +166,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 taken_score = 6; + * optional uint32 taken_score = 10; * @return the takenScore */ public int getTakenScore() { @@ -212,7 +174,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 taken_score = 6; + * optional uint32 taken_score = 10; * @param value the takenScore to set * @return this */ @@ -222,86 +184,12 @@ public final class RogueFinishInfoOuterClass { return this; } - /** - * optional uint32 BCKPHBOPCCN = 8; - * @return whether the bCKPHBOPCCN field is set - */ - public boolean hasBCKPHBOPCCN() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 BCKPHBOPCCN = 8; - * @return this - */ - public RogueFinishInfo clearBCKPHBOPCCN() { - bitField0_ &= ~0x00000008; - bCKPHBOPCCN = 0; - return this; - } - - /** - * optional uint32 BCKPHBOPCCN = 8; - * @return the bCKPHBOPCCN - */ - public int getBCKPHBOPCCN() { - return bCKPHBOPCCN; - } - - /** - * optional uint32 BCKPHBOPCCN = 8; - * @param value the bCKPHBOPCCN to set - * @return this - */ - public RogueFinishInfo setBCKPHBOPCCN(final int value) { - bitField0_ |= 0x00000008; - bCKPHBOPCCN = value; - return this; - } - - /** - * optional uint32 pass_room_count = 12; - * @return whether the passRoomCount field is set - */ - public boolean hasPassRoomCount() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 pass_room_count = 12; - * @return this - */ - public RogueFinishInfo clearPassRoomCount() { - bitField0_ &= ~0x00000010; - passRoomCount = 0; - return this; - } - - /** - * optional uint32 pass_room_count = 12; - * @return the passRoomCount - */ - public int getPassRoomCount() { - return passRoomCount; - } - - /** - * optional uint32 pass_room_count = 12; - * @param value the passRoomCount to set - * @return this - */ - public RogueFinishInfo setPassRoomCount(final int value) { - bitField0_ |= 0x00000010; - passRoomCount = value; - return this; - } - /** * optional uint32 area_id = 260; * @return whether the areaId field is set */ public boolean hasAreaId() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -309,7 +197,7 @@ public final class RogueFinishInfoOuterClass { * @return this */ public RogueFinishInfo clearAreaId() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000008; areaId = 0; return this; } @@ -328,43 +216,31 @@ public final class RogueFinishInfoOuterClass { * @return this */ public RogueFinishInfo setAreaId(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; areaId = value; return this; } /** - * 
-     * HNNAOBNKFLO LAOLNLHIECJ = 7;
-     *
- * - * optional uint32 reach_room_count = 271; + * optional uint32 reach_room_count = 682; * @return whether the reachRoomCount field is set */ public boolean hasReachRoomCount() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000010) != 0; } /** - * 
-     * HNNAOBNKFLO LAOLNLHIECJ = 7;
-     *
- * - * optional uint32 reach_room_count = 271; + * optional uint32 reach_room_count = 682; * @return this */ public RogueFinishInfo clearReachRoomCount() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000010; reachRoomCount = 0; return this; } /** - * 
-     * HNNAOBNKFLO LAOLNLHIECJ = 7;
-     *
- * - * optional uint32 reach_room_count = 271; + * optional uint32 reach_room_count = 682; * @return the reachRoomCount */ public int getReachRoomCount() { @@ -372,77 +248,36 @@ public final class RogueFinishInfoOuterClass { } /** - * 
-     * HNNAOBNKFLO LAOLNLHIECJ = 7;
-     *
- * - * optional uint32 reach_room_count = 271; + * optional uint32 reach_room_count = 682; * @param value the reachRoomCount to set * @return this */ public RogueFinishInfo setReachRoomCount(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; reachRoomCount = value; return this; } /** - * optional bool BFCBHPCPAOI = 2; - * @return whether the bFCBHPCPAOI field is set - */ - public boolean hasBFCBHPCPAOI() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional bool BFCBHPCPAOI = 2; - * @return this - */ - public RogueFinishInfo clearBFCBHPCPAOI() { - bitField0_ &= ~0x00000080; - bFCBHPCPAOI = false; - return this; - } - - /** - * optional bool BFCBHPCPAOI = 2; - * @return the bFCBHPCPAOI - */ - public boolean getBFCBHPCPAOI() { - return bFCBHPCPAOI; - } - - /** - * optional bool BFCBHPCPAOI = 2; - * @param value the bFCBHPCPAOI to set - * @return this - */ - public RogueFinishInfo setBFCBHPCPAOI(final boolean value) { - bitField0_ |= 0x00000080; - bFCBHPCPAOI = value; - return this; - } - - /** - * optional bool is_win = 9; + * optional bool is_win = 8; * @return whether the isWin field is set */ public boolean hasIsWin() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000020) != 0; } /** - * optional bool is_win = 9; + * optional bool is_win = 8; * @return this */ public RogueFinishInfo clearIsWin() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000020; isWin = false; return this; } /** - * optional bool is_win = 9; + * optional bool is_win = 8; * @return the isWin */ public boolean getIsWin() { @@ -450,151 +285,36 @@ public final class RogueFinishInfoOuterClass { } /** - * optional bool is_win = 9; + * optional bool is_win = 8; * @param value the isWin to set * @return this */ public RogueFinishInfo setIsWin(final boolean value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000020; isWin = value; return this; } /** - * optional .ItemList ICOCLPBLFNN = 3; - * @return whether the iCOCLPBLFNN field is set - */ - public boolean hasICOCLPBLFNN() { - return (bitField0_ & 0x00000200) != 0; - } - - /** - * optional .ItemList ICOCLPBLFNN = 3; - * @return this - */ - public RogueFinishInfo clearICOCLPBLFNN() { - bitField0_ &= ~0x00000200; - iCOCLPBLFNN.clear(); - return this; - } - - /** - * optional .ItemList ICOCLPBLFNN = 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 #getMutableICOCLPBLFNN()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ItemListOuterClass.ItemList getICOCLPBLFNN() { - return iCOCLPBLFNN; - } - - /** - * optional .ItemList ICOCLPBLFNN = 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 ItemListOuterClass.ItemList getMutableICOCLPBLFNN() { - bitField0_ |= 0x00000200; - return iCOCLPBLFNN; - } - - /** - * optional .ItemList ICOCLPBLFNN = 3; - * @param value the iCOCLPBLFNN to set - * @return this - */ - public RogueFinishInfo setICOCLPBLFNN(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000200; - iCOCLPBLFNN.copyFrom(value); - return this; - } - - /** - * optional .RogueScoreRewardInfo score_reward_info = 5; - * @return whether the scoreRewardInfo field is set - */ - public boolean hasScoreRewardInfo() { - return (bitField0_ & 0x00000400) != 0; - } - - /** - * optional .RogueScoreRewardInfo score_reward_info = 5; - * @return this - */ - public RogueFinishInfo clearScoreRewardInfo() { - bitField0_ &= ~0x00000400; - scoreRewardInfo.clear(); - return this; - } - - /** - * optional .RogueScoreRewardInfo score_reward_info = 5; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableScoreRewardInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getScoreRewardInfo() { - return scoreRewardInfo; - } - - /** - * optional .RogueScoreRewardInfo score_reward_info = 5; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableScoreRewardInfo() { - bitField0_ |= 0x00000400; - return scoreRewardInfo; - } - - /** - * optional .RogueScoreRewardInfo score_reward_info = 5; - * @param value the scoreRewardInfo to set - * @return this - */ - public RogueFinishInfo setScoreRewardInfo( - final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { - bitField0_ |= 0x00000400; - scoreRewardInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueScoreRewardInfo cur_score_reward_info = 10; + * optional .RogueScoreRewardInfo cur_score_reward_info = 11; * @return whether the curScoreRewardInfo field is set */ public boolean hasCurScoreRewardInfo() { - return (bitField0_ & 0x00000800) != 0; + return (bitField0_ & 0x00000040) != 0; } /** - * optional .RogueScoreRewardInfo cur_score_reward_info = 10; + * optional .RogueScoreRewardInfo cur_score_reward_info = 11; * @return this */ public RogueFinishInfo clearCurScoreRewardInfo() { - bitField0_ &= ~0x00000800; + bitField0_ &= ~0x00000040; curScoreRewardInfo.clear(); return this; } /** - * optional .RogueScoreRewardInfo cur_score_reward_info = 10; + * optional .RogueScoreRewardInfo cur_score_reward_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. @@ -608,7 +328,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional .RogueScoreRewardInfo cur_score_reward_info = 10; + * optional .RogueScoreRewardInfo cur_score_reward_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 @@ -617,56 +337,56 @@ public final class RogueFinishInfoOuterClass { * @return internal storage object for modifications */ public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableCurScoreRewardInfo() { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000040; return curScoreRewardInfo; } /** - * optional .RogueScoreRewardInfo cur_score_reward_info = 10; + * optional .RogueScoreRewardInfo cur_score_reward_info = 11; * @param value the curScoreRewardInfo to set * @return this */ public RogueFinishInfo setCurScoreRewardInfo( final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000040; curScoreRewardInfo.copyFrom(value); return this; } /** - * optional .ItemList LBLELCPPLCI = 13; - * @return whether the lBLELCPPLCI field is set + * optional .RogueScoreRewardInfo score_reward_info = 12; + * @return whether the scoreRewardInfo field is set */ - public boolean hasLBLELCPPLCI() { - return (bitField0_ & 0x00001000) != 0; + public boolean hasScoreRewardInfo() { + return (bitField0_ & 0x00000080) != 0; } /** - * optional .ItemList LBLELCPPLCI = 13; + * optional .RogueScoreRewardInfo score_reward_info = 12; * @return this */ - public RogueFinishInfo clearLBLELCPPLCI() { - bitField0_ &= ~0x00001000; - lBLELCPPLCI.clear(); + public RogueFinishInfo clearScoreRewardInfo() { + bitField0_ &= ~0x00000080; + scoreRewardInfo.clear(); return this; } /** - * optional .ItemList LBLELCPPLCI = 13; + * optional .RogueScoreRewardInfo score_reward_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 #getMutableLBLELCPPLCI()} if you want to modify it. + * Use {@link #getMutableScoreRewardInfo()} if you want to modify it. * * @return internal storage object for reading */ - public ItemListOuterClass.ItemList getLBLELCPPLCI() { - return lBLELCPPLCI; + public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getScoreRewardInfo() { + return scoreRewardInfo; } /** - * optional .ItemList LBLELCPPLCI = 13; + * optional .RogueScoreRewardInfo score_reward_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 @@ -674,119 +394,43 @@ public final class RogueFinishInfoOuterClass { * * @return internal storage object for modifications */ - public ItemListOuterClass.ItemList getMutableLBLELCPPLCI() { - bitField0_ |= 0x00001000; - return lBLELCPPLCI; + public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableScoreRewardInfo() { + bitField0_ |= 0x00000080; + return scoreRewardInfo; } /** - * optional .ItemList LBLELCPPLCI = 13; - * @param value the lBLELCPPLCI to set + * optional .RogueScoreRewardInfo score_reward_info = 12; + * @param value the scoreRewardInfo to set * @return this */ - public RogueFinishInfo setLBLELCPPLCI(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00001000; - lBLELCPPLCI.copyFrom(value); + public RogueFinishInfo setScoreRewardInfo( + final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { + bitField0_ |= 0x00000080; + scoreRewardInfo.copyFrom(value); return this; } /** - * 
-     * MMOCIHBBOMA LDFFDAMFFFO = 11;
-     *
- * - * optional .ItemList IPNGMMIOJJB = 14; - * @return whether the iPNGMMIOJJB field is set - */ - public boolean hasIPNGMMIOJJB() { - return (bitField0_ & 0x00002000) != 0; - } - - /** - * 
-     * MMOCIHBBOMA LDFFDAMFFFO = 11;
-     *
- * - * optional .ItemList IPNGMMIOJJB = 14; - * @return this - */ - public RogueFinishInfo clearIPNGMMIOJJB() { - bitField0_ &= ~0x00002000; - iPNGMMIOJJB.clear(); - return this; - } - - /** - * 
-     * MMOCIHBBOMA LDFFDAMFFFO = 11;
-     *
- * - * optional .ItemList IPNGMMIOJJB = 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 #getMutableIPNGMMIOJJB()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ItemListOuterClass.ItemList getIPNGMMIOJJB() { - return iPNGMMIOJJB; - } - - /** - * 
-     * MMOCIHBBOMA LDFFDAMFFFO = 11;
-     *
- * - * optional .ItemList IPNGMMIOJJB = 14; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public ItemListOuterClass.ItemList getMutableIPNGMMIOJJB() { - bitField0_ |= 0x00002000; - return iPNGMMIOJJB; - } - - /** - * 
-     * MMOCIHBBOMA LDFFDAMFFFO = 11;
-     *
- * - * optional .ItemList IPNGMMIOJJB = 14; - * @param value the iPNGMMIOJJB to set - * @return this - */ - public RogueFinishInfo setIPNGMMIOJJB(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00002000; - iPNGMMIOJJB.copyFrom(value); - return this; - } - - /** - * optional .RogueRecordInfo record_info = 15; + * optional .RogueRecordInfo record_info = 13; * @return whether the recordInfo field is set */ public boolean hasRecordInfo() { - return (bitField0_ & 0x00004000) != 0; + return (bitField0_ & 0x00000100) != 0; } /** - * optional .RogueRecordInfo record_info = 15; + * optional .RogueRecordInfo record_info = 13; * @return this */ public RogueFinishInfo clearRecordInfo() { - bitField0_ &= ~0x00004000; + bitField0_ &= ~0x00000100; recordInfo.clear(); return this; } /** - * optional .RogueRecordInfo record_info = 15; + * optional .RogueRecordInfo record_info = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -800,7 +444,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional .RogueRecordInfo record_info = 15; + * optional .RogueRecordInfo record_info = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -809,17 +453,17 @@ public final class RogueFinishInfoOuterClass { * @return internal storage object for modifications */ public RogueRecordInfoOuterClass.RogueRecordInfo getMutableRecordInfo() { - bitField0_ |= 0x00004000; + bitField0_ |= 0x00000100; return recordInfo; } /** - * optional .RogueRecordInfo record_info = 15; + * optional .RogueRecordInfo record_info = 13; * @param value the recordInfo to set * @return this */ public RogueFinishInfo setRecordInfo(final RogueRecordInfoOuterClass.RogueRecordInfo value) { - bitField0_ |= 0x00004000; + bitField0_ |= 0x00000100; recordInfo.copyFrom(value); return this; } @@ -830,19 +474,13 @@ public final class RogueFinishInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; totalScore = other.totalScore; - aNBFGOKNEIA = other.aNBFGOKNEIA; - takenScore = other.takenScore; - bCKPHBOPCCN = other.bCKPHBOPCCN; passRoomCount = other.passRoomCount; + takenScore = other.takenScore; areaId = other.areaId; reachRoomCount = other.reachRoomCount; - bFCBHPCPAOI = other.bFCBHPCPAOI; isWin = other.isWin; - iCOCLPBLFNN.copyFrom(other.iCOCLPBLFNN); - scoreRewardInfo.copyFrom(other.scoreRewardInfo); curScoreRewardInfo.copyFrom(other.curScoreRewardInfo); - lBLELCPPLCI.copyFrom(other.lBLELCPPLCI); - iPNGMMIOJJB.copyFrom(other.iPNGMMIOJJB); + scoreRewardInfo.copyFrom(other.scoreRewardInfo); recordInfo.copyFrom(other.recordInfo); } return this; @@ -857,44 +495,26 @@ public final class RogueFinishInfoOuterClass { if (other.hasTotalScore()) { setTotalScore(other.totalScore); } - if (other.hasANBFGOKNEIA()) { - setANBFGOKNEIA(other.aNBFGOKNEIA); + if (other.hasPassRoomCount()) { + setPassRoomCount(other.passRoomCount); } if (other.hasTakenScore()) { setTakenScore(other.takenScore); } - if (other.hasBCKPHBOPCCN()) { - setBCKPHBOPCCN(other.bCKPHBOPCCN); - } - if (other.hasPassRoomCount()) { - setPassRoomCount(other.passRoomCount); - } if (other.hasAreaId()) { setAreaId(other.areaId); } if (other.hasReachRoomCount()) { setReachRoomCount(other.reachRoomCount); } - if (other.hasBFCBHPCPAOI()) { - setBFCBHPCPAOI(other.bFCBHPCPAOI); - } if (other.hasIsWin()) { setIsWin(other.isWin); } - if (other.hasICOCLPBLFNN()) { - getMutableICOCLPBLFNN().mergeFrom(other.iCOCLPBLFNN); - } - if (other.hasScoreRewardInfo()) { - getMutableScoreRewardInfo().mergeFrom(other.scoreRewardInfo); - } if (other.hasCurScoreRewardInfo()) { getMutableCurScoreRewardInfo().mergeFrom(other.curScoreRewardInfo); } - if (other.hasLBLELCPPLCI()) { - getMutableLBLELCPPLCI().mergeFrom(other.lBLELCPPLCI); - } - if (other.hasIPNGMMIOJJB()) { - getMutableIPNGMMIOJJB().mergeFrom(other.iPNGMMIOJJB); + if (other.hasScoreRewardInfo()) { + getMutableScoreRewardInfo().mergeFrom(other.scoreRewardInfo); } if (other.hasRecordInfo()) { getMutableRecordInfo().mergeFrom(other.recordInfo); @@ -910,19 +530,13 @@ public final class RogueFinishInfoOuterClass { cachedSize = -1; bitField0_ = 0; totalScore = 0; - aNBFGOKNEIA = 0; - takenScore = 0; - bCKPHBOPCCN = 0; passRoomCount = 0; + takenScore = 0; areaId = 0; reachRoomCount = 0; - bFCBHPCPAOI = false; isWin = false; - iCOCLPBLFNN.clear(); - scoreRewardInfo.clear(); curScoreRewardInfo.clear(); - lBLELCPPLCI.clear(); - iPNGMMIOJJB.clear(); + scoreRewardInfo.clear(); recordInfo.clear(); return this; } @@ -934,11 +548,8 @@ public final class RogueFinishInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - iCOCLPBLFNN.clearQuick(); - scoreRewardInfo.clearQuick(); curScoreRewardInfo.clearQuick(); - lBLELCPPLCI.clearQuick(); - iPNGMMIOJJB.clearQuick(); + scoreRewardInfo.clearQuick(); recordInfo.clearQuick(); return this; } @@ -954,19 +565,13 @@ public final class RogueFinishInfoOuterClass { RogueFinishInfo other = (RogueFinishInfo) o; return bitField0_ == other.bitField0_ && (!hasTotalScore() || totalScore == other.totalScore) - && (!hasANBFGOKNEIA() || aNBFGOKNEIA == other.aNBFGOKNEIA) - && (!hasTakenScore() || takenScore == other.takenScore) - && (!hasBCKPHBOPCCN() || bCKPHBOPCCN == other.bCKPHBOPCCN) && (!hasPassRoomCount() || passRoomCount == other.passRoomCount) + && (!hasTakenScore() || takenScore == other.takenScore) && (!hasAreaId() || areaId == other.areaId) && (!hasReachRoomCount() || reachRoomCount == other.reachRoomCount) - && (!hasBFCBHPCPAOI() || bFCBHPCPAOI == other.bFCBHPCPAOI) && (!hasIsWin() || isWin == other.isWin) - && (!hasICOCLPBLFNN() || iCOCLPBLFNN.equals(other.iCOCLPBLFNN)) - && (!hasScoreRewardInfo() || scoreRewardInfo.equals(other.scoreRewardInfo)) && (!hasCurScoreRewardInfo() || curScoreRewardInfo.equals(other.curScoreRewardInfo)) - && (!hasLBLELCPPLCI() || lBLELCPPLCI.equals(other.lBLELCPPLCI)) - && (!hasIPNGMMIOJJB() || iPNGMMIOJJB.equals(other.iPNGMMIOJJB)) + && (!hasScoreRewardInfo() || scoreRewardInfo.equals(other.scoreRewardInfo)) && (!hasRecordInfo() || recordInfo.equals(other.recordInfo)); } @@ -978,58 +583,34 @@ public final class RogueFinishInfoOuterClass { } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(aNBFGOKNEIA); + output.writeUInt32NoTag(passRoomCount); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(takenScore); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(bCKPHBOPCCN); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(passRoomCount); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeRawLittleEndian16((short) 4256); output.writeUInt32NoTag(areaId); } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawLittleEndian16((short) 4344); + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawLittleEndian16((short) 10960); output.writeUInt32NoTag(reachRoomCount); } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 16); - output.writeBoolNoTag(bFCBHPCPAOI); - } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 72); + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 64); output.writeBoolNoTag(isWin); } - if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(iCOCLPBLFNN); - } - if ((bitField0_ & 0x00000400) != 0) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(scoreRewardInfo); - } - if ((bitField0_ & 0x00000800) != 0) { - output.writeRawByte((byte) 82); + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawByte((byte) 90); output.writeMessageNoTag(curScoreRewardInfo); } - if ((bitField0_ & 0x00001000) != 0) { + if ((bitField0_ & 0x00000080) != 0) { + output.writeRawByte((byte) 98); + output.writeMessageNoTag(scoreRewardInfo); + } + if ((bitField0_ & 0x00000100) != 0) { output.writeRawByte((byte) 106); - output.writeMessageNoTag(lBLELCPPLCI); - } - if ((bitField0_ & 0x00002000) != 0) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(iPNGMMIOJJB); - } - if ((bitField0_ & 0x00004000) != 0) { - output.writeRawByte((byte) 122); output.writeMessageNoTag(recordInfo); } } @@ -1041,45 +622,27 @@ public final class RogueFinishInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(totalScore); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(aNBFGOKNEIA); + size += 1 + ProtoSink.computeUInt32SizeNoTag(passRoomCount); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(takenScore); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bCKPHBOPCCN); - } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(passRoomCount); - } - if ((bitField0_ & 0x00000020) != 0) { size += 2 + ProtoSink.computeUInt32SizeNoTag(areaId); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000010) != 0) { size += 2 + ProtoSink.computeUInt32SizeNoTag(reachRoomCount); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000020) != 0) { size += 2; } - if ((bitField0_ & 0x00000100) != 0) { - size += 2; - } - if ((bitField0_ & 0x00000200) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(iCOCLPBLFNN); - } - if ((bitField0_ & 0x00000400) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(scoreRewardInfo); - } - if ((bitField0_ & 0x00000800) != 0) { + if ((bitField0_ & 0x00000040) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(curScoreRewardInfo); } - if ((bitField0_ & 0x00001000) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(lBLELCPPLCI); + if ((bitField0_ & 0x00000080) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(scoreRewardInfo); } - if ((bitField0_ & 0x00002000) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(iPNGMMIOJJB); - } - if ((bitField0_ & 0x00004000) != 0) { + if ((bitField0_ & 0x00000100) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(recordInfo); } return size; @@ -1102,37 +665,19 @@ public final class RogueFinishInfoOuterClass { } } case 32: { - // aNBFGOKNEIA - aNBFGOKNEIA = input.readUInt32(); + // passRoomCount + passRoomCount = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 80) { break; } } - case 48: { + case 80: { // takenScore takenScore = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { - // bCKPHBOPCCN - bCKPHBOPCCN = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // passRoomCount - passRoomCount = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); if (tag != 2080) { break; } @@ -1140,88 +685,52 @@ public final class RogueFinishInfoOuterClass { case 2080: { // areaId areaId = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 2168) { + if (tag != 5456) { break; } } - case 2168: { + case 5456: { // reachRoomCount reachRoomCount = input.readUInt32(); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 16) { + if (tag != 64) { break; } } - case 16: { - // bFCBHPCPAOI - bFCBHPCPAOI = input.readBool(); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 64: { // isWin isWin = input.readBool(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 26) { + if (tag != 90) { break; } } - case 26: { - // iCOCLPBLFNN - input.readMessage(iCOCLPBLFNN); - bitField0_ |= 0x00000200; - tag = input.readTag(); - if (tag != 42) { - break; - } - } - case 42: { - // scoreRewardInfo - input.readMessage(scoreRewardInfo); - bitField0_ |= 0x00000400; - tag = input.readTag(); - if (tag != 82) { - break; - } - } - case 82: { + case 90: { // curScoreRewardInfo input.readMessage(curScoreRewardInfo); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // scoreRewardInfo + input.readMessage(scoreRewardInfo); + bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 106) { break; } } case 106: { - // lBLELCPPLCI - input.readMessage(lBLELCPPLCI); - bitField0_ |= 0x00001000; - tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { - // iPNGMMIOJJB - input.readMessage(iPNGMMIOJJB); - bitField0_ |= 0x00002000; - tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { // recordInfo input.readMessage(recordInfo); - bitField0_ |= 0x00004000; + bitField0_ |= 0x00000100; tag = input.readTag(); if (tag != 0) { break; @@ -1248,45 +757,27 @@ public final class RogueFinishInfoOuterClass { output.writeUInt32(FieldNames.totalScore, totalScore); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.aNBFGOKNEIA, aNBFGOKNEIA); + output.writeUInt32(FieldNames.passRoomCount, passRoomCount); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.takenScore, takenScore); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.bCKPHBOPCCN, bCKPHBOPCCN); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.passRoomCount, passRoomCount); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.areaId, areaId); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.reachRoomCount, reachRoomCount); } - if ((bitField0_ & 0x00000080) != 0) { - output.writeBool(FieldNames.bFCBHPCPAOI, bFCBHPCPAOI); - } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000020) != 0) { output.writeBool(FieldNames.isWin, isWin); } - if ((bitField0_ & 0x00000200) != 0) { - output.writeMessage(FieldNames.iCOCLPBLFNN, iCOCLPBLFNN); - } - if ((bitField0_ & 0x00000400) != 0) { - output.writeMessage(FieldNames.scoreRewardInfo, scoreRewardInfo); - } - if ((bitField0_ & 0x00000800) != 0) { + if ((bitField0_ & 0x00000040) != 0) { output.writeMessage(FieldNames.curScoreRewardInfo, curScoreRewardInfo); } - if ((bitField0_ & 0x00001000) != 0) { - output.writeMessage(FieldNames.lBLELCPPLCI, lBLELCPPLCI); + if ((bitField0_ & 0x00000080) != 0) { + output.writeMessage(FieldNames.scoreRewardInfo, scoreRewardInfo); } - if ((bitField0_ & 0x00002000) != 0) { - output.writeMessage(FieldNames.iPNGMMIOJJB, iPNGMMIOJJB); - } - if ((bitField0_ & 0x00004000) != 0) { + if ((bitField0_ & 0x00000100) != 0) { output.writeMessage(FieldNames.recordInfo, recordInfo); } output.endObject(); @@ -1311,10 +802,11 @@ public final class RogueFinishInfoOuterClass { } break; } - case 345467297: { - if (input.isAtField(FieldNames.aNBFGOKNEIA)) { + case 430108643: + case 173887897: { + if (input.isAtField(FieldNames.passRoomCount)) { if (!input.trySkipNullValue()) { - aNBFGOKNEIA = input.readUInt32(); + passRoomCount = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1334,35 +826,12 @@ public final class RogueFinishInfoOuterClass { } break; } - case -1904713331: { - if (input.isAtField(FieldNames.bCKPHBOPCCN)) { - if (!input.trySkipNullValue()) { - bCKPHBOPCCN = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 430108643: - case 173887897: { - if (input.isAtField(FieldNames.passRoomCount)) { - if (!input.trySkipNullValue()) { - passRoomCount = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } case -1409553784: case -746472947: { if (input.isAtField(FieldNames.areaId)) { if (!input.trySkipNullValue()) { areaId = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -1374,18 +843,7 @@ public final class RogueFinishInfoOuterClass { if (input.isAtField(FieldNames.reachRoomCount)) { if (!input.trySkipNullValue()) { reachRoomCount = input.readUInt32(); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } - case 840663363: { - if (input.isAtField(FieldNames.bFCBHPCPAOI)) { - if (!input.trySkipNullValue()) { - bFCBHPCPAOI = input.readBool(); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -1397,30 +855,7 @@ public final class RogueFinishInfoOuterClass { if (input.isAtField(FieldNames.isWin)) { if (!input.trySkipNullValue()) { isWin = input.readBool(); - bitField0_ |= 0x00000100; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1776318262: { - if (input.isAtField(FieldNames.iCOCLPBLFNN)) { - if (!input.trySkipNullValue()) { - input.readMessage(iCOCLPBLFNN); - bitField0_ |= 0x00000200; - } - } else { - input.skipUnknownField(); - } - break; - } - case 672564399: - case 751191441: { - if (input.isAtField(FieldNames.scoreRewardInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(scoreRewardInfo); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -1432,29 +867,19 @@ public final class RogueFinishInfoOuterClass { if (input.isAtField(FieldNames.curScoreRewardInfo)) { if (!input.trySkipNullValue()) { input.readMessage(curScoreRewardInfo); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); } break; } - case 1578200140: { - if (input.isAtField(FieldNames.lBLELCPPLCI)) { + case 672564399: + case 751191441: { + if (input.isAtField(FieldNames.scoreRewardInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(lBLELCPPLCI); - bitField0_ |= 0x00001000; - } - } else { - input.skipUnknownField(); - } - break; - } - case 960908636: { - if (input.isAtField(FieldNames.iPNGMMIOJJB)) { - if (!input.trySkipNullValue()) { - input.readMessage(iPNGMMIOJJB); - bitField0_ |= 0x00002000; + input.readMessage(scoreRewardInfo); + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1466,7 +891,7 @@ public final class RogueFinishInfoOuterClass { if (input.isAtField(FieldNames.recordInfo)) { if (!input.trySkipNullValue()) { input.readMessage(recordInfo); - bitField0_ |= 0x00004000; + bitField0_ |= 0x00000100; } } else { input.skipUnknownField(); @@ -1528,31 +953,19 @@ public final class RogueFinishInfoOuterClass { static class FieldNames { static final FieldName totalScore = FieldName.forField("totalScore", "total_score"); - static final FieldName aNBFGOKNEIA = FieldName.forField("ANBFGOKNEIA"); + static final FieldName passRoomCount = FieldName.forField("passRoomCount", "pass_room_count"); static final FieldName takenScore = FieldName.forField("takenScore", "taken_score"); - static final FieldName bCKPHBOPCCN = FieldName.forField("BCKPHBOPCCN"); - - static final FieldName passRoomCount = FieldName.forField("passRoomCount", "pass_room_count"); - static final FieldName areaId = FieldName.forField("areaId", "area_id"); static final FieldName reachRoomCount = FieldName.forField("reachRoomCount", "reach_room_count"); - static final FieldName bFCBHPCPAOI = FieldName.forField("BFCBHPCPAOI"); - static final FieldName isWin = FieldName.forField("isWin", "is_win"); - static final FieldName iCOCLPBLFNN = FieldName.forField("ICOCLPBLFNN"); - - static final FieldName scoreRewardInfo = FieldName.forField("scoreRewardInfo", "score_reward_info"); - static final FieldName curScoreRewardInfo = FieldName.forField("curScoreRewardInfo", "cur_score_reward_info"); - static final FieldName lBLELCPPLCI = FieldName.forField("LBLELCPPLCI"); - - static final FieldName iPNGMMIOJJB = FieldName.forField("IPNGMMIOJJB"); + static final FieldName scoreRewardInfo = FieldName.forField("scoreRewardInfo", "score_reward_info"); static final FieldName recordInfo = FieldName.forField("recordInfo", "record_info"); } diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookAeonOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookAeonOuterClass.java index 78c63f8..cd71803 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueHandbookAeonOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookAeonOuterClass.java @@ -20,32 +20,40 @@ public final class RogueHandbookAeonOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 aeon_id = 2; + * optional uint32 aeon_id = 5; */ private int aeonId; /** - * optional uint32 level = 4; - */ - private int level; - - /** - * optional uint32 max_level = 5; - */ - private int maxLevel; - - /** - * optional uint32 exp = 15; + * optional uint32 exp = 6; */ private int exp; /** - * repeated uint32 taken_reward_list = 10; + * optional uint32 level = 10; + */ + private int level; + + /** + * optional uint32 max_level = 14; + */ + private int maxLevel; + + /** + * 
+     *  BODAGGMFDMJ
+     *
+ * + * repeated uint32 taken_reward_list = 7; */ private final RepeatedInt takenRewardList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 archive_unlock_list = 13; + * 
+     *  KPFEEKHKANG
+     *
+ * + * repeated uint32 archive_unlock_list = 15; */ private final RepeatedInt archiveUnlockList = RepeatedInt.newEmptyInstance(); @@ -60,7 +68,7 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 aeon_id = 2; + * optional uint32 aeon_id = 5; * @return whether the aeonId field is set */ public boolean hasAeonId() { @@ -68,7 +76,7 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 aeon_id = 2; + * optional uint32 aeon_id = 5; * @return this */ public RogueHandbookAeon clearAeonId() { @@ -78,7 +86,7 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 aeon_id = 2; + * optional uint32 aeon_id = 5; * @return the aeonId */ public int getAeonId() { @@ -86,7 +94,7 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 aeon_id = 2; + * optional uint32 aeon_id = 5; * @param value the aeonId to set * @return this */ @@ -97,99 +105,25 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 level = 4; - * @return whether the level field is set + * optional uint32 exp = 6; + * @return whether the exp field is set */ - public boolean hasLevel() { + public boolean hasExp() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 level = 4; - * @return this - */ - public RogueHandbookAeon 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 RogueHandbookAeon setLevel(final int value) { - bitField0_ |= 0x00000002; - level = value; - return this; - } - - /** - * optional uint32 max_level = 5; - * @return whether the maxLevel field is set - */ - public boolean hasMaxLevel() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 max_level = 5; - * @return this - */ - public RogueHandbookAeon clearMaxLevel() { - bitField0_ &= ~0x00000004; - maxLevel = 0; - return this; - } - - /** - * optional uint32 max_level = 5; - * @return the maxLevel - */ - public int getMaxLevel() { - return maxLevel; - } - - /** - * optional uint32 max_level = 5; - * @param value the maxLevel to set - * @return this - */ - public RogueHandbookAeon setMaxLevel(final int value) { - bitField0_ |= 0x00000004; - maxLevel = value; - return this; - } - - /** - * optional uint32 exp = 15; - * @return whether the exp field is set - */ - public boolean hasExp() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 exp = 15; + * optional uint32 exp = 6; * @return this */ public RogueHandbookAeon clearExp() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; exp = 0; return this; } /** - * optional uint32 exp = 15; + * optional uint32 exp = 6; * @return the exp */ public int getExp() { @@ -197,18 +131,96 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 exp = 15; + * optional uint32 exp = 6; * @param value the exp to set * @return this */ public RogueHandbookAeon setExp(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; exp = value; return this; } /** - * repeated uint32 taken_reward_list = 10; + * optional uint32 level = 10; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 level = 10; + * @return this + */ + public RogueHandbookAeon clearLevel() { + bitField0_ &= ~0x00000004; + 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 RogueHandbookAeon setLevel(final int value) { + bitField0_ |= 0x00000004; + level = value; + return this; + } + + /** + * optional uint32 max_level = 14; + * @return whether the maxLevel field is set + */ + public boolean hasMaxLevel() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 max_level = 14; + * @return this + */ + public RogueHandbookAeon clearMaxLevel() { + bitField0_ &= ~0x00000008; + maxLevel = 0; + return this; + } + + /** + * optional uint32 max_level = 14; + * @return the maxLevel + */ + public int getMaxLevel() { + return maxLevel; + } + + /** + * optional uint32 max_level = 14; + * @param value the maxLevel to set + * @return this + */ + public RogueHandbookAeon setMaxLevel(final int value) { + bitField0_ |= 0x00000008; + maxLevel = value; + return this; + } + + /** + * 
+     *  BODAGGMFDMJ
+     *
+ * + * repeated uint32 taken_reward_list = 7; * @return whether the takenRewardList field is set */ public boolean hasTakenRewardList() { @@ -216,7 +228,11 @@ public final class RogueHandbookAeonOuterClass { } /** - * repeated uint32 taken_reward_list = 10; + * 
+     *  BODAGGMFDMJ
+     *
+ * + * repeated uint32 taken_reward_list = 7; * @return this */ public RogueHandbookAeon clearTakenRewardList() { @@ -226,7 +242,11 @@ public final class RogueHandbookAeonOuterClass { } /** - * repeated uint32 taken_reward_list = 10; + * 
+     *  BODAGGMFDMJ
+     *
+ * + * repeated uint32 taken_reward_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. @@ -240,7 +260,11 @@ public final class RogueHandbookAeonOuterClass { } /** - * repeated uint32 taken_reward_list = 10; + * 
+     *  BODAGGMFDMJ
+     *
+ * + * repeated uint32 taken_reward_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 @@ -254,7 +278,11 @@ public final class RogueHandbookAeonOuterClass { } /** - * repeated uint32 taken_reward_list = 10; + * 
+     *  BODAGGMFDMJ
+     *
+ * + * repeated uint32 taken_reward_list = 7; * @param value the takenRewardList to add * @return this */ @@ -265,7 +293,11 @@ public final class RogueHandbookAeonOuterClass { } /** - * repeated uint32 taken_reward_list = 10; + * 
+     *  BODAGGMFDMJ
+     *
+ * + * repeated uint32 taken_reward_list = 7; * @param values the takenRewardList to add * @return this */ @@ -276,7 +308,11 @@ public final class RogueHandbookAeonOuterClass { } /** - * repeated uint32 archive_unlock_list = 13; + * 
+     *  KPFEEKHKANG
+     *
+ * + * repeated uint32 archive_unlock_list = 15; * @return whether the archiveUnlockList field is set */ public boolean hasArchiveUnlockList() { @@ -284,7 +320,11 @@ public final class RogueHandbookAeonOuterClass { } /** - * repeated uint32 archive_unlock_list = 13; + * 
+     *  KPFEEKHKANG
+     *
+ * + * repeated uint32 archive_unlock_list = 15; * @return this */ public RogueHandbookAeon clearArchiveUnlockList() { @@ -294,7 +334,11 @@ public final class RogueHandbookAeonOuterClass { } /** - * repeated uint32 archive_unlock_list = 13; + * 
+     *  KPFEEKHKANG
+     *
+ * + * repeated uint32 archive_unlock_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. @@ -308,7 +352,11 @@ public final class RogueHandbookAeonOuterClass { } /** - * repeated uint32 archive_unlock_list = 13; + * 
+     *  KPFEEKHKANG
+     *
+ * + * repeated uint32 archive_unlock_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 @@ -322,7 +370,11 @@ public final class RogueHandbookAeonOuterClass { } /** - * repeated uint32 archive_unlock_list = 13; + * 
+     *  KPFEEKHKANG
+     *
+ * + * repeated uint32 archive_unlock_list = 15; * @param value the archiveUnlockList to add * @return this */ @@ -333,7 +385,11 @@ public final class RogueHandbookAeonOuterClass { } /** - * repeated uint32 archive_unlock_list = 13; + * 
+     *  KPFEEKHKANG
+     *
+ * + * repeated uint32 archive_unlock_list = 15; * @param values the archiveUnlockList to add * @return this */ @@ -349,9 +405,9 @@ public final class RogueHandbookAeonOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; aeonId = other.aeonId; + exp = other.exp; level = other.level; maxLevel = other.maxLevel; - exp = other.exp; takenRewardList.copyFrom(other.takenRewardList); archiveUnlockList.copyFrom(other.archiveUnlockList); } @@ -367,15 +423,15 @@ public final class RogueHandbookAeonOuterClass { if (other.hasAeonId()) { setAeonId(other.aeonId); } + if (other.hasExp()) { + setExp(other.exp); + } if (other.hasLevel()) { setLevel(other.level); } if (other.hasMaxLevel()) { setMaxLevel(other.maxLevel); } - if (other.hasExp()) { - setExp(other.exp); - } if (other.hasTakenRewardList()) { getMutableTakenRewardList().addAll(other.takenRewardList); } @@ -393,9 +449,9 @@ public final class RogueHandbookAeonOuterClass { cachedSize = -1; bitField0_ = 0; aeonId = 0; + exp = 0; level = 0; maxLevel = 0; - exp = 0; takenRewardList.clear(); archiveUnlockList.clear(); return this; @@ -424,9 +480,9 @@ public final class RogueHandbookAeonOuterClass { RogueHandbookAeon other = (RogueHandbookAeon) o; return bitField0_ == other.bitField0_ && (!hasAeonId() || aeonId == other.aeonId) + && (!hasExp() || exp == other.exp) && (!hasLevel() || level == other.level) && (!hasMaxLevel() || maxLevel == other.maxLevel) - && (!hasExp() || exp == other.exp) && (!hasTakenRewardList() || takenRewardList.equals(other.takenRewardList)) && (!hasArchiveUnlockList() || archiveUnlockList.equals(other.archiveUnlockList)); } @@ -434,30 +490,30 @@ public final class RogueHandbookAeonOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(aeonId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(maxLevel); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(exp); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(maxLevel); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < takenRewardList.length(); i++) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(takenRewardList.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < archiveUnlockList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(archiveUnlockList.array()[i]); } } @@ -470,13 +526,13 @@ public final class RogueHandbookAeonOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(maxLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(maxLevel); } if ((bitField0_ & 0x00000010) != 0) { size += (1 * takenRewardList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(takenRewardList); @@ -494,52 +550,52 @@ public final class RogueHandbookAeonOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 40: { // aeonId aeonId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 48) { break; } } - case 32: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // maxLevel - maxLevel = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 48: { // exp exp = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { + if (tag != 80) { break; } } - case 82: { + case 80: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // maxLevel + maxLevel = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { // takenRewardList [packed=true] input.readPackedUInt32(takenRewardList, tag); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 106) { + if (tag != 122) { break; } } - case 106: { + case 122: { // archiveUnlockList [packed=true] input.readPackedUInt32(archiveUnlockList, tag); bitField0_ |= 0x00000020; @@ -558,13 +614,13 @@ public final class RogueHandbookAeonOuterClass { tag = input.readTag(); break; } - case 80: { + case 56: { // takenRewardList [packed=false] tag = input.readRepeatedUInt32(takenRewardList, tag); bitField0_ |= 0x00000010; break; } - case 104: { + case 120: { // archiveUnlockList [packed=false] tag = input.readRepeatedUInt32(archiveUnlockList, tag); bitField0_ |= 0x00000020; @@ -581,13 +637,13 @@ public final class RogueHandbookAeonOuterClass { output.writeUInt32(FieldNames.aeonId, aeonId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.exp, exp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.maxLevel, maxLevel); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.exp, exp); + output.writeUInt32(FieldNames.maxLevel, maxLevel); } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedUInt32(FieldNames.takenRewardList, takenRewardList); @@ -617,11 +673,22 @@ public final class RogueHandbookAeonOuterClass { } break; } + case 100893: { + if (input.isAtField(FieldNames.exp)) { + if (!input.trySkipNullValue()) { + exp = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 102865796: { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -633,17 +700,6 @@ public final class RogueHandbookAeonOuterClass { if (input.isAtField(FieldNames.maxLevel)) { if (!input.trySkipNullValue()) { maxLevel = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 100893: { - if (input.isAtField(FieldNames.exp)) { - if (!input.trySkipNullValue()) { - exp = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -730,12 +786,12 @@ public final class RogueHandbookAeonOuterClass { static class FieldNames { static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id"); + static final FieldName exp = FieldName.forField("exp"); + static final FieldName level = FieldName.forField("level"); static final FieldName maxLevel = FieldName.forField("maxLevel", "max_level"); - static final FieldName exp = FieldName.forField("exp"); - static final FieldName takenRewardList = FieldName.forField("takenRewardList", "taken_reward_list"); 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 2b11682..267438d 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 = 8; + * optional uint32 buff_id = 7; */ private int buffId; @@ -34,7 +34,7 @@ public final class RogueHandbookBuffOuterClass { } /** - * optional uint32 buff_id = 8; + * optional uint32 buff_id = 7; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -42,7 +42,7 @@ public final class RogueHandbookBuffOuterClass { } /** - * optional uint32 buff_id = 8; + * optional uint32 buff_id = 7; * @return this */ public RogueHandbookBuff clearBuffId() { @@ -52,7 +52,7 @@ public final class RogueHandbookBuffOuterClass { } /** - * optional uint32 buff_id = 8; + * optional uint32 buff_id = 7; * @return the buffId */ public int getBuffId() { @@ -60,7 +60,7 @@ public final class RogueHandbookBuffOuterClass { } /** - * optional uint32 buff_id = 8; + * optional uint32 buff_id = 7; * @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) 64); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(buffId); } } @@ -150,7 +150,7 @@ public final class RogueHandbookBuffOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 56: { // 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 e8c6dd7..a5da412 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueHandbookDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookDataOuterClass.java @@ -20,25 +20,25 @@ public final class RogueHandbookDataOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .RogueHandbookBuff buff_list = 3; - */ - private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(RogueHandbookBuffOuterClass.RogueHandbookBuff.getFactory()); - - /** - * repeated .RogueHandbookMiracle miracle_list = 4; + * repeated .RogueHandbookMiracle miracle_list = 5; */ private final RepeatedMessage miracleList = RepeatedMessage.newEmptyInstance(RogueHandbookMiracleOuterClass.RogueHandbookMiracle.getFactory()); /** - * repeated .RogueHandbookAeon rogue_aeon_list = 9; + * repeated .RogueHandbookBuff buff_list = 10; */ - private final RepeatedMessage rogueAeonList = RepeatedMessage.newEmptyInstance(RogueHandbookAeonOuterClass.RogueHandbookAeon.getFactory()); + private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(RogueHandbookBuffOuterClass.RogueHandbookBuff.getFactory()); /** * repeated .RogueHandbookEvent rogue_event = 12; */ private final RepeatedMessage rogueEvent = RepeatedMessage.newEmptyInstance(RogueHandbookEventOuterClass.RogueHandbookEvent.getFactory()); + /** + * repeated .RogueHandbookAeon rogue_aeon_list = 15; + */ + private final RepeatedMessage rogueAeonList = RepeatedMessage.newEmptyInstance(RogueHandbookAeonOuterClass.RogueHandbookAeon.getFactory()); + private RogueHandbookData() { } @@ -50,95 +50,25 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookBuff buff_list = 3; - * @return whether the buffList field is set + * repeated .RogueHandbookMiracle miracle_list = 5; + * @return whether the miracleList field is set */ - public boolean hasBuffList() { + public boolean hasMiracleList() { return (bitField0_ & 0x00000001) != 0; } /** - * repeated .RogueHandbookBuff buff_list = 3; - * @return this - */ - public RogueHandbookData clearBuffList() { - bitField0_ &= ~0x00000001; - buffList.clear(); - return this; - } - - /** - * repeated .RogueHandbookBuff buff_list = 3; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableBuffList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getBuffList() { - return buffList; - } - - /** - * repeated .RogueHandbookBuff buff_list = 3; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableBuffList() { - bitField0_ |= 0x00000001; - return buffList; - } - - /** - * repeated .RogueHandbookBuff buff_list = 3; - * @param value the buffList to add - * @return this - */ - public RogueHandbookData addBuffList( - final RogueHandbookBuffOuterClass.RogueHandbookBuff value) { - bitField0_ |= 0x00000001; - buffList.add(value); - return this; - } - - /** - * repeated .RogueHandbookBuff buff_list = 3; - * @param values the buffList to add - * @return this - */ - public RogueHandbookData addAllBuffList( - final RogueHandbookBuffOuterClass.RogueHandbookBuff... values) { - bitField0_ |= 0x00000001; - buffList.addAll(values); - return this; - } - - /** - * repeated .RogueHandbookMiracle miracle_list = 4; - * @return whether the miracleList field is set - */ - public boolean hasMiracleList() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * repeated .RogueHandbookMiracle miracle_list = 4; + * repeated .RogueHandbookMiracle miracle_list = 5; * @return this */ public RogueHandbookData clearMiracleList() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; miracleList.clear(); return this; } /** - * repeated .RogueHandbookMiracle miracle_list = 4; + * repeated .RogueHandbookMiracle miracle_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 +82,7 @@ public final class RogueHandbookDataOuterClass { } /** - * repeated .RogueHandbookMiracle miracle_list = 4; + * repeated .RogueHandbookMiracle miracle_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 @@ -162,68 +92,68 @@ public final class RogueHandbookDataOuterClass { */ public RepeatedMessage getMutableMiracleList( ) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return miracleList; } /** - * repeated .RogueHandbookMiracle miracle_list = 4; + * repeated .RogueHandbookMiracle miracle_list = 5; * @param value the miracleList to add * @return this */ public RogueHandbookData addMiracleList( final RogueHandbookMiracleOuterClass.RogueHandbookMiracle value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; miracleList.add(value); return this; } /** - * repeated .RogueHandbookMiracle miracle_list = 4; + * repeated .RogueHandbookMiracle miracle_list = 5; * @param values the miracleList to add * @return this */ public RogueHandbookData addAllMiracleList( final RogueHandbookMiracleOuterClass.RogueHandbookMiracle... values) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; miracleList.addAll(values); return this; } /** - * repeated .RogueHandbookAeon rogue_aeon_list = 9; - * @return whether the rogueAeonList field is set + * repeated .RogueHandbookBuff buff_list = 10; + * @return whether the buffList field is set */ - public boolean hasRogueAeonList() { - return (bitField0_ & 0x00000004) != 0; + public boolean hasBuffList() { + return (bitField0_ & 0x00000002) != 0; } /** - * repeated .RogueHandbookAeon rogue_aeon_list = 9; + * repeated .RogueHandbookBuff buff_list = 10; * @return this */ - public RogueHandbookData clearRogueAeonList() { - bitField0_ &= ~0x00000004; - rogueAeonList.clear(); + public RogueHandbookData clearBuffList() { + bitField0_ &= ~0x00000002; + buffList.clear(); return this; } /** - * repeated .RogueHandbookAeon rogue_aeon_list = 9; + * repeated .RogueHandbookBuff buff_list = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableRogueAeonList()} if you want to modify it. + * Use {@link #getMutableBuffList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getRogueAeonList() { - return rogueAeonList; + public RepeatedMessage getBuffList() { + return buffList; } /** - * repeated .RogueHandbookAeon rogue_aeon_list = 9; + * repeated .RogueHandbookBuff buff_list = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -231,33 +161,32 @@ public final class RogueHandbookDataOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableRogueAeonList( - ) { - bitField0_ |= 0x00000004; - return rogueAeonList; + public RepeatedMessage getMutableBuffList() { + bitField0_ |= 0x00000002; + return buffList; } /** - * repeated .RogueHandbookAeon rogue_aeon_list = 9; - * @param value the rogueAeonList to add + * repeated .RogueHandbookBuff buff_list = 10; + * @param value the buffList to add * @return this */ - public RogueHandbookData addRogueAeonList( - final RogueHandbookAeonOuterClass.RogueHandbookAeon value) { - bitField0_ |= 0x00000004; - rogueAeonList.add(value); + public RogueHandbookData addBuffList( + final RogueHandbookBuffOuterClass.RogueHandbookBuff value) { + bitField0_ |= 0x00000002; + buffList.add(value); return this; } /** - * repeated .RogueHandbookAeon rogue_aeon_list = 9; - * @param values the rogueAeonList to add + * repeated .RogueHandbookBuff buff_list = 10; + * @param values the buffList to add * @return this */ - public RogueHandbookData addAllRogueAeonList( - final RogueHandbookAeonOuterClass.RogueHandbookAeon... values) { - bitField0_ |= 0x00000004; - rogueAeonList.addAll(values); + public RogueHandbookData addAllBuffList( + final RogueHandbookBuffOuterClass.RogueHandbookBuff... values) { + bitField0_ |= 0x00000002; + buffList.addAll(values); return this; } @@ -266,7 +195,7 @@ public final class RogueHandbookDataOuterClass { * @return whether the rogueEvent field is set */ public boolean hasRogueEvent() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -274,7 +203,7 @@ public final class RogueHandbookDataOuterClass { * @return this */ public RogueHandbookData clearRogueEvent() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; rogueEvent.clear(); return this; } @@ -303,7 +232,7 @@ public final class RogueHandbookDataOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableRogueEvent() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return rogueEvent; } @@ -314,7 +243,7 @@ public final class RogueHandbookDataOuterClass { */ public RogueHandbookData addRogueEvent( final RogueHandbookEventOuterClass.RogueHandbookEvent value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; rogueEvent.add(value); return this; } @@ -326,20 +255,91 @@ public final class RogueHandbookDataOuterClass { */ public RogueHandbookData addAllRogueEvent( final RogueHandbookEventOuterClass.RogueHandbookEvent... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; rogueEvent.addAll(values); return this; } + /** + * repeated .RogueHandbookAeon rogue_aeon_list = 15; + * @return whether the rogueAeonList field is set + */ + public boolean hasRogueAeonList() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * repeated .RogueHandbookAeon rogue_aeon_list = 15; + * @return this + */ + public RogueHandbookData clearRogueAeonList() { + bitField0_ &= ~0x00000008; + rogueAeonList.clear(); + return this; + } + + /** + * repeated .RogueHandbookAeon rogue_aeon_list = 15; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableRogueAeonList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getRogueAeonList() { + return rogueAeonList; + } + + /** + * repeated .RogueHandbookAeon rogue_aeon_list = 15; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableRogueAeonList( + ) { + bitField0_ |= 0x00000008; + return rogueAeonList; + } + + /** + * repeated .RogueHandbookAeon rogue_aeon_list = 15; + * @param value the rogueAeonList to add + * @return this + */ + public RogueHandbookData addRogueAeonList( + final RogueHandbookAeonOuterClass.RogueHandbookAeon value) { + bitField0_ |= 0x00000008; + rogueAeonList.add(value); + return this; + } + + /** + * repeated .RogueHandbookAeon rogue_aeon_list = 15; + * @param values the rogueAeonList to add + * @return this + */ + public RogueHandbookData addAllRogueAeonList( + final RogueHandbookAeonOuterClass.RogueHandbookAeon... values) { + bitField0_ |= 0x00000008; + rogueAeonList.addAll(values); + return this; + } + @Override public RogueHandbookData copyFrom(final RogueHandbookData other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - buffList.copyFrom(other.buffList); miracleList.copyFrom(other.miracleList); - rogueAeonList.copyFrom(other.rogueAeonList); + buffList.copyFrom(other.buffList); rogueEvent.copyFrom(other.rogueEvent); + rogueAeonList.copyFrom(other.rogueAeonList); } return this; } @@ -350,18 +350,18 @@ public final class RogueHandbookDataOuterClass { return this; } cachedSize = -1; - if (other.hasBuffList()) { - getMutableBuffList().addAll(other.buffList); - } if (other.hasMiracleList()) { getMutableMiracleList().addAll(other.miracleList); } - if (other.hasRogueAeonList()) { - getMutableRogueAeonList().addAll(other.rogueAeonList); + if (other.hasBuffList()) { + getMutableBuffList().addAll(other.buffList); } if (other.hasRogueEvent()) { getMutableRogueEvent().addAll(other.rogueEvent); } + if (other.hasRogueAeonList()) { + getMutableRogueAeonList().addAll(other.rogueAeonList); + } return this; } @@ -372,10 +372,10 @@ public final class RogueHandbookDataOuterClass { } cachedSize = -1; bitField0_ = 0; - buffList.clear(); miracleList.clear(); - rogueAeonList.clear(); + buffList.clear(); rogueEvent.clear(); + rogueAeonList.clear(); return this; } @@ -386,10 +386,10 @@ public final class RogueHandbookDataOuterClass { } cachedSize = -1; bitField0_ = 0; - buffList.clearQuick(); miracleList.clearQuick(); - rogueAeonList.clearQuick(); + buffList.clearQuick(); rogueEvent.clearQuick(); + rogueAeonList.clearQuick(); return this; } @@ -403,54 +403,54 @@ public final class RogueHandbookDataOuterClass { } RogueHandbookData other = (RogueHandbookData) o; return bitField0_ == other.bitField0_ - && (!hasBuffList() || buffList.equals(other.buffList)) && (!hasMiracleList() || miracleList.equals(other.miracleList)) - && (!hasRogueAeonList() || rogueAeonList.equals(other.rogueAeonList)) - && (!hasRogueEvent() || rogueEvent.equals(other.rogueEvent)); + && (!hasBuffList() || buffList.equals(other.buffList)) + && (!hasRogueEvent() || rogueEvent.equals(other.rogueEvent)) + && (!hasRogueAeonList() || rogueAeonList.equals(other.rogueAeonList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(buffList.get(i)); - } - } - if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < miracleList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 42); output.writeMessageNoTag(miracleList.get(i)); } } - if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < rogueAeonList.length(); i++) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(rogueAeonList.get(i)); + if ((bitField0_ & 0x00000002) != 0) { + for (int i = 0; i < buffList.length(); i++) { + output.writeRawByte((byte) 82); + output.writeMessageNoTag(buffList.get(i)); } } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < rogueEvent.length(); i++) { output.writeRawByte((byte) 98); output.writeMessageNoTag(rogueEvent.get(i)); } } + if ((bitField0_ & 0x00000008) != 0) { + for (int i = 0; i < rogueAeonList.length(); i++) { + output.writeRawByte((byte) 122); + output.writeMessageNoTag(rogueAeonList.get(i)); + } + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList); - } - if ((bitField0_ & 0x00000002) != 0) { size += (1 * miracleList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(miracleList); } + if ((bitField0_ & 0x00000002) != 0) { + size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList); + } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * rogueAeonList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueAeonList); + size += (1 * rogueEvent.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueEvent); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * rogueEvent.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueEvent); + size += (1 * rogueAeonList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueAeonList); } return size; } @@ -462,26 +462,18 @@ public final class RogueHandbookDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { - // buffList - tag = input.readRepeatedMessage(buffList, tag); - bitField0_ |= 0x00000001; - if (tag != 34) { - break; - } - } - case 34: { + case 42: { // miracleList tag = input.readRepeatedMessage(miracleList, tag); - bitField0_ |= 0x00000002; - if (tag != 74) { + bitField0_ |= 0x00000001; + if (tag != 82) { break; } } - case 74: { - // rogueAeonList - tag = input.readRepeatedMessage(rogueAeonList, tag); - bitField0_ |= 0x00000004; + case 82: { + // buffList + tag = input.readRepeatedMessage(buffList, tag); + bitField0_ |= 0x00000002; if (tag != 98) { break; } @@ -489,6 +481,14 @@ public final class RogueHandbookDataOuterClass { case 98: { // rogueEvent tag = input.readRepeatedMessage(rogueEvent, tag); + bitField0_ |= 0x00000004; + if (tag != 122) { + break; + } + } + case 122: { + // rogueAeonList + tag = input.readRepeatedMessage(rogueAeonList, tag); bitField0_ |= 0x00000008; if (tag != 0) { break; @@ -512,16 +512,16 @@ public final class RogueHandbookDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeRepeatedMessage(FieldNames.buffList, buffList); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedMessage(FieldNames.miracleList, miracleList); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRepeatedMessage(FieldNames.buffList, buffList); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.rogueAeonList, rogueAeonList); + output.writeRepeatedMessage(FieldNames.rogueEvent, rogueEvent); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedMessage(FieldNames.rogueEvent, rogueEvent); + output.writeRepeatedMessage(FieldNames.rogueAeonList, rogueAeonList); } output.endObject(); } @@ -533,11 +533,11 @@ public final class RogueHandbookDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1522789487: - case 55792906: { - if (input.isAtField(FieldNames.buffList)) { + case 760391855: + case 2114937772: { + if (input.isAtField(FieldNames.miracleList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(buffList); + input.readRepeatedMessage(miracleList); bitField0_ |= 0x00000001; } } else { @@ -545,11 +545,11 @@ public final class RogueHandbookDataOuterClass { } break; } - case 760391855: - case 2114937772: { - if (input.isAtField(FieldNames.miracleList)) { + case -1522789487: + case 55792906: { + if (input.isAtField(FieldNames.buffList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(miracleList); + input.readRepeatedMessage(buffList); bitField0_ |= 0x00000002; } } else { @@ -557,23 +557,23 @@ public final class RogueHandbookDataOuterClass { } break; } - case -1684933573: - case -1375837643: { - if (input.isAtField(FieldNames.rogueAeonList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(rogueAeonList); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -1148216096: case -505804811: { if (input.isAtField(FieldNames.rogueEvent)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(rogueEvent); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1684933573: + case -1375837643: { + if (input.isAtField(FieldNames.rogueAeonList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(rogueAeonList); bitField0_ |= 0x00000008; } } else { @@ -634,13 +634,13 @@ public final class RogueHandbookDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName buffList = FieldName.forField("buffList", "buff_list"); - 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 rogueEvent = FieldName.forField("rogueEvent", "rogue_event"); + + static final FieldName rogueAeonList = FieldName.forField("rogueAeonList", "rogue_aeon_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookEventOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookEventOuterClass.java index 071d6f2..15db84e 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueHandbookEventOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookEventOuterClass.java @@ -20,19 +20,19 @@ public final class RogueHandbookEventOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 event_id = 6; + * optional uint32 event_id = 7; */ private int eventId; /** - * optional bool is_unlocked = 13; + * optional bool is_unlocked = 2; */ private boolean isUnlocked; /** - * repeated uint32 MPFGCHIBGMO = 3; + * repeated uint32 MDALHHJKHNJ = 6; */ - private final RepeatedInt mPFGCHIBGMO = RepeatedInt.newEmptyInstance(); + private final RepeatedInt mDALHHJKHNJ = RepeatedInt.newEmptyInstance(); private RogueHandbookEvent() { } @@ -45,7 +45,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional uint32 event_id = 6; + * optional uint32 event_id = 7; * @return whether the eventId field is set */ public boolean hasEventId() { @@ -53,7 +53,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional uint32 event_id = 6; + * optional uint32 event_id = 7; * @return this */ public RogueHandbookEvent clearEventId() { @@ -63,7 +63,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional uint32 event_id = 6; + * optional uint32 event_id = 7; * @return the eventId */ public int getEventId() { @@ -71,7 +71,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional uint32 event_id = 6; + * optional uint32 event_id = 7; * @param value the eventId to set * @return this */ @@ -82,7 +82,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional bool is_unlocked = 13; + * optional bool is_unlocked = 2; * @return whether the isUnlocked field is set */ public boolean hasIsUnlocked() { @@ -90,7 +90,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional bool is_unlocked = 13; + * optional bool is_unlocked = 2; * @return this */ public RogueHandbookEvent clearIsUnlocked() { @@ -100,7 +100,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional bool is_unlocked = 13; + * optional bool is_unlocked = 2; * @return the isUnlocked */ public boolean getIsUnlocked() { @@ -108,7 +108,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional bool is_unlocked = 13; + * optional bool is_unlocked = 2; * @param value the isUnlocked to set * @return this */ @@ -119,39 +119,39 @@ public final class RogueHandbookEventOuterClass { } /** - * repeated uint32 MPFGCHIBGMO = 3; - * @return whether the mPFGCHIBGMO field is set + * repeated uint32 MDALHHJKHNJ = 6; + * @return whether the mDALHHJKHNJ field is set */ - public boolean hasMPFGCHIBGMO() { + public boolean hasMDALHHJKHNJ() { return (bitField0_ & 0x00000004) != 0; } /** - * repeated uint32 MPFGCHIBGMO = 3; + * repeated uint32 MDALHHJKHNJ = 6; * @return this */ - public RogueHandbookEvent clearMPFGCHIBGMO() { + public RogueHandbookEvent clearMDALHHJKHNJ() { bitField0_ &= ~0x00000004; - mPFGCHIBGMO.clear(); + mDALHHJKHNJ.clear(); return this; } /** - * repeated uint32 MPFGCHIBGMO = 3; + * repeated uint32 MDALHHJKHNJ = 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 #getMutableMPFGCHIBGMO()} if you want to modify it. + * Use {@link #getMutableMDALHHJKHNJ()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getMPFGCHIBGMO() { - return mPFGCHIBGMO; + public RepeatedInt getMDALHHJKHNJ() { + return mDALHHJKHNJ; } /** - * repeated uint32 MPFGCHIBGMO = 3; + * repeated uint32 MDALHHJKHNJ = 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 @@ -159,30 +159,30 @@ public final class RogueHandbookEventOuterClass { * * @return internal storage object for modifications */ - public RepeatedInt getMutableMPFGCHIBGMO() { + public RepeatedInt getMutableMDALHHJKHNJ() { bitField0_ |= 0x00000004; - return mPFGCHIBGMO; + return mDALHHJKHNJ; } /** - * repeated uint32 MPFGCHIBGMO = 3; - * @param value the mPFGCHIBGMO to add + * repeated uint32 MDALHHJKHNJ = 6; + * @param value the mDALHHJKHNJ to add * @return this */ - public RogueHandbookEvent addMPFGCHIBGMO(final int value) { + public RogueHandbookEvent addMDALHHJKHNJ(final int value) { bitField0_ |= 0x00000004; - mPFGCHIBGMO.add(value); + mDALHHJKHNJ.add(value); return this; } /** - * repeated uint32 MPFGCHIBGMO = 3; - * @param values the mPFGCHIBGMO to add + * repeated uint32 MDALHHJKHNJ = 6; + * @param values the mDALHHJKHNJ to add * @return this */ - public RogueHandbookEvent addAllMPFGCHIBGMO(final int... values) { + public RogueHandbookEvent addAllMDALHHJKHNJ(final int... values) { bitField0_ |= 0x00000004; - mPFGCHIBGMO.addAll(values); + mDALHHJKHNJ.addAll(values); return this; } @@ -193,7 +193,7 @@ public final class RogueHandbookEventOuterClass { bitField0_ = other.bitField0_; eventId = other.eventId; isUnlocked = other.isUnlocked; - mPFGCHIBGMO.copyFrom(other.mPFGCHIBGMO); + mDALHHJKHNJ.copyFrom(other.mDALHHJKHNJ); } return this; } @@ -210,8 +210,8 @@ public final class RogueHandbookEventOuterClass { if (other.hasIsUnlocked()) { setIsUnlocked(other.isUnlocked); } - if (other.hasMPFGCHIBGMO()) { - getMutableMPFGCHIBGMO().addAll(other.mPFGCHIBGMO); + if (other.hasMDALHHJKHNJ()) { + getMutableMDALHHJKHNJ().addAll(other.mDALHHJKHNJ); } return this; } @@ -225,7 +225,7 @@ public final class RogueHandbookEventOuterClass { bitField0_ = 0; eventId = 0; isUnlocked = false; - mPFGCHIBGMO.clear(); + mDALHHJKHNJ.clear(); return this; } @@ -236,7 +236,7 @@ public final class RogueHandbookEventOuterClass { } cachedSize = -1; bitField0_ = 0; - mPFGCHIBGMO.clear(); + mDALHHJKHNJ.clear(); return this; } @@ -252,23 +252,23 @@ public final class RogueHandbookEventOuterClass { return bitField0_ == other.bitField0_ && (!hasEventId() || eventId == other.eventId) && (!hasIsUnlocked() || isUnlocked == other.isUnlocked) - && (!hasMPFGCHIBGMO() || mPFGCHIBGMO.equals(other.mPFGCHIBGMO)); + && (!hasMDALHHJKHNJ() || mDALHHJKHNJ.equals(other.mDALHHJKHNJ)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(eventId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 16); output.writeBoolNoTag(isUnlocked); } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < mPFGCHIBGMO.length(); i++) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(mPFGCHIBGMO.array()[i]); + for (int i = 0; i < mDALHHJKHNJ.length(); i++) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(mDALHHJKHNJ.array()[i]); } } } @@ -283,7 +283,7 @@ public final class RogueHandbookEventOuterClass { size += 2; } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * mPFGCHIBGMO.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mPFGCHIBGMO); + size += (1 * mDALHHJKHNJ.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mDALHHJKHNJ); } return size; } @@ -295,27 +295,27 @@ public final class RogueHandbookEventOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 56: { // eventId eventId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 16) { break; } } - case 104: { + case 16: { // isUnlocked isUnlocked = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { + if (tag != 50) { break; } } - case 26: { - // mPFGCHIBGMO [packed=true] - input.readPackedUInt32(mPFGCHIBGMO, tag); + case 50: { + // mDALHHJKHNJ [packed=true] + input.readPackedUInt32(mDALHHJKHNJ, tag); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -332,9 +332,9 @@ public final class RogueHandbookEventOuterClass { tag = input.readTag(); break; } - case 24: { - // mPFGCHIBGMO [packed=false] - tag = input.readRepeatedUInt32(mPFGCHIBGMO, tag); + case 48: { + // mDALHHJKHNJ [packed=false] + tag = input.readRepeatedUInt32(mDALHHJKHNJ, tag); bitField0_ |= 0x00000004; break; } @@ -352,7 +352,7 @@ public final class RogueHandbookEventOuterClass { output.writeBool(FieldNames.isUnlocked, isUnlocked); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.mPFGCHIBGMO, mPFGCHIBGMO); + output.writeRepeatedUInt32(FieldNames.mDALHHJKHNJ, mDALHHJKHNJ); } output.endObject(); } @@ -388,10 +388,10 @@ public final class RogueHandbookEventOuterClass { } break; } - case -785833721: { - if (input.isAtField(FieldNames.mPFGCHIBGMO)) { + case -2007440415: { + if (input.isAtField(FieldNames.mDALHHJKHNJ)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(mPFGCHIBGMO); + input.readRepeatedUInt32(mDALHHJKHNJ); bitField0_ |= 0x00000004; } } else { @@ -456,7 +456,7 @@ public final class RogueHandbookEventOuterClass { static final FieldName isUnlocked = FieldName.forField("isUnlocked", "is_unlocked"); - static final FieldName mPFGCHIBGMO = FieldName.forField("MPFGCHIBGMO"); + static final FieldName mDALHHJKHNJ = FieldName.forField("MDALHHJKHNJ"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java index c69ef93..9c1e13e 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java @@ -19,12 +19,12 @@ public final class RogueHandbookMiracleOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 miracle_id = 10; + * optional uint32 miracle_id = 3; */ private int miracleId; /** - * optional bool is_unlocked = 4; + * optional bool is_unlocked = 14; */ private boolean isUnlocked; @@ -39,7 +39,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional uint32 miracle_id = 10; + * optional uint32 miracle_id = 3; * @return whether the miracleId field is set */ public boolean hasMiracleId() { @@ -47,7 +47,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional uint32 miracle_id = 10; + * optional uint32 miracle_id = 3; * @return this */ public RogueHandbookMiracle clearMiracleId() { @@ -57,7 +57,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional uint32 miracle_id = 10; + * optional uint32 miracle_id = 3; * @return the miracleId */ public int getMiracleId() { @@ -65,7 +65,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional uint32 miracle_id = 10; + * optional uint32 miracle_id = 3; * @param value the miracleId to set * @return this */ @@ -76,7 +76,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional bool is_unlocked = 4; + * optional bool is_unlocked = 14; * @return whether the isUnlocked field is set */ public boolean hasIsUnlocked() { @@ -84,7 +84,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional bool is_unlocked = 4; + * optional bool is_unlocked = 14; * @return this */ public RogueHandbookMiracle clearIsUnlocked() { @@ -94,7 +94,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional bool is_unlocked = 4; + * optional bool is_unlocked = 14; * @return the isUnlocked */ public boolean getIsUnlocked() { @@ -102,7 +102,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional bool is_unlocked = 4; + * optional bool is_unlocked = 14; * @param value the isUnlocked to set * @return this */ @@ -177,11 +177,11 @@ public final class RogueHandbookMiracleOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(miracleId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 112); output.writeBoolNoTag(isUnlocked); } } @@ -205,16 +205,16 @@ public final class RogueHandbookMiracleOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 24: { // miracleId miracleId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 112) { break; } } - case 32: { + case 112: { // isUnlocked isUnlocked = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java index 46342f2..4f9e2cf 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 .RogueSeasonInfo rogue_season_info = 3; + * optional .RogueAeonInfo rogue_aeon_info = 8; */ - private final RogueSeasonInfoOuterClass.RogueSeasonInfo rogueSeasonInfo = RogueSeasonInfoOuterClass.RogueSeasonInfo.newInstance(); + private final RogueAeonInfoOuterClass.RogueAeonInfo rogueAeonInfo = RogueAeonInfoOuterClass.RogueAeonInfo.newInstance(); /** - * optional .RogueScoreRewardInfo rogue_score_info = 4; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 9; */ - private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo rogueScoreInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); + private final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo rogueVirtualItemInfo = RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo.newInstance(); /** - * optional .RogueAreaInfo rogue_area_info = 7; + * optional .RogueAreaInfo rogue_area_info = 11; */ private final RogueAreaInfoOuterClass.RogueAreaInfo rogueAreaInfo = RogueAreaInfoOuterClass.RogueAreaInfo.newInstance(); /** - * optional .DMBBFODODOF EEFGNNFCDNJ = 10; + * optional .RogueSeasonInfo rogue_season_info = 12; */ - private final DMBBFODODOFOuterClass.DMBBFODODOF eEFGNNFCDNJ = DMBBFODODOFOuterClass.DMBBFODODOF.newInstance(); + private final RogueSeasonInfoOuterClass.RogueSeasonInfo rogueSeasonInfo = RogueSeasonInfoOuterClass.RogueSeasonInfo.newInstance(); /** - * optional .RogueAeonInfo rogue_aeon_info = 11; + * optional .RogueScoreRewardInfo rogue_score_info = 15; */ - private final RogueAeonInfoOuterClass.RogueAeonInfo rogueAeonInfo = RogueAeonInfoOuterClass.RogueAeonInfo.newInstance(); + private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo rogueScoreInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); private RogueInfoData() { } @@ -54,254 +54,25 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueSeasonInfo rogue_season_info = 3; - * @return whether the rogueSeasonInfo field is set + * optional .RogueAeonInfo rogue_aeon_info = 8; + * @return whether the rogueAeonInfo field is set */ - public boolean hasRogueSeasonInfo() { + public boolean hasRogueAeonInfo() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .RogueSeasonInfo rogue_season_info = 3; - * @return this - */ - public RogueInfoData clearRogueSeasonInfo() { - bitField0_ &= ~0x00000001; - rogueSeasonInfo.clear(); - return this; - } - - /** - * optional .RogueSeasonInfo rogue_season_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 #getMutableRogueSeasonInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueSeasonInfoOuterClass.RogueSeasonInfo getRogueSeasonInfo() { - return rogueSeasonInfo; - } - - /** - * optional .RogueSeasonInfo rogue_season_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 RogueSeasonInfoOuterClass.RogueSeasonInfo getMutableRogueSeasonInfo() { - bitField0_ |= 0x00000001; - return rogueSeasonInfo; - } - - /** - * optional .RogueSeasonInfo rogue_season_info = 3; - * @param value the rogueSeasonInfo to set - * @return this - */ - public RogueInfoData setRogueSeasonInfo(final RogueSeasonInfoOuterClass.RogueSeasonInfo value) { - bitField0_ |= 0x00000001; - rogueSeasonInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 4; - * @return whether the rogueScoreInfo field is set - */ - public boolean hasRogueScoreInfo() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 4; - * @return this - */ - public RogueInfoData clearRogueScoreInfo() { - bitField0_ &= ~0x00000002; - rogueScoreInfo.clear(); - return this; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 4; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * 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 = 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 RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableRogueScoreInfo() { - bitField0_ |= 0x00000002; - return rogueScoreInfo; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 4; - * @param value the rogueScoreInfo to set - * @return this - */ - public RogueInfoData setRogueScoreInfo( - final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { - bitField0_ |= 0x00000002; - rogueScoreInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueAreaInfo rogue_area_info = 7; - * @return whether the rogueAreaInfo field is set - */ - public boolean hasRogueAreaInfo() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .RogueAreaInfo rogue_area_info = 7; - * @return this - */ - public RogueInfoData clearRogueAreaInfo() { - bitField0_ &= ~0x00000004; - rogueAreaInfo.clear(); - return this; - } - - /** - * optional .RogueAreaInfo rogue_area_info = 7; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRogueAreaInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueAreaInfoOuterClass.RogueAreaInfo getRogueAreaInfo() { - return rogueAreaInfo; - } - - /** - * optional .RogueAreaInfo rogue_area_info = 7; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueAreaInfoOuterClass.RogueAreaInfo getMutableRogueAreaInfo() { - bitField0_ |= 0x00000004; - return rogueAreaInfo; - } - - /** - * optional .RogueAreaInfo rogue_area_info = 7; - * @param value the rogueAreaInfo to set - * @return this - */ - public RogueInfoData setRogueAreaInfo(final RogueAreaInfoOuterClass.RogueAreaInfo value) { - bitField0_ |= 0x00000004; - rogueAreaInfo.copyFrom(value); - return this; - } - - /** - * optional .DMBBFODODOF EEFGNNFCDNJ = 10; - * @return whether the eEFGNNFCDNJ field is set - */ - public boolean hasEEFGNNFCDNJ() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .DMBBFODODOF EEFGNNFCDNJ = 10; - * @return this - */ - public RogueInfoData clearEEFGNNFCDNJ() { - bitField0_ &= ~0x00000008; - eEFGNNFCDNJ.clear(); - return this; - } - - /** - * optional .DMBBFODODOF EEFGNNFCDNJ = 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 #getMutableEEFGNNFCDNJ()} if you want to modify it. - * - * @return internal storage object for reading - */ - public DMBBFODODOFOuterClass.DMBBFODODOF getEEFGNNFCDNJ() { - return eEFGNNFCDNJ; - } - - /** - * optional .DMBBFODODOF EEFGNNFCDNJ = 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 DMBBFODODOFOuterClass.DMBBFODODOF getMutableEEFGNNFCDNJ() { - bitField0_ |= 0x00000008; - return eEFGNNFCDNJ; - } - - /** - * optional .DMBBFODODOF EEFGNNFCDNJ = 10; - * @param value the eEFGNNFCDNJ to set - * @return this - */ - public RogueInfoData setEEFGNNFCDNJ(final DMBBFODODOFOuterClass.DMBBFODODOF value) { - bitField0_ |= 0x00000008; - eEFGNNFCDNJ.copyFrom(value); - return this; - } - - /** - * optional .RogueAeonInfo rogue_aeon_info = 11; - * @return whether the rogueAeonInfo field is set - */ - public boolean hasRogueAeonInfo() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .RogueAeonInfo rogue_aeon_info = 11; + * optional .RogueAeonInfo rogue_aeon_info = 8; * @return this */ public RogueInfoData clearRogueAeonInfo() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000001; rogueAeonInfo.clear(); return this; } /** - * optional .RogueAeonInfo rogue_aeon_info = 11; + * optional .RogueAeonInfo rogue_aeon_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. @@ -315,7 +86,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueAeonInfo rogue_aeon_info = 11; + * optional .RogueAeonInfo rogue_aeon_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 @@ -324,31 +95,261 @@ public final class RogueInfoDataOuterClass { * @return internal storage object for modifications */ public RogueAeonInfoOuterClass.RogueAeonInfo getMutableRogueAeonInfo() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000001; return rogueAeonInfo; } /** - * optional .RogueAeonInfo rogue_aeon_info = 11; + * optional .RogueAeonInfo rogue_aeon_info = 8; * @param value the rogueAeonInfo to set * @return this */ public RogueInfoData setRogueAeonInfo(final RogueAeonInfoOuterClass.RogueAeonInfo value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000001; rogueAeonInfo.copyFrom(value); return this; } + /** + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 9; + * @return whether the rogueVirtualItemInfo field is set + */ + public boolean hasRogueVirtualItemInfo() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 9; + * @return this + */ + public RogueInfoData clearRogueVirtualItemInfo() { + bitField0_ &= ~0x00000002; + rogueVirtualItemInfo.clear(); + return this; + } + + /** + * optional .RogueVirtualItemInfo rogue_virtual_item_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 #getMutableRogueVirtualItemInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo getRogueVirtualItemInfo() { + return rogueVirtualItemInfo; + } + + /** + * optional .RogueVirtualItemInfo rogue_virtual_item_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 RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo getMutableRogueVirtualItemInfo() { + bitField0_ |= 0x00000002; + return rogueVirtualItemInfo; + } + + /** + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 9; + * @param value the rogueVirtualItemInfo to set + * @return this + */ + public RogueInfoData setRogueVirtualItemInfo( + final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo value) { + bitField0_ |= 0x00000002; + rogueVirtualItemInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueAreaInfo rogue_area_info = 11; + * @return whether the rogueAreaInfo field is set + */ + public boolean hasRogueAreaInfo() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .RogueAreaInfo rogue_area_info = 11; + * @return this + */ + public RogueInfoData clearRogueAreaInfo() { + bitField0_ &= ~0x00000004; + rogueAreaInfo.clear(); + return this; + } + + /** + * optional .RogueAreaInfo rogue_area_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 #getMutableRogueAreaInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueAreaInfoOuterClass.RogueAreaInfo getRogueAreaInfo() { + return rogueAreaInfo; + } + + /** + * optional .RogueAreaInfo rogue_area_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 RogueAreaInfoOuterClass.RogueAreaInfo getMutableRogueAreaInfo() { + bitField0_ |= 0x00000004; + return rogueAreaInfo; + } + + /** + * optional .RogueAreaInfo rogue_area_info = 11; + * @param value the rogueAreaInfo to set + * @return this + */ + public RogueInfoData setRogueAreaInfo(final RogueAreaInfoOuterClass.RogueAreaInfo value) { + bitField0_ |= 0x00000004; + rogueAreaInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueSeasonInfo rogue_season_info = 12; + * @return whether the rogueSeasonInfo field is set + */ + public boolean hasRogueSeasonInfo() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .RogueSeasonInfo rogue_season_info = 12; + * @return this + */ + public RogueInfoData clearRogueSeasonInfo() { + bitField0_ &= ~0x00000008; + rogueSeasonInfo.clear(); + return this; + } + + /** + * optional .RogueSeasonInfo rogue_season_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 #getMutableRogueSeasonInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueSeasonInfoOuterClass.RogueSeasonInfo getRogueSeasonInfo() { + return rogueSeasonInfo; + } + + /** + * optional .RogueSeasonInfo rogue_season_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 RogueSeasonInfoOuterClass.RogueSeasonInfo getMutableRogueSeasonInfo() { + bitField0_ |= 0x00000008; + return rogueSeasonInfo; + } + + /** + * optional .RogueSeasonInfo rogue_season_info = 12; + * @param value the rogueSeasonInfo to set + * @return this + */ + public RogueInfoData setRogueSeasonInfo(final RogueSeasonInfoOuterClass.RogueSeasonInfo value) { + bitField0_ |= 0x00000008; + rogueSeasonInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 15; + * @return whether the rogueScoreInfo field is set + */ + public boolean hasRogueScoreInfo() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 15; + * @return this + */ + public RogueInfoData clearRogueScoreInfo() { + bitField0_ &= ~0x00000010; + rogueScoreInfo.clear(); + return this; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 15; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * 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 = 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 getMutableRogueScoreInfo() { + bitField0_ |= 0x00000010; + return rogueScoreInfo; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 15; + * @param value the rogueScoreInfo to set + * @return this + */ + public RogueInfoData setRogueScoreInfo( + final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { + bitField0_ |= 0x00000010; + rogueScoreInfo.copyFrom(value); + return this; + } + @Override public RogueInfoData copyFrom(final RogueInfoData other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + rogueAeonInfo.copyFrom(other.rogueAeonInfo); + rogueVirtualItemInfo.copyFrom(other.rogueVirtualItemInfo); + rogueAreaInfo.copyFrom(other.rogueAreaInfo); rogueSeasonInfo.copyFrom(other.rogueSeasonInfo); rogueScoreInfo.copyFrom(other.rogueScoreInfo); - rogueAreaInfo.copyFrom(other.rogueAreaInfo); - eEFGNNFCDNJ.copyFrom(other.eEFGNNFCDNJ); - rogueAeonInfo.copyFrom(other.rogueAeonInfo); } return this; } @@ -359,21 +360,21 @@ public final class RogueInfoDataOuterClass { return this; } cachedSize = -1; + if (other.hasRogueAeonInfo()) { + getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); + } + if (other.hasRogueVirtualItemInfo()) { + getMutableRogueVirtualItemInfo().mergeFrom(other.rogueVirtualItemInfo); + } + if (other.hasRogueAreaInfo()) { + getMutableRogueAreaInfo().mergeFrom(other.rogueAreaInfo); + } if (other.hasRogueSeasonInfo()) { getMutableRogueSeasonInfo().mergeFrom(other.rogueSeasonInfo); } if (other.hasRogueScoreInfo()) { getMutableRogueScoreInfo().mergeFrom(other.rogueScoreInfo); } - if (other.hasRogueAreaInfo()) { - getMutableRogueAreaInfo().mergeFrom(other.rogueAreaInfo); - } - if (other.hasEEFGNNFCDNJ()) { - getMutableEEFGNNFCDNJ().mergeFrom(other.eEFGNNFCDNJ); - } - if (other.hasRogueAeonInfo()) { - getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); - } return this; } @@ -384,11 +385,11 @@ public final class RogueInfoDataOuterClass { } cachedSize = -1; bitField0_ = 0; + rogueAeonInfo.clear(); + rogueVirtualItemInfo.clear(); + rogueAreaInfo.clear(); rogueSeasonInfo.clear(); rogueScoreInfo.clear(); - rogueAreaInfo.clear(); - eEFGNNFCDNJ.clear(); - rogueAeonInfo.clear(); return this; } @@ -399,11 +400,11 @@ public final class RogueInfoDataOuterClass { } cachedSize = -1; bitField0_ = 0; + rogueAeonInfo.clearQuick(); + rogueVirtualItemInfo.clearQuick(); + rogueAreaInfo.clearQuick(); rogueSeasonInfo.clearQuick(); rogueScoreInfo.clearQuick(); - rogueAreaInfo.clearQuick(); - eEFGNNFCDNJ.clearQuick(); - rogueAeonInfo.clearQuick(); return this; } @@ -417,34 +418,34 @@ public final class RogueInfoDataOuterClass { } RogueInfoData other = (RogueInfoData) o; return bitField0_ == other.bitField0_ - && (!hasRogueSeasonInfo() || rogueSeasonInfo.equals(other.rogueSeasonInfo)) - && (!hasRogueScoreInfo() || rogueScoreInfo.equals(other.rogueScoreInfo)) + && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)) + && (!hasRogueVirtualItemInfo() || rogueVirtualItemInfo.equals(other.rogueVirtualItemInfo)) && (!hasRogueAreaInfo() || rogueAreaInfo.equals(other.rogueAreaInfo)) - && (!hasEEFGNNFCDNJ() || eEFGNNFCDNJ.equals(other.eEFGNNFCDNJ)) - && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)); + && (!hasRogueSeasonInfo() || rogueSeasonInfo.equals(other.rogueSeasonInfo)) + && (!hasRogueScoreInfo() || rogueScoreInfo.equals(other.rogueScoreInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(rogueSeasonInfo); + output.writeRawByte((byte) 66); + output.writeMessageNoTag(rogueAeonInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(rogueScoreInfo); + output.writeRawByte((byte) 74); + output.writeMessageNoTag(rogueVirtualItemInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 90); output.writeMessageNoTag(rogueAreaInfo); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 82); - output.writeMessageNoTag(eEFGNNFCDNJ); + output.writeRawByte((byte) 98); + output.writeMessageNoTag(rogueSeasonInfo); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(rogueAeonInfo); + output.writeRawByte((byte) 122); + output.writeMessageNoTag(rogueScoreInfo); } } @@ -452,19 +453,19 @@ public final class RogueInfoDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueSeasonInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueScoreInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItemInfo); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAreaInfo); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(eEFGNNFCDNJ); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueSeasonInfo); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueScoreInfo); } return size; } @@ -476,45 +477,45 @@ public final class RogueInfoDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { - // rogueSeasonInfo - input.readMessage(rogueSeasonInfo); + case 66: { + // rogueAeonInfo + input.readMessage(rogueAeonInfo); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 74) { break; } } - case 34: { - // rogueScoreInfo - input.readMessage(rogueScoreInfo); + case 74: { + // rogueVirtualItemInfo + input.readMessage(rogueVirtualItemInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { - // rogueAreaInfo - input.readMessage(rogueAreaInfo); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 82) { - break; - } - } - case 82: { - // eEFGNNFCDNJ - input.readMessage(eEFGNNFCDNJ); - bitField0_ |= 0x00000008; - tag = input.readTag(); if (tag != 90) { break; } } case 90: { - // rogueAeonInfo - input.readMessage(rogueAeonInfo); + // rogueAreaInfo + input.readMessage(rogueAreaInfo); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // rogueSeasonInfo + input.readMessage(rogueSeasonInfo); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // rogueScoreInfo + input.readMessage(rogueScoreInfo); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -539,19 +540,19 @@ public final class RogueInfoDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.rogueSeasonInfo, rogueSeasonInfo); + output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.rogueScoreInfo, rogueScoreInfo); + output.writeMessage(FieldNames.rogueVirtualItemInfo, rogueVirtualItemInfo); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.rogueAreaInfo, rogueAreaInfo); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.eEFGNNFCDNJ, eEFGNNFCDNJ); + output.writeMessage(FieldNames.rogueSeasonInfo, rogueSeasonInfo); } if ((bitField0_ & 0x00000010) != 0) { - output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); + output.writeMessage(FieldNames.rogueScoreInfo, rogueScoreInfo); } output.endObject(); } @@ -563,11 +564,11 @@ public final class RogueInfoDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1037341781: - case -588845659: { - if (input.isAtField(FieldNames.rogueSeasonInfo)) { + case -1685018549: + case -1375922619: { + if (input.isAtField(FieldNames.rogueAeonInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueSeasonInfo); + input.readMessage(rogueAeonInfo); bitField0_ |= 0x00000001; } } else { @@ -575,11 +576,11 @@ public final class RogueInfoDataOuterClass { } break; } - case 2078217638: - case -208816704: { - if (input.isAtField(FieldNames.rogueScoreInfo)) { + case 1066755410: + case 1452147457: { + if (input.isAtField(FieldNames.rogueVirtualItemInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueScoreInfo); + input.readMessage(rogueVirtualItemInfo); bitField0_ |= 0x00000002; } } else { @@ -599,10 +600,11 @@ public final class RogueInfoDataOuterClass { } break; } - case -86806302: { - if (input.isAtField(FieldNames.eEFGNNFCDNJ)) { + case -1037341781: + case -588845659: { + if (input.isAtField(FieldNames.rogueSeasonInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(eEFGNNFCDNJ); + input.readMessage(rogueSeasonInfo); bitField0_ |= 0x00000008; } } else { @@ -610,11 +612,11 @@ public final class RogueInfoDataOuterClass { } break; } - case -1685018549: - case -1375922619: { - if (input.isAtField(FieldNames.rogueAeonInfo)) { + case 2078217638: + case -208816704: { + if (input.isAtField(FieldNames.rogueScoreInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueAeonInfo); + input.readMessage(rogueScoreInfo); bitField0_ |= 0x00000010; } } else { @@ -674,15 +676,15 @@ public final class RogueInfoDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rogueSeasonInfo = FieldName.forField("rogueSeasonInfo", "rogue_season_info"); + static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); - static final FieldName rogueScoreInfo = FieldName.forField("rogueScoreInfo", "rogue_score_info"); + static final FieldName rogueVirtualItemInfo = FieldName.forField("rogueVirtualItemInfo", "rogue_virtual_item_info"); static final FieldName rogueAreaInfo = FieldName.forField("rogueAreaInfo", "rogue_area_info"); - static final FieldName eEFGNNFCDNJ = FieldName.forField("EEFGNNFCDNJ"); + static final FieldName rogueSeasonInfo = FieldName.forField("rogueSeasonInfo", "rogue_season_info"); - static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); + static final FieldName rogueScoreInfo = FieldName.forField("rogueScoreInfo", "rogue_score_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java index ecbb40d..3e237da 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 = 342; + * optional .RogueInfoData rogue_info_data = 748; */ private final RogueInfoDataOuterClass.RogueInfoData rogueInfoData = RogueInfoDataOuterClass.RogueInfoData.newInstance(); /** - * optional .RogueCurrentInfo rogue_current_info = 1466; + * optional .RogueCurrentInfo rogue_current_info = 902; */ private final RogueCurrentInfoOuterClass.RogueCurrentInfo rogueCurrentInfo = RogueCurrentInfoOuterClass.RogueCurrentInfo.newInstance(); @@ -39,7 +39,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueInfoData rogue_info_data = 342; + * optional .RogueInfoData rogue_info_data = 748; * @return whether the rogueInfoData field is set */ public boolean hasRogueInfoData() { @@ -47,7 +47,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueInfoData rogue_info_data = 342; + * optional .RogueInfoData rogue_info_data = 748; * @return this */ public RogueInfo clearRogueInfoData() { @@ -57,7 +57,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueInfoData rogue_info_data = 342; + * optional .RogueInfoData rogue_info_data = 748; * * This 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 = 342; + * optional .RogueInfoData rogue_info_data = 748; * * 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 = 342; + * optional .RogueInfoData rogue_info_data = 748; * @param value the rogueInfoData to set * @return this */ @@ -96,7 +96,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueCurrentInfo rogue_current_info = 1466; + * optional .RogueCurrentInfo rogue_current_info = 902; * @return whether the rogueCurrentInfo field is set */ public boolean hasRogueCurrentInfo() { @@ -104,7 +104,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueCurrentInfo rogue_current_info = 1466; + * optional .RogueCurrentInfo rogue_current_info = 902; * @return this */ public RogueInfo clearRogueCurrentInfo() { @@ -114,7 +114,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueCurrentInfo rogue_current_info = 1466; + * optional .RogueCurrentInfo rogue_current_info = 902; * * This 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 = 1466; + * optional .RogueCurrentInfo rogue_current_info = 902; * * 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 = 1466; + * optional .RogueCurrentInfo rogue_current_info = 902; * @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) 5554); + output.writeRawLittleEndian16((short) 12002); output.writeMessageNoTag(rogueInfoData); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawLittleEndian16((short) 23506); + output.writeRawLittleEndian16((short) 14514); output.writeMessageNoTag(rogueCurrentInfo); } } @@ -247,16 +247,16 @@ public final class RogueInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 2738: { + case 5986: { // rogueInfoData input.readMessage(rogueInfoData); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 11730) { + if (tag != 7218) { break; } } - case 11730: { + case 7218: { // 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 162ff4a..f4bf096 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 = 2; - */ - private int areaId; - - /** - * optional uint32 map_id = 6; - */ - private int mapId; - - /** - * optional uint32 cur_room_id = 11; + * optional uint32 cur_room_id = 3; */ private int curRoomId; /** - * optional uint32 cur_site_id = 12; + * optional uint32 cur_site_id = 8; */ private int curSiteId; /** - * repeated .RogueRoom room_list = 14; + * optional uint32 map_id = 10; + */ + private int mapId; + + /** + * optional uint32 area_id = 13; + */ + private int areaId; + + /** + * repeated .RogueRoom room_list = 12; */ private final RepeatedMessage roomList = RepeatedMessage.newEmptyInstance(RogueRoomOuterClass.RogueRoom.getFactory()); @@ -55,99 +55,25 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 area_id = 2; - * @return whether the areaId field is set + * optional uint32 cur_room_id = 3; + * @return whether the curRoomId field is set */ - public boolean hasAreaId() { + public boolean hasCurRoomId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 area_id = 2; - * @return this - */ - public RogueMapInfo clearAreaId() { - bitField0_ &= ~0x00000001; - areaId = 0; - return this; - } - - /** - * optional uint32 area_id = 2; - * @return the areaId - */ - public int getAreaId() { - return areaId; - } - - /** - * optional uint32 area_id = 2; - * @param value the areaId to set - * @return this - */ - public RogueMapInfo setAreaId(final int value) { - bitField0_ |= 0x00000001; - areaId = value; - return this; - } - - /** - * optional uint32 map_id = 6; - * @return whether the mapId field is set - */ - public boolean hasMapId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 map_id = 6; - * @return this - */ - public RogueMapInfo clearMapId() { - bitField0_ &= ~0x00000002; - mapId = 0; - return this; - } - - /** - * optional uint32 map_id = 6; - * @return the mapId - */ - public int getMapId() { - return mapId; - } - - /** - * optional uint32 map_id = 6; - * @param value the mapId to set - * @return this - */ - public RogueMapInfo setMapId(final int value) { - bitField0_ |= 0x00000002; - mapId = value; - return this; - } - - /** - * optional uint32 cur_room_id = 11; - * @return whether the curRoomId field is set - */ - public boolean hasCurRoomId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 cur_room_id = 11; + * optional uint32 cur_room_id = 3; * @return this */ public RogueMapInfo clearCurRoomId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; curRoomId = 0; return this; } /** - * optional uint32 cur_room_id = 11; + * optional uint32 cur_room_id = 3; * @return the curRoomId */ public int getCurRoomId() { @@ -155,36 +81,36 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 cur_room_id = 11; + * optional uint32 cur_room_id = 3; * @param value the curRoomId to set * @return this */ public RogueMapInfo setCurRoomId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; curRoomId = value; return this; } /** - * optional uint32 cur_site_id = 12; + * optional uint32 cur_site_id = 8; * @return whether the curSiteId field is set */ public boolean hasCurSiteId() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 cur_site_id = 12; + * optional uint32 cur_site_id = 8; * @return this */ public RogueMapInfo clearCurSiteId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; curSiteId = 0; return this; } /** - * optional uint32 cur_site_id = 12; + * optional uint32 cur_site_id = 8; * @return the curSiteId */ public int getCurSiteId() { @@ -192,18 +118,92 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 cur_site_id = 12; + * optional uint32 cur_site_id = 8; * @param value the curSiteId to set * @return this */ public RogueMapInfo setCurSiteId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; curSiteId = value; return this; } /** - * repeated .RogueRoom room_list = 14; + * optional uint32 map_id = 10; + * @return whether the mapId field is set + */ + public boolean hasMapId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 map_id = 10; + * @return this + */ + public RogueMapInfo clearMapId() { + bitField0_ &= ~0x00000004; + mapId = 0; + return this; + } + + /** + * optional uint32 map_id = 10; + * @return the mapId + */ + public int getMapId() { + return mapId; + } + + /** + * optional uint32 map_id = 10; + * @param value the mapId to set + * @return this + */ + public RogueMapInfo setMapId(final int value) { + bitField0_ |= 0x00000004; + mapId = value; + return this; + } + + /** + * optional uint32 area_id = 13; + * @return whether the areaId field is set + */ + public boolean hasAreaId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 area_id = 13; + * @return this + */ + public RogueMapInfo clearAreaId() { + bitField0_ &= ~0x00000008; + areaId = 0; + return this; + } + + /** + * optional uint32 area_id = 13; + * @return the areaId + */ + public int getAreaId() { + return areaId; + } + + /** + * optional uint32 area_id = 13; + * @param value the areaId to set + * @return this + */ + public RogueMapInfo setAreaId(final int value) { + bitField0_ |= 0x00000008; + areaId = value; + return this; + } + + /** + * repeated .RogueRoom room_list = 12; * @return whether the roomList field is set */ public boolean hasRoomList() { @@ -211,7 +211,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 14; + * repeated .RogueRoom room_list = 12; * @return this */ public RogueMapInfo clearRoomList() { @@ -221,7 +221,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 14; + * repeated .RogueRoom room_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 +235,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 14; + * repeated .RogueRoom room_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 @@ -249,7 +249,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 14; + * repeated .RogueRoom room_list = 12; * @param value the roomList to add * @return this */ @@ -260,7 +260,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 14; + * repeated .RogueRoom room_list = 12; * @param values the roomList to add * @return this */ @@ -275,10 +275,10 @@ public final class RogueMapInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - areaId = other.areaId; - mapId = other.mapId; curRoomId = other.curRoomId; curSiteId = other.curSiteId; + mapId = other.mapId; + areaId = other.areaId; roomList.copyFrom(other.roomList); } return this; @@ -290,18 +290,18 @@ public final class RogueMapInfoOuterClass { return this; } cachedSize = -1; - if (other.hasAreaId()) { - setAreaId(other.areaId); - } - if (other.hasMapId()) { - setMapId(other.mapId); - } if (other.hasCurRoomId()) { setCurRoomId(other.curRoomId); } if (other.hasCurSiteId()) { setCurSiteId(other.curSiteId); } + if (other.hasMapId()) { + setMapId(other.mapId); + } + if (other.hasAreaId()) { + setAreaId(other.areaId); + } if (other.hasRoomList()) { getMutableRoomList().addAll(other.roomList); } @@ -315,10 +315,10 @@ public final class RogueMapInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - areaId = 0; - mapId = 0; curRoomId = 0; curSiteId = 0; + mapId = 0; + areaId = 0; roomList.clear(); return this; } @@ -344,34 +344,34 @@ public final class RogueMapInfoOuterClass { } RogueMapInfo other = (RogueMapInfo) o; return bitField0_ == other.bitField0_ - && (!hasAreaId() || areaId == other.areaId) - && (!hasMapId() || mapId == other.mapId) && (!hasCurRoomId() || curRoomId == other.curRoomId) && (!hasCurSiteId() || curSiteId == other.curSiteId) + && (!hasMapId() || mapId == other.mapId) + && (!hasAreaId() || areaId == other.areaId) && (!hasRoomList() || roomList.equals(other.roomList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(areaId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(mapId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(curRoomId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); output.writeUInt32NoTag(curSiteId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(mapId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(areaId); + } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < roomList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 98); output.writeMessageNoTag(roomList.get(i)); } } @@ -381,17 +381,17 @@ public final class RogueMapInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curRoomId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); + } if ((bitField0_ & 0x00000010) != 0) { size += (1 * roomList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(roomList); } @@ -405,43 +405,43 @@ public final class RogueMapInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // areaId - areaId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // mapId - mapId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 24: { // curRoomId curRoomId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 64) { break; } } - case 96: { + case 64: { // curSiteId curSiteId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 114) { + if (tag != 80) { break; } } - case 114: { + case 80: { + // mapId + mapId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // areaId + areaId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { // roomList tag = input.readRepeatedMessage(roomList, tag); bitField0_ |= 0x00000010; @@ -467,17 +467,17 @@ public final class RogueMapInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.areaId, areaId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.mapId, mapId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.curRoomId, curRoomId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.curSiteId, curSiteId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.mapId, mapId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.areaId, areaId); + } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedMessage(FieldNames.roomList, roomList); } @@ -491,36 +491,12 @@ public final class RogueMapInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1409553784: - case -746472947: { - if (input.isAtField(FieldNames.areaId)) { - if (!input.trySkipNullValue()) { - areaId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 103663511: - case -1081377058: { - if (input.isAtField(FieldNames.mapId)) { - if (!input.trySkipNullValue()) { - mapId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -249266762: case 524969984: { if (input.isAtField(FieldNames.curRoomId)) { if (!input.trySkipNullValue()) { curRoomId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -532,6 +508,30 @@ public final class RogueMapInfoOuterClass { if (input.isAtField(FieldNames.curSiteId)) { if (!input.trySkipNullValue()) { curSiteId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 103663511: + case -1081377058: { + if (input.isAtField(FieldNames.mapId)) { + if (!input.trySkipNullValue()) { + mapId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1409553784: + case -746472947: { + if (input.isAtField(FieldNames.areaId)) { + if (!input.trySkipNullValue()) { + areaId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -603,14 +603,14 @@ public final class RogueMapInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName areaId = FieldName.forField("areaId", "area_id"); - - static final FieldName mapId = FieldName.forField("mapId", "map_id"); - static final FieldName curRoomId = FieldName.forField("curRoomId", "cur_room_id"); static final FieldName curSiteId = FieldName.forField("curSiteId", "cur_site_id"); + static final FieldName mapId = FieldName.forField("mapId", "map_id"); + + static final FieldName areaId = FieldName.forField("areaId", "area_id"); + static final FieldName roomList = FieldName.forField("roomList", "room_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java index 8d2caa3..1ed1d40 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java @@ -20,29 +20,29 @@ public final class RogueMiracleDataInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 LHCJBLAECHK = 1; + * optional uint32 JGBGAMHIIKD = 2; */ - private int lHCJBLAECHK; + private int jGBGAMHIIKD; /** - * optional uint32 miracle_id = 4; + * optional uint32 NOGMPAIOFJH = 5; + */ + private int nOGMPAIOFJH; + + /** + * optional uint32 miracle_id = 7; */ private int miracleId; /** - * optional uint32 FFLMCOJAJAI = 7; + * optional uint32 GOIJOIBBBCP = 9; */ - private int fFLMCOJAJAI; + private int gOIJOIBBBCP; /** - * optional uint32 CNFMGJHFABD = 13; + * repeated .RogueMiracleDataInfo.OGIABDBDCFHEntry OGIABDBDCFH = 11; */ - private int cNFMGJHFABD; - - /** - * repeated .RogueMiracleDataInfo.HIFKDHKJGACEntry HIFKDHKJGAC = 3; - */ - private final RepeatedMessage hIFKDHKJGAC = RepeatedMessage.newEmptyInstance(HIFKDHKJGACEntry.getFactory()); + private final RepeatedMessage oGIABDBDCFH = RepeatedMessage.newEmptyInstance(OGIABDBDCFHEntry.getFactory()); private RogueMiracleDataInfo() { } @@ -55,62 +55,99 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * optional uint32 LHCJBLAECHK = 1; - * @return whether the lHCJBLAECHK field is set + * optional uint32 JGBGAMHIIKD = 2; + * @return whether the jGBGAMHIIKD field is set */ - public boolean hasLHCJBLAECHK() { + public boolean hasJGBGAMHIIKD() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 LHCJBLAECHK = 1; + * optional uint32 JGBGAMHIIKD = 2; * @return this */ - public RogueMiracleDataInfo clearLHCJBLAECHK() { + public RogueMiracleDataInfo clearJGBGAMHIIKD() { bitField0_ &= ~0x00000001; - lHCJBLAECHK = 0; + jGBGAMHIIKD = 0; return this; } /** - * optional uint32 LHCJBLAECHK = 1; - * @return the lHCJBLAECHK + * optional uint32 JGBGAMHIIKD = 2; + * @return the jGBGAMHIIKD */ - public int getLHCJBLAECHK() { - return lHCJBLAECHK; + public int getJGBGAMHIIKD() { + return jGBGAMHIIKD; } /** - * optional uint32 LHCJBLAECHK = 1; - * @param value the lHCJBLAECHK to set + * optional uint32 JGBGAMHIIKD = 2; + * @param value the jGBGAMHIIKD to set * @return this */ - public RogueMiracleDataInfo setLHCJBLAECHK(final int value) { + public RogueMiracleDataInfo setJGBGAMHIIKD(final int value) { bitField0_ |= 0x00000001; - lHCJBLAECHK = value; + jGBGAMHIIKD = value; return this; } /** - * optional uint32 miracle_id = 4; - * @return whether the miracleId field is set + * optional uint32 NOGMPAIOFJH = 5; + * @return whether the nOGMPAIOFJH field is set */ - public boolean hasMiracleId() { + public boolean hasNOGMPAIOFJH() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 miracle_id = 4; + * optional uint32 NOGMPAIOFJH = 5; + * @return this + */ + public RogueMiracleDataInfo clearNOGMPAIOFJH() { + bitField0_ &= ~0x00000002; + nOGMPAIOFJH = 0; + return this; + } + + /** + * optional uint32 NOGMPAIOFJH = 5; + * @return the nOGMPAIOFJH + */ + public int getNOGMPAIOFJH() { + return nOGMPAIOFJH; + } + + /** + * optional uint32 NOGMPAIOFJH = 5; + * @param value the nOGMPAIOFJH to set + * @return this + */ + public RogueMiracleDataInfo setNOGMPAIOFJH(final int value) { + bitField0_ |= 0x00000002; + nOGMPAIOFJH = value; + return this; + } + + /** + * optional uint32 miracle_id = 7; + * @return whether the miracleId field is set + */ + public boolean hasMiracleId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 miracle_id = 7; * @return this */ public RogueMiracleDataInfo clearMiracleId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; miracleId = 0; return this; } /** - * optional uint32 miracle_id = 4; + * optional uint32 miracle_id = 7; * @return the miracleId */ public int getMiracleId() { @@ -118,124 +155,87 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * optional uint32 miracle_id = 4; + * optional uint32 miracle_id = 7; * @param value the miracleId to set * @return this */ public RogueMiracleDataInfo setMiracleId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; miracleId = value; return this; } /** - * optional uint32 FFLMCOJAJAI = 7; - * @return whether the fFLMCOJAJAI field is set + * optional uint32 GOIJOIBBBCP = 9; + * @return whether the gOIJOIBBBCP field is set */ - public boolean hasFFLMCOJAJAI() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 FFLMCOJAJAI = 7; - * @return this - */ - public RogueMiracleDataInfo clearFFLMCOJAJAI() { - bitField0_ &= ~0x00000004; - fFLMCOJAJAI = 0; - return this; - } - - /** - * optional uint32 FFLMCOJAJAI = 7; - * @return the fFLMCOJAJAI - */ - public int getFFLMCOJAJAI() { - return fFLMCOJAJAI; - } - - /** - * optional uint32 FFLMCOJAJAI = 7; - * @param value the fFLMCOJAJAI to set - * @return this - */ - public RogueMiracleDataInfo setFFLMCOJAJAI(final int value) { - bitField0_ |= 0x00000004; - fFLMCOJAJAI = value; - return this; - } - - /** - * optional uint32 CNFMGJHFABD = 13; - * @return whether the cNFMGJHFABD field is set - */ - public boolean hasCNFMGJHFABD() { + public boolean hasGOIJOIBBBCP() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 CNFMGJHFABD = 13; + * optional uint32 GOIJOIBBBCP = 9; * @return this */ - public RogueMiracleDataInfo clearCNFMGJHFABD() { + public RogueMiracleDataInfo clearGOIJOIBBBCP() { bitField0_ &= ~0x00000008; - cNFMGJHFABD = 0; + gOIJOIBBBCP = 0; return this; } /** - * optional uint32 CNFMGJHFABD = 13; - * @return the cNFMGJHFABD + * optional uint32 GOIJOIBBBCP = 9; + * @return the gOIJOIBBBCP */ - public int getCNFMGJHFABD() { - return cNFMGJHFABD; + public int getGOIJOIBBBCP() { + return gOIJOIBBBCP; } /** - * optional uint32 CNFMGJHFABD = 13; - * @param value the cNFMGJHFABD to set + * optional uint32 GOIJOIBBBCP = 9; + * @param value the gOIJOIBBBCP to set * @return this */ - public RogueMiracleDataInfo setCNFMGJHFABD(final int value) { + public RogueMiracleDataInfo setGOIJOIBBBCP(final int value) { bitField0_ |= 0x00000008; - cNFMGJHFABD = value; + gOIJOIBBBCP = value; return this; } /** - * repeated .RogueMiracleDataInfo.HIFKDHKJGACEntry HIFKDHKJGAC = 3; - * @return whether the hIFKDHKJGAC field is set + * repeated .RogueMiracleDataInfo.OGIABDBDCFHEntry OGIABDBDCFH = 11; + * @return whether the oGIABDBDCFH field is set */ - public boolean hasHIFKDHKJGAC() { + public boolean hasOGIABDBDCFH() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated .RogueMiracleDataInfo.HIFKDHKJGACEntry HIFKDHKJGAC = 3; + * repeated .RogueMiracleDataInfo.OGIABDBDCFHEntry OGIABDBDCFH = 11; * @return this */ - public RogueMiracleDataInfo clearHIFKDHKJGAC() { + public RogueMiracleDataInfo clearOGIABDBDCFH() { bitField0_ &= ~0x00000010; - hIFKDHKJGAC.clear(); + oGIABDBDCFH.clear(); return this; } /** - * repeated .RogueMiracleDataInfo.HIFKDHKJGACEntry HIFKDHKJGAC = 3; + * repeated .RogueMiracleDataInfo.OGIABDBDCFHEntry OGIABDBDCFH = 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 #getMutableHIFKDHKJGAC()} if you want to modify it. + * Use {@link #getMutableOGIABDBDCFH()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getHIFKDHKJGAC() { - return hIFKDHKJGAC; + public RepeatedMessage getOGIABDBDCFH() { + return oGIABDBDCFH; } /** - * repeated .RogueMiracleDataInfo.HIFKDHKJGACEntry HIFKDHKJGAC = 3; + * repeated .RogueMiracleDataInfo.OGIABDBDCFHEntry OGIABDBDCFH = 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 @@ -243,30 +243,30 @@ public final class RogueMiracleDataInfoOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableHIFKDHKJGAC() { + public RepeatedMessage getMutableOGIABDBDCFH() { bitField0_ |= 0x00000010; - return hIFKDHKJGAC; + return oGIABDBDCFH; } /** - * repeated .RogueMiracleDataInfo.HIFKDHKJGACEntry HIFKDHKJGAC = 3; - * @param value the hIFKDHKJGAC to add + * repeated .RogueMiracleDataInfo.OGIABDBDCFHEntry OGIABDBDCFH = 11; + * @param value the oGIABDBDCFH to add * @return this */ - public RogueMiracleDataInfo addHIFKDHKJGAC(final HIFKDHKJGACEntry value) { + public RogueMiracleDataInfo addOGIABDBDCFH(final OGIABDBDCFHEntry value) { bitField0_ |= 0x00000010; - hIFKDHKJGAC.add(value); + oGIABDBDCFH.add(value); return this; } /** - * repeated .RogueMiracleDataInfo.HIFKDHKJGACEntry HIFKDHKJGAC = 3; - * @param values the hIFKDHKJGAC to add + * repeated .RogueMiracleDataInfo.OGIABDBDCFHEntry OGIABDBDCFH = 11; + * @param values the oGIABDBDCFH to add * @return this */ - public RogueMiracleDataInfo addAllHIFKDHKJGAC(final HIFKDHKJGACEntry... values) { + public RogueMiracleDataInfo addAllOGIABDBDCFH(final OGIABDBDCFHEntry... values) { bitField0_ |= 0x00000010; - hIFKDHKJGAC.addAll(values); + oGIABDBDCFH.addAll(values); return this; } @@ -275,11 +275,11 @@ public final class RogueMiracleDataInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - lHCJBLAECHK = other.lHCJBLAECHK; + jGBGAMHIIKD = other.jGBGAMHIIKD; + nOGMPAIOFJH = other.nOGMPAIOFJH; miracleId = other.miracleId; - fFLMCOJAJAI = other.fFLMCOJAJAI; - cNFMGJHFABD = other.cNFMGJHFABD; - hIFKDHKJGAC.copyFrom(other.hIFKDHKJGAC); + gOIJOIBBBCP = other.gOIJOIBBBCP; + oGIABDBDCFH.copyFrom(other.oGIABDBDCFH); } return this; } @@ -290,20 +290,20 @@ public final class RogueMiracleDataInfoOuterClass { return this; } cachedSize = -1; - if (other.hasLHCJBLAECHK()) { - setLHCJBLAECHK(other.lHCJBLAECHK); + if (other.hasJGBGAMHIIKD()) { + setJGBGAMHIIKD(other.jGBGAMHIIKD); + } + if (other.hasNOGMPAIOFJH()) { + setNOGMPAIOFJH(other.nOGMPAIOFJH); } if (other.hasMiracleId()) { setMiracleId(other.miracleId); } - if (other.hasFFLMCOJAJAI()) { - setFFLMCOJAJAI(other.fFLMCOJAJAI); + if (other.hasGOIJOIBBBCP()) { + setGOIJOIBBBCP(other.gOIJOIBBBCP); } - if (other.hasCNFMGJHFABD()) { - setCNFMGJHFABD(other.cNFMGJHFABD); - } - if (other.hasHIFKDHKJGAC()) { - getMutableHIFKDHKJGAC().addAll(other.hIFKDHKJGAC); + if (other.hasOGIABDBDCFH()) { + getMutableOGIABDBDCFH().addAll(other.oGIABDBDCFH); } return this; } @@ -315,11 +315,11 @@ public final class RogueMiracleDataInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - lHCJBLAECHK = 0; + jGBGAMHIIKD = 0; + nOGMPAIOFJH = 0; miracleId = 0; - fFLMCOJAJAI = 0; - cNFMGJHFABD = 0; - hIFKDHKJGAC.clear(); + gOIJOIBBBCP = 0; + oGIABDBDCFH.clear(); return this; } @@ -330,7 +330,7 @@ public final class RogueMiracleDataInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - hIFKDHKJGAC.clearQuick(); + oGIABDBDCFH.clearQuick(); return this; } @@ -344,35 +344,35 @@ public final class RogueMiracleDataInfoOuterClass { } RogueMiracleDataInfo other = (RogueMiracleDataInfo) o; return bitField0_ == other.bitField0_ - && (!hasLHCJBLAECHK() || lHCJBLAECHK == other.lHCJBLAECHK) + && (!hasJGBGAMHIIKD() || jGBGAMHIIKD == other.jGBGAMHIIKD) + && (!hasNOGMPAIOFJH() || nOGMPAIOFJH == other.nOGMPAIOFJH) && (!hasMiracleId() || miracleId == other.miracleId) - && (!hasFFLMCOJAJAI() || fFLMCOJAJAI == other.fFLMCOJAJAI) - && (!hasCNFMGJHFABD() || cNFMGJHFABD == other.cNFMGJHFABD) - && (!hasHIFKDHKJGAC() || hIFKDHKJGAC.equals(other.hIFKDHKJGAC)); + && (!hasGOIJOIBBBCP() || gOIJOIBBBCP == other.gOIJOIBBBCP) + && (!hasOGIABDBDCFH() || oGIABDBDCFH.equals(other.oGIABDBDCFH)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(lHCJBLAECHK); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(jGBGAMHIIKD); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(miracleId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(nOGMPAIOFJH); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 56); - output.writeUInt32NoTag(fFLMCOJAJAI); + output.writeUInt32NoTag(miracleId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(cNFMGJHFABD); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(gOIJOIBBBCP); } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < hIFKDHKJGAC.length(); i++) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(hIFKDHKJGAC.get(i)); + for (int i = 0; i < oGIABDBDCFH.length(); i++) { + output.writeRawByte((byte) 90); + output.writeMessageNoTag(oGIABDBDCFH.get(i)); } } } @@ -381,19 +381,19 @@ public final class RogueMiracleDataInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lHCJBLAECHK); + size += 1 + ProtoSink.computeUInt32SizeNoTag(jGBGAMHIIKD); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(miracleId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(nOGMPAIOFJH); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(fFLMCOJAJAI); + size += 1 + ProtoSink.computeUInt32SizeNoTag(miracleId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cNFMGJHFABD); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gOIJOIBBBCP); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * hIFKDHKJGAC.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(hIFKDHKJGAC); + size += (1 * oGIABDBDCFH.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(oGIABDBDCFH); } return size; } @@ -405,18 +405,18 @@ public final class RogueMiracleDataInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // lHCJBLAECHK - lHCJBLAECHK = input.readUInt32(); + case 16: { + // jGBGAMHIIKD + jGBGAMHIIKD = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 40) { break; } } - case 32: { - // miracleId - miracleId = input.readUInt32(); + case 40: { + // nOGMPAIOFJH + nOGMPAIOFJH = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 56) { @@ -424,26 +424,26 @@ public final class RogueMiracleDataInfoOuterClass { } } case 56: { - // fFLMCOJAJAI - fFLMCOJAJAI = input.readUInt32(); + // miracleId + miracleId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { - // cNFMGJHFABD - cNFMGJHFABD = input.readUInt32(); + case 72: { + // gOIJOIBBBCP + gOIJOIBBBCP = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 26) { + if (tag != 90) { break; } } - case 26: { - // hIFKDHKJGAC - tag = input.readRepeatedMessage(hIFKDHKJGAC, tag); + case 90: { + // oGIABDBDCFH + tag = input.readRepeatedMessage(oGIABDBDCFH, tag); bitField0_ |= 0x00000010; if (tag != 0) { break; @@ -467,19 +467,19 @@ public final class RogueMiracleDataInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.lHCJBLAECHK, lHCJBLAECHK); + output.writeUInt32(FieldNames.jGBGAMHIIKD, jGBGAMHIIKD); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.miracleId, miracleId); + output.writeUInt32(FieldNames.nOGMPAIOFJH, nOGMPAIOFJH); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.fFLMCOJAJAI, fFLMCOJAJAI); + output.writeUInt32(FieldNames.miracleId, miracleId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.cNFMGJHFABD, cNFMGJHFABD); + output.writeUInt32(FieldNames.gOIJOIBBBCP, gOIJOIBBBCP); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedMessage(FieldNames.hIFKDHKJGAC, hIFKDHKJGAC); + output.writeRepeatedMessage(FieldNames.oGIABDBDCFH, oGIABDBDCFH); } output.endObject(); } @@ -491,10 +491,10 @@ public final class RogueMiracleDataInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -431171691: { - if (input.isAtField(FieldNames.lHCJBLAECHK)) { + case -914016877: { + if (input.isAtField(FieldNames.jGBGAMHIIKD)) { if (!input.trySkipNullValue()) { - lHCJBLAECHK = input.readUInt32(); + jGBGAMHIIKD = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -502,22 +502,22 @@ public final class RogueMiracleDataInfoOuterClass { } break; } + case 420796806: { + if (input.isAtField(FieldNames.nOGMPAIOFJH)) { + if (!input.trySkipNullValue()) { + nOGMPAIOFJH = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case -164571796: case -806736983: { if (input.isAtField(FieldNames.miracleId)) { if (!input.trySkipNullValue()) { miracleId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 686494478: { - if (input.isAtField(FieldNames.fFLMCOJAJAI)) { - if (!input.trySkipNullValue()) { - fFLMCOJAJAI = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -525,10 +525,10 @@ public final class RogueMiracleDataInfoOuterClass { } break; } - case 1575260368: { - if (input.isAtField(FieldNames.cNFMGJHFABD)) { + case -804177364: { + if (input.isAtField(FieldNames.gOIJOIBBBCP)) { if (!input.trySkipNullValue()) { - cNFMGJHFABD = input.readUInt32(); + gOIJOIBBBCP = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -536,10 +536,10 @@ public final class RogueMiracleDataInfoOuterClass { } break; } - case 255478432: { - if (input.isAtField(FieldNames.hIFKDHKJGAC)) { + case 1976066769: { + if (input.isAtField(FieldNames.oGIABDBDCFH)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(hIFKDHKJGAC); + input.readRepeatedMessage(oGIABDBDCFH); bitField0_ |= 0x00000010; } } else { @@ -588,9 +588,9 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * Protobuf type {@code HIFKDHKJGACEntry} + * Protobuf type {@code OGIABDBDCFHEntry} */ - public static final class HIFKDHKJGACEntry extends ProtoMessage implements Cloneable { + public static final class OGIABDBDCFHEntry extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; /** @@ -603,14 +603,14 @@ public final class RogueMiracleDataInfoOuterClass { */ private int value_; - private HIFKDHKJGACEntry() { + private OGIABDBDCFHEntry() { } /** - * @return a new empty instance of {@code HIFKDHKJGACEntry} + * @return a new empty instance of {@code OGIABDBDCFHEntry} */ - public static HIFKDHKJGACEntry newInstance() { - return new HIFKDHKJGACEntry(); + public static OGIABDBDCFHEntry newInstance() { + return new OGIABDBDCFHEntry(); } /** @@ -625,7 +625,7 @@ public final class RogueMiracleDataInfoOuterClass { * optional uint32 key = 1; * @return this */ - public HIFKDHKJGACEntry clearKey() { + public OGIABDBDCFHEntry clearKey() { bitField0_ &= ~0x00000001; key = 0; return this; @@ -644,7 +644,7 @@ public final class RogueMiracleDataInfoOuterClass { * @param value the key to set * @return this */ - public HIFKDHKJGACEntry setKey(final int value) { + public OGIABDBDCFHEntry setKey(final int value) { bitField0_ |= 0x00000001; key = value; return this; @@ -662,7 +662,7 @@ public final class RogueMiracleDataInfoOuterClass { * optional uint32 value = 2; * @return this */ - public HIFKDHKJGACEntry clearValue() { + public OGIABDBDCFHEntry clearValue() { bitField0_ &= ~0x00000002; value_ = 0; return this; @@ -681,14 +681,14 @@ public final class RogueMiracleDataInfoOuterClass { * @param value the value_ to set * @return this */ - public HIFKDHKJGACEntry setValue(final int value) { + public OGIABDBDCFHEntry setValue(final int value) { bitField0_ |= 0x00000002; value_ = value; return this; } @Override - public HIFKDHKJGACEntry copyFrom(final HIFKDHKJGACEntry other) { + public OGIABDBDCFHEntry copyFrom(final OGIABDBDCFHEntry other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; @@ -699,7 +699,7 @@ public final class RogueMiracleDataInfoOuterClass { } @Override - public HIFKDHKJGACEntry mergeFrom(final HIFKDHKJGACEntry other) { + public OGIABDBDCFHEntry mergeFrom(final OGIABDBDCFHEntry other) { if (other.isEmpty()) { return this; } @@ -714,7 +714,7 @@ public final class RogueMiracleDataInfoOuterClass { } @Override - public HIFKDHKJGACEntry clear() { + public OGIABDBDCFHEntry clear() { if (isEmpty()) { return this; } @@ -726,7 +726,7 @@ public final class RogueMiracleDataInfoOuterClass { } @Override - public HIFKDHKJGACEntry clearQuick() { + public OGIABDBDCFHEntry clearQuick() { if (isEmpty()) { return this; } @@ -740,10 +740,10 @@ public final class RogueMiracleDataInfoOuterClass { if (o == this) { return true; } - if (!(o instanceof HIFKDHKJGACEntry)) { + if (!(o instanceof OGIABDBDCFHEntry)) { return false; } - HIFKDHKJGACEntry other = (HIFKDHKJGACEntry) o; + OGIABDBDCFHEntry other = (OGIABDBDCFHEntry) o; return bitField0_ == other.bitField0_ && (!hasKey() || key == other.key) && (!hasValue() || value_ == other.value_); @@ -775,7 +775,7 @@ public final class RogueMiracleDataInfoOuterClass { @Override @SuppressWarnings("fallthrough") - public HIFKDHKJGACEntry mergeFrom(final ProtoSource input) throws IOException { + public OGIABDBDCFHEntry mergeFrom(final ProtoSource input) throws IOException { // Enabled Fall-Through Optimization (QuickBuffers) int tag = input.readTag(); while (true) { @@ -825,7 +825,7 @@ public final class RogueMiracleDataInfoOuterClass { } @Override - public HIFKDHKJGACEntry mergeFrom(final JsonSource input) throws IOException { + public OGIABDBDCFHEntry mergeFrom(final JsonSource input) throws IOException { if (!input.beginObject()) { return this; } @@ -864,8 +864,8 @@ public final class RogueMiracleDataInfoOuterClass { } @Override - public HIFKDHKJGACEntry clone() { - return new HIFKDHKJGACEntry().copyFrom(this); + public OGIABDBDCFHEntry clone() { + return new OGIABDBDCFHEntry().copyFrom(this); } @Override @@ -873,32 +873,32 @@ public final class RogueMiracleDataInfoOuterClass { return ((bitField0_) == 0); } - public static HIFKDHKJGACEntry parseFrom(final byte[] data) throws + public static OGIABDBDCFHEntry parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new HIFKDHKJGACEntry(), data).checkInitialized(); + return ProtoMessage.mergeFrom(new OGIABDBDCFHEntry(), data).checkInitialized(); } - public static HIFKDHKJGACEntry parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new HIFKDHKJGACEntry(), input).checkInitialized(); + public static OGIABDBDCFHEntry parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new OGIABDBDCFHEntry(), input).checkInitialized(); } - public static HIFKDHKJGACEntry parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new HIFKDHKJGACEntry(), input).checkInitialized(); + public static OGIABDBDCFHEntry parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new OGIABDBDCFHEntry(), input).checkInitialized(); } /** - * @return factory for creating HIFKDHKJGACEntry messages + * @return factory for creating OGIABDBDCFHEntry messages */ - public static MessageFactory getFactory() { - return HIFKDHKJGACEntryFactory.INSTANCE; + public static MessageFactory getFactory() { + return OGIABDBDCFHEntryFactory.INSTANCE; } - private enum HIFKDHKJGACEntryFactory implements MessageFactory { + private enum OGIABDBDCFHEntryFactory implements MessageFactory { INSTANCE; @Override - public HIFKDHKJGACEntry create() { - return HIFKDHKJGACEntry.newInstance(); + public OGIABDBDCFHEntry create() { + return OGIABDBDCFHEntry.newInstance(); } } @@ -925,15 +925,15 @@ public final class RogueMiracleDataInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName lHCJBLAECHK = FieldName.forField("LHCJBLAECHK"); + static final FieldName jGBGAMHIIKD = FieldName.forField("JGBGAMHIIKD"); + + static final FieldName nOGMPAIOFJH = FieldName.forField("NOGMPAIOFJH"); static final FieldName miracleId = FieldName.forField("miracleId", "miracle_id"); - static final FieldName fFLMCOJAJAI = FieldName.forField("FFLMCOJAJAI"); + static final FieldName gOIJOIBBBCP = FieldName.forField("GOIJOIBBBCP"); - static final FieldName cNFMGJHFABD = FieldName.forField("CNFMGJHFABD"); - - static final FieldName hIFKDHKJGAC = FieldName.forField("HIFKDHKJGAC"); + static final FieldName oGIABDBDCFH = FieldName.forField("OGIABDBDCFH"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoDataOuterClass.java index 1982a73..109fb7c 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoDataOuterClass.java @@ -20,17 +20,17 @@ public final class RogueMiracleInfoDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 EGCFBOPLHKJ = 4; + * optional uint32 EIPDPOKBFBP = 3; */ - private int eGCFBOPLHKJ; + private int eIPDPOKBFBP; /** - * optional uint32 JPDGMALBBAB = 7; + * optional uint32 FIEIECEEFJN = 10; */ - private int jPDGMALBBAB; + private int fIEIECEEFJN; /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 1; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 14; */ private final RepeatedMessage rogueMiracleList = RepeatedMessage.newEmptyInstance(RogueMiracleDataInfoOuterClass.RogueMiracleDataInfo.getFactory()); @@ -45,81 +45,81 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * optional uint32 EGCFBOPLHKJ = 4; - * @return whether the eGCFBOPLHKJ field is set + * optional uint32 EIPDPOKBFBP = 3; + * @return whether the eIPDPOKBFBP field is set */ - public boolean hasEGCFBOPLHKJ() { + public boolean hasEIPDPOKBFBP() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 EGCFBOPLHKJ = 4; + * optional uint32 EIPDPOKBFBP = 3; * @return this */ - public RogueMiracleInfoData clearEGCFBOPLHKJ() { + public RogueMiracleInfoData clearEIPDPOKBFBP() { bitField0_ &= ~0x00000001; - eGCFBOPLHKJ = 0; + eIPDPOKBFBP = 0; return this; } /** - * optional uint32 EGCFBOPLHKJ = 4; - * @return the eGCFBOPLHKJ + * optional uint32 EIPDPOKBFBP = 3; + * @return the eIPDPOKBFBP */ - public int getEGCFBOPLHKJ() { - return eGCFBOPLHKJ; + public int getEIPDPOKBFBP() { + return eIPDPOKBFBP; } /** - * optional uint32 EGCFBOPLHKJ = 4; - * @param value the eGCFBOPLHKJ to set + * optional uint32 EIPDPOKBFBP = 3; + * @param value the eIPDPOKBFBP to set * @return this */ - public RogueMiracleInfoData setEGCFBOPLHKJ(final int value) { + public RogueMiracleInfoData setEIPDPOKBFBP(final int value) { bitField0_ |= 0x00000001; - eGCFBOPLHKJ = value; + eIPDPOKBFBP = value; return this; } /** - * optional uint32 JPDGMALBBAB = 7; - * @return whether the jPDGMALBBAB field is set + * optional uint32 FIEIECEEFJN = 10; + * @return whether the fIEIECEEFJN field is set */ - public boolean hasJPDGMALBBAB() { + public boolean hasFIEIECEEFJN() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 JPDGMALBBAB = 7; + * optional uint32 FIEIECEEFJN = 10; * @return this */ - public RogueMiracleInfoData clearJPDGMALBBAB() { + public RogueMiracleInfoData clearFIEIECEEFJN() { bitField0_ &= ~0x00000002; - jPDGMALBBAB = 0; + fIEIECEEFJN = 0; return this; } /** - * optional uint32 JPDGMALBBAB = 7; - * @return the jPDGMALBBAB + * optional uint32 FIEIECEEFJN = 10; + * @return the fIEIECEEFJN */ - public int getJPDGMALBBAB() { - return jPDGMALBBAB; + public int getFIEIECEEFJN() { + return fIEIECEEFJN; } /** - * optional uint32 JPDGMALBBAB = 7; - * @param value the jPDGMALBBAB to set + * optional uint32 FIEIECEEFJN = 10; + * @param value the fIEIECEEFJN to set * @return this */ - public RogueMiracleInfoData setJPDGMALBBAB(final int value) { + public RogueMiracleInfoData setFIEIECEEFJN(final int value) { bitField0_ |= 0x00000002; - jPDGMALBBAB = value; + fIEIECEEFJN = value; return this; } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 1; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 14; * @return whether the rogueMiracleList field is set */ public boolean hasRogueMiracleList() { @@ -127,7 +127,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 1; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 14; * @return this */ public RogueMiracleInfoData clearRogueMiracleList() { @@ -137,7 +137,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 1; + * repeated .RogueMiracleDataInfo rogue_miracle_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. @@ -152,7 +152,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 1; + * repeated .RogueMiracleDataInfo rogue_miracle_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 @@ -167,7 +167,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 1; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 14; * @param value the rogueMiracleList to add * @return this */ @@ -179,7 +179,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 1; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 14; * @param values the rogueMiracleList to add * @return this */ @@ -195,8 +195,8 @@ public final class RogueMiracleInfoDataOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - eGCFBOPLHKJ = other.eGCFBOPLHKJ; - jPDGMALBBAB = other.jPDGMALBBAB; + eIPDPOKBFBP = other.eIPDPOKBFBP; + fIEIECEEFJN = other.fIEIECEEFJN; rogueMiracleList.copyFrom(other.rogueMiracleList); } return this; @@ -208,11 +208,11 @@ public final class RogueMiracleInfoDataOuterClass { return this; } cachedSize = -1; - if (other.hasEGCFBOPLHKJ()) { - setEGCFBOPLHKJ(other.eGCFBOPLHKJ); + if (other.hasEIPDPOKBFBP()) { + setEIPDPOKBFBP(other.eIPDPOKBFBP); } - if (other.hasJPDGMALBBAB()) { - setJPDGMALBBAB(other.jPDGMALBBAB); + if (other.hasFIEIECEEFJN()) { + setFIEIECEEFJN(other.fIEIECEEFJN); } if (other.hasRogueMiracleList()) { getMutableRogueMiracleList().addAll(other.rogueMiracleList); @@ -227,8 +227,8 @@ public final class RogueMiracleInfoDataOuterClass { } cachedSize = -1; bitField0_ = 0; - eGCFBOPLHKJ = 0; - jPDGMALBBAB = 0; + eIPDPOKBFBP = 0; + fIEIECEEFJN = 0; rogueMiracleList.clear(); return this; } @@ -254,24 +254,24 @@ public final class RogueMiracleInfoDataOuterClass { } RogueMiracleInfoData other = (RogueMiracleInfoData) o; return bitField0_ == other.bitField0_ - && (!hasEGCFBOPLHKJ() || eGCFBOPLHKJ == other.eGCFBOPLHKJ) - && (!hasJPDGMALBBAB() || jPDGMALBBAB == other.jPDGMALBBAB) + && (!hasEIPDPOKBFBP() || eIPDPOKBFBP == other.eIPDPOKBFBP) + && (!hasFIEIECEEFJN() || fIEIECEEFJN == other.fIEIECEEFJN) && (!hasRogueMiracleList() || rogueMiracleList.equals(other.rogueMiracleList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(eGCFBOPLHKJ); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(eIPDPOKBFBP); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(jPDGMALBBAB); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(fIEIECEEFJN); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < rogueMiracleList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 114); output.writeMessageNoTag(rogueMiracleList.get(i)); } } @@ -281,10 +281,10 @@ public final class RogueMiracleInfoDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eGCFBOPLHKJ); + size += 1 + ProtoSink.computeUInt32SizeNoTag(eIPDPOKBFBP); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(jPDGMALBBAB); + size += 1 + ProtoSink.computeUInt32SizeNoTag(fIEIECEEFJN); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * rogueMiracleList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueMiracleList); @@ -299,25 +299,25 @@ public final class RogueMiracleInfoDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // eGCFBOPLHKJ - eGCFBOPLHKJ = input.readUInt32(); + case 24: { + // eIPDPOKBFBP + eIPDPOKBFBP = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 80) { break; } } - case 56: { - // jPDGMALBBAB - jPDGMALBBAB = input.readUInt32(); + case 80: { + // fIEIECEEFJN + fIEIECEEFJN = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 10) { + if (tag != 114) { break; } } - case 10: { + case 114: { // rogueMiracleList tag = input.readRepeatedMessage(rogueMiracleList, tag); bitField0_ |= 0x00000004; @@ -343,10 +343,10 @@ public final class RogueMiracleInfoDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.eGCFBOPLHKJ, eGCFBOPLHKJ); + output.writeUInt32(FieldNames.eIPDPOKBFBP, eIPDPOKBFBP); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.jPDGMALBBAB, jPDGMALBBAB); + output.writeUInt32(FieldNames.fIEIECEEFJN, fIEIECEEFJN); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.rogueMiracleList, rogueMiracleList); @@ -361,10 +361,10 @@ public final class RogueMiracleInfoDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1177746393: { - if (input.isAtField(FieldNames.eGCFBOPLHKJ)) { + case -892773594: { + if (input.isAtField(FieldNames.eIPDPOKBFBP)) { if (!input.trySkipNullValue()) { - eGCFBOPLHKJ = input.readUInt32(); + eIPDPOKBFBP = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -372,10 +372,10 @@ public final class RogueMiracleInfoDataOuterClass { } break; } - case -282541776: { - if (input.isAtField(FieldNames.jPDGMALBBAB)) { + case -1385085179: { + if (input.isAtField(FieldNames.fIEIECEEFJN)) { if (!input.trySkipNullValue()) { - jPDGMALBBAB = input.readUInt32(); + fIEIECEEFJN = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -448,9 +448,9 @@ public final class RogueMiracleInfoDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName eGCFBOPLHKJ = FieldName.forField("EGCFBOPLHKJ"); + static final FieldName eIPDPOKBFBP = FieldName.forField("EIPDPOKBFBP"); - static final FieldName jPDGMALBBAB = FieldName.forField("JPDGMALBBAB"); + static final FieldName fIEIECEEFJN = FieldName.forField("FIEIECEEFJN"); static final FieldName rogueMiracleList = FieldName.forField("rogueMiracleList", "rogue_miracle_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java index e33b4f4..2ef7b80 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 = 4; + * optional .RogueMiracleInfoData rogue_miracle_info = 1; */ private final RogueMiracleInfoDataOuterClass.RogueMiracleInfoData rogueMiracleInfo = RogueMiracleInfoDataOuterClass.RogueMiracleInfoData.newInstance(); @@ -34,7 +34,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 4; + * optional .RogueMiracleInfoData rogue_miracle_info = 1; * @return whether the rogueMiracleInfo field is set */ public boolean hasRogueMiracleInfo() { @@ -42,7 +42,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 4; + * optional .RogueMiracleInfoData rogue_miracle_info = 1; * @return this */ public RogueMiracleInfo clearRogueMiracleInfo() { @@ -52,7 +52,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 4; + * optional .RogueMiracleInfoData rogue_miracle_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. @@ -66,7 +66,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 4; + * optional .RogueMiracleInfoData rogue_miracle_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 @@ -80,7 +80,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 4; + * optional .RogueMiracleInfoData rogue_miracle_info = 1; * @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) 34); + output.writeRawByte((byte) 10); output.writeMessageNoTag(rogueMiracleInfo); } } @@ -172,7 +172,7 @@ public final class RogueMiracleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { + case 10: { // rogueMiracleInfo input.readMessage(rogueMiracleInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectInfoOuterClass.java index ba0e9d3..135bf78 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectInfoOuterClass.java @@ -20,30 +20,21 @@ public final class RogueMiracleSelectInfoOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     *  idk
-     *
- * - * optional uint32 MMHMDBDONIA = 2; + * optional uint32 JDDLGDNOIEC = 6; */ - private int mMHMDBDONIA; + private int jDDLGDNOIEC; /** - * 
-     *  idk guess source
-     *
- * - * optional uint32 OJOMBNGGHFI = 8; - */ - private int oJOMBNGGHFI; - - /** - * repeated uint32 miracle_info = 5; + * repeated uint32 miracle_info = 2; */ private final RepeatedInt miracleInfo = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 miracle_info_remote = 13; + * 
+     *  PDBKKCBKIOL CPDKDDNBEDN = 9;
+     *
+ * + * repeated uint32 miracle_info_remote = 10; */ private final RepeatedInt miracleInfoRemote = RepeatedInt.newEmptyInstance(); @@ -58,131 +49,62 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * 
-     *  idk
-     *
- * - * optional uint32 MMHMDBDONIA = 2; - * @return whether the mMHMDBDONIA field is set + * optional uint32 JDDLGDNOIEC = 6; + * @return whether the jDDLGDNOIEC field is set */ - public boolean hasMMHMDBDONIA() { + public boolean hasJDDLGDNOIEC() { return (bitField0_ & 0x00000001) != 0; } /** - * 
-     *  idk
-     *
- * - * optional uint32 MMHMDBDONIA = 2; + * optional uint32 JDDLGDNOIEC = 6; * @return this */ - public RogueMiracleSelectInfo clearMMHMDBDONIA() { + public RogueMiracleSelectInfo clearJDDLGDNOIEC() { bitField0_ &= ~0x00000001; - mMHMDBDONIA = 0; + jDDLGDNOIEC = 0; return this; } /** - * 
-     *  idk
-     *
- * - * optional uint32 MMHMDBDONIA = 2; - * @return the mMHMDBDONIA + * optional uint32 JDDLGDNOIEC = 6; + * @return the jDDLGDNOIEC */ - public int getMMHMDBDONIA() { - return mMHMDBDONIA; + public int getJDDLGDNOIEC() { + return jDDLGDNOIEC; } /** - * 
-     *  idk
-     *
- * - * optional uint32 MMHMDBDONIA = 2; - * @param value the mMHMDBDONIA to set + * optional uint32 JDDLGDNOIEC = 6; + * @param value the jDDLGDNOIEC to set * @return this */ - public RogueMiracleSelectInfo setMMHMDBDONIA(final int value) { + public RogueMiracleSelectInfo setJDDLGDNOIEC(final int value) { bitField0_ |= 0x00000001; - mMHMDBDONIA = value; + jDDLGDNOIEC = value; return this; } /** - * 
-     *  idk guess source
-     *
- * - * optional uint32 OJOMBNGGHFI = 8; - * @return whether the oJOMBNGGHFI field is set + * repeated uint32 miracle_info = 2; + * @return whether the miracleInfo field is set */ - public boolean hasOJOMBNGGHFI() { + public boolean hasMiracleInfo() { return (bitField0_ & 0x00000002) != 0; } /** - * 
-     *  idk guess source
-     *
- * - * optional uint32 OJOMBNGGHFI = 8; - * @return this - */ - public RogueMiracleSelectInfo clearOJOMBNGGHFI() { - bitField0_ &= ~0x00000002; - oJOMBNGGHFI = 0; - return this; - } - - /** - * 
-     *  idk guess source
-     *
- * - * optional uint32 OJOMBNGGHFI = 8; - * @return the oJOMBNGGHFI - */ - public int getOJOMBNGGHFI() { - return oJOMBNGGHFI; - } - - /** - * 
-     *  idk guess source
-     *
- * - * optional uint32 OJOMBNGGHFI = 8; - * @param value the oJOMBNGGHFI to set - * @return this - */ - public RogueMiracleSelectInfo setOJOMBNGGHFI(final int value) { - bitField0_ |= 0x00000002; - oJOMBNGGHFI = value; - return this; - } - - /** - * repeated uint32 miracle_info = 5; - * @return whether the miracleInfo field is set - */ - public boolean hasMiracleInfo() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated uint32 miracle_info = 5; + * repeated uint32 miracle_info = 2; * @return this */ public RogueMiracleSelectInfo clearMiracleInfo() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; miracleInfo.clear(); return this; } /** - * repeated uint32 miracle_info = 5; + * repeated uint32 miracle_info = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -196,7 +118,7 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * repeated uint32 miracle_info = 5; + * repeated uint32 miracle_info = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -205,52 +127,64 @@ public final class RogueMiracleSelectInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableMiracleInfo() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return miracleInfo; } /** - * repeated uint32 miracle_info = 5; + * repeated uint32 miracle_info = 2; * @param value the miracleInfo to add * @return this */ public RogueMiracleSelectInfo addMiracleInfo(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; miracleInfo.add(value); return this; } /** - * repeated uint32 miracle_info = 5; + * repeated uint32 miracle_info = 2; * @param values the miracleInfo to add * @return this */ public RogueMiracleSelectInfo addAllMiracleInfo(final int... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; miracleInfo.addAll(values); return this; } /** - * repeated uint32 miracle_info_remote = 13; + * 
+     *  PDBKKCBKIOL CPDKDDNBEDN = 9;
+     *
+ * + * repeated uint32 miracle_info_remote = 10; * @return whether the miracleInfoRemote field is set */ public boolean hasMiracleInfoRemote() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * repeated uint32 miracle_info_remote = 13; + * 
+     *  PDBKKCBKIOL CPDKDDNBEDN = 9;
+     *
+ * + * repeated uint32 miracle_info_remote = 10; * @return this */ public RogueMiracleSelectInfo clearMiracleInfoRemote() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; miracleInfoRemote.clear(); return this; } /** - * repeated uint32 miracle_info_remote = 13; + * 
+     *  PDBKKCBKIOL CPDKDDNBEDN = 9;
+     *
+ * + * repeated uint32 miracle_info_remote = 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. @@ -264,7 +198,11 @@ public final class RogueMiracleSelectInfoOuterClass { } /** - * repeated uint32 miracle_info_remote = 13; + * 
+     *  PDBKKCBKIOL CPDKDDNBEDN = 9;
+     *
+ * + * repeated uint32 miracle_info_remote = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -273,28 +211,36 @@ public final class RogueMiracleSelectInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableMiracleInfoRemote() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return miracleInfoRemote; } /** - * repeated uint32 miracle_info_remote = 13; + * 
+     *  PDBKKCBKIOL CPDKDDNBEDN = 9;
+     *
+ * + * repeated uint32 miracle_info_remote = 10; * @param value the miracleInfoRemote to add * @return this */ public RogueMiracleSelectInfo addMiracleInfoRemote(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; miracleInfoRemote.add(value); return this; } /** - * repeated uint32 miracle_info_remote = 13; + * 
+     *  PDBKKCBKIOL CPDKDDNBEDN = 9;
+     *
+ * + * repeated uint32 miracle_info_remote = 10; * @param values the miracleInfoRemote to add * @return this */ public RogueMiracleSelectInfo addAllMiracleInfoRemote(final int... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; miracleInfoRemote.addAll(values); return this; } @@ -304,8 +250,7 @@ public final class RogueMiracleSelectInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - mMHMDBDONIA = other.mMHMDBDONIA; - oJOMBNGGHFI = other.oJOMBNGGHFI; + jDDLGDNOIEC = other.jDDLGDNOIEC; miracleInfo.copyFrom(other.miracleInfo); miracleInfoRemote.copyFrom(other.miracleInfoRemote); } @@ -318,11 +263,8 @@ public final class RogueMiracleSelectInfoOuterClass { return this; } cachedSize = -1; - if (other.hasMMHMDBDONIA()) { - setMMHMDBDONIA(other.mMHMDBDONIA); - } - if (other.hasOJOMBNGGHFI()) { - setOJOMBNGGHFI(other.oJOMBNGGHFI); + if (other.hasJDDLGDNOIEC()) { + setJDDLGDNOIEC(other.jDDLGDNOIEC); } if (other.hasMiracleInfo()) { getMutableMiracleInfo().addAll(other.miracleInfo); @@ -340,8 +282,7 @@ public final class RogueMiracleSelectInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - mMHMDBDONIA = 0; - oJOMBNGGHFI = 0; + jDDLGDNOIEC = 0; miracleInfo.clear(); miracleInfoRemote.clear(); return this; @@ -369,8 +310,7 @@ public final class RogueMiracleSelectInfoOuterClass { } RogueMiracleSelectInfo other = (RogueMiracleSelectInfo) o; return bitField0_ == other.bitField0_ - && (!hasMMHMDBDONIA() || mMHMDBDONIA == other.mMHMDBDONIA) - && (!hasOJOMBNGGHFI() || oJOMBNGGHFI == other.oJOMBNGGHFI) + && (!hasJDDLGDNOIEC() || jDDLGDNOIEC == other.jDDLGDNOIEC) && (!hasMiracleInfo() || miracleInfo.equals(other.miracleInfo)) && (!hasMiracleInfoRemote() || miracleInfoRemote.equals(other.miracleInfoRemote)); } @@ -378,22 +318,18 @@ public final class RogueMiracleSelectInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(mMHMDBDONIA); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(jDDLGDNOIEC); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(oJOMBNGGHFI); - } - if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < miracleInfo.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(miracleInfo.array()[i]); } } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < miracleInfoRemote.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(miracleInfoRemote.array()[i]); } } @@ -403,15 +339,12 @@ public final class RogueMiracleSelectInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mMHMDBDONIA); + size += 1 + ProtoSink.computeUInt32SizeNoTag(jDDLGDNOIEC); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(oJOMBNGGHFI); - } - if ((bitField0_ & 0x00000004) != 0) { size += (1 * miracleInfo.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(miracleInfo); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += (1 * miracleInfoRemote.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(miracleInfoRemote); } return size; @@ -424,37 +357,28 @@ public final class RogueMiracleSelectInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // mMHMDBDONIA - mMHMDBDONIA = input.readUInt32(); + case 48: { + // jDDLGDNOIEC + jDDLGDNOIEC = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 18) { break; } } - case 64: { - // oJOMBNGGHFI - oJOMBNGGHFI = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 42) { - break; - } - } - case 42: { + case 18: { // miracleInfo [packed=true] input.readPackedUInt32(miracleInfo, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 106) { + if (tag != 82) { break; } } - case 106: { + case 82: { // miracleInfoRemote [packed=true] input.readPackedUInt32(miracleInfoRemote, tag); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { break; @@ -470,16 +394,16 @@ public final class RogueMiracleSelectInfoOuterClass { tag = input.readTag(); break; } - case 40: { + case 16: { // miracleInfo [packed=false] tag = input.readRepeatedUInt32(miracleInfo, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; break; } - case 104: { + case 80: { // miracleInfoRemote [packed=false] tag = input.readRepeatedUInt32(miracleInfoRemote, tag); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; break; } } @@ -490,15 +414,12 @@ public final class RogueMiracleSelectInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.mMHMDBDONIA, mMHMDBDONIA); + output.writeUInt32(FieldNames.jDDLGDNOIEC, jDDLGDNOIEC); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.oJOMBNGGHFI, oJOMBNGGHFI); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedUInt32(FieldNames.miracleInfo, miracleInfo); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedUInt32(FieldNames.miracleInfoRemote, miracleInfoRemote); } output.endObject(); @@ -511,10 +432,10 @@ public final class RogueMiracleSelectInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1232769672: { - if (input.isAtField(FieldNames.mMHMDBDONIA)) { + case 1257811207: { + if (input.isAtField(FieldNames.jDDLGDNOIEC)) { if (!input.trySkipNullValue()) { - mMHMDBDONIA = input.readUInt32(); + jDDLGDNOIEC = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -522,23 +443,12 @@ public final class RogueMiracleSelectInfoOuterClass { } break; } - case -1138375098: { - if (input.isAtField(FieldNames.oJOMBNGGHFI)) { - if (!input.trySkipNullValue()) { - oJOMBNGGHFI = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 760306879: case 2114852796: { if (input.isAtField(FieldNames.miracleInfo)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(miracleInfo); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -550,7 +460,7 @@ public final class RogueMiracleSelectInfoOuterClass { if (input.isAtField(FieldNames.miracleInfoRemote)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(miracleInfoRemote); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -610,9 +520,7 @@ public final class RogueMiracleSelectInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName mMHMDBDONIA = FieldName.forField("MMHMDBDONIA"); - - static final FieldName oJOMBNGGHFI = FieldName.forField("OJOMBNGGHFI"); + static final FieldName jDDLGDNOIEC = FieldName.forField("JDDLGDNOIEC"); static final FieldName miracleInfo = FieldName.forField("miracleInfo", "miracle_info"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java index 5b1360e..68b2e6b 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java @@ -19,7 +19,7 @@ public final class RogueMiracleSelectResultOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 miracle_id = 6; + * optional uint32 miracle_id = 8; */ private int miracleId; @@ -34,7 +34,7 @@ public final class RogueMiracleSelectResultOuterClass { } /** - * optional uint32 miracle_id = 6; + * optional uint32 miracle_id = 8; * @return whether the miracleId field is set */ public boolean hasMiracleId() { @@ -42,7 +42,7 @@ public final class RogueMiracleSelectResultOuterClass { } /** - * optional uint32 miracle_id = 6; + * optional uint32 miracle_id = 8; * @return this */ public RogueMiracleSelectResult clearMiracleId() { @@ -52,7 +52,7 @@ public final class RogueMiracleSelectResultOuterClass { } /** - * optional uint32 miracle_id = 6; + * optional uint32 miracle_id = 8; * @return the miracleId */ public int getMiracleId() { @@ -60,7 +60,7 @@ public final class RogueMiracleSelectResultOuterClass { } /** - * optional uint32 miracle_id = 6; + * optional uint32 miracle_id = 8; * @param value the miracleId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueMiracleSelectResultOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(miracleId); } } @@ -150,7 +150,7 @@ public final class RogueMiracleSelectResultOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 64: { // miracleId miracleId = 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 2f7070f..38f98c3 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java @@ -19,17 +19,17 @@ public final class RogueRecordAvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 id = 6; - */ - private int id; - - /** - * optional uint32 slot = 11; + * optional uint32 slot = 7; */ private int slot; /** - * optional .AvatarType avatar_type = 5; + * optional uint32 id = 14; + */ + private int id; + + /** + * optional .AvatarType avatar_type = 13; */ private int avatarType; @@ -44,62 +44,25 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 id = 6; - * @return whether the id field is set + * optional uint32 slot = 7; + * @return whether the slot field is set */ - public boolean hasId() { + public boolean hasSlot() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 id = 6; - * @return this - */ - public RogueRecordAvatar 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 RogueRecordAvatar setId(final int value) { - bitField0_ |= 0x00000001; - id = value; - return this; - } - - /** - * optional uint32 slot = 11; - * @return whether the slot field is set - */ - public boolean hasSlot() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 slot = 11; + * optional uint32 slot = 7; * @return this */ public RogueRecordAvatar clearSlot() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; slot = 0; return this; } /** - * optional uint32 slot = 11; + * optional uint32 slot = 7; * @return the slot */ public int getSlot() { @@ -107,18 +70,55 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 slot = 11; + * optional uint32 slot = 7; * @param value the slot to set * @return this */ public RogueRecordAvatar setSlot(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; slot = value; return this; } /** - * optional .AvatarType avatar_type = 5; + * optional uint32 id = 14; + * @return whether the id field is set + */ + public boolean hasId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 id = 14; + * @return this + */ + public RogueRecordAvatar clearId() { + bitField0_ &= ~0x00000002; + id = 0; + return this; + } + + /** + * optional uint32 id = 14; + * @return the id + */ + public int getId() { + return id; + } + + /** + * optional uint32 id = 14; + * @param value the id to set + * @return this + */ + public RogueRecordAvatar setId(final int value) { + bitField0_ |= 0x00000002; + id = value; + return this; + } + + /** + * optional .AvatarType avatar_type = 13; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -126,7 +126,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional .AvatarType avatar_type = 5; + * optional .AvatarType avatar_type = 13; * @return this */ public RogueRecordAvatar clearAvatarType() { @@ -136,7 +136,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional .AvatarType avatar_type = 5; + * optional .AvatarType avatar_type = 13; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -169,7 +169,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional .AvatarType avatar_type = 5; + * optional .AvatarType avatar_type = 13; * @param value the avatarType to set * @return this */ @@ -184,8 +184,8 @@ public final class RogueRecordAvatarOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - id = other.id; slot = other.slot; + id = other.id; avatarType = other.avatarType; } return this; @@ -197,12 +197,12 @@ public final class RogueRecordAvatarOuterClass { return this; } cachedSize = -1; - if (other.hasId()) { - setId(other.id); - } if (other.hasSlot()) { setSlot(other.slot); } + if (other.hasId()) { + setId(other.id); + } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); } @@ -216,8 +216,8 @@ public final class RogueRecordAvatarOuterClass { } cachedSize = -1; bitField0_ = 0; - id = 0; slot = 0; + id = 0; avatarType = 0; return this; } @@ -242,23 +242,23 @@ public final class RogueRecordAvatarOuterClass { } RogueRecordAvatar other = (RogueRecordAvatar) o; return bitField0_ == other.bitField0_ - && (!hasId() || id == other.id) && (!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) 48); - output.writeUInt32NoTag(id); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(slot); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(id); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 104); output.writeEnumNoTag(avatarType); } } @@ -267,10 +267,10 @@ public final class RogueRecordAvatarOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); @@ -285,25 +285,25 @@ public final class RogueRecordAvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // id - id = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 56: { // slot slot = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 112) { break; } } - case 40: { + case 112: { + // id + id = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -333,10 +333,10 @@ public final class RogueRecordAvatarOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000004) != 0) { output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); @@ -351,10 +351,10 @@ public final class RogueRecordAvatarOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3355: { - if (input.isAtField(FieldNames.id)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - id = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -362,10 +362,10 @@ public final class RogueRecordAvatarOuterClass { } break; } - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case 3355: { + if (input.isAtField(FieldNames.id)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + id = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -443,10 +443,10 @@ public final class RogueRecordAvatarOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName id = FieldName.forField("id"); - 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/RogueRerollBuffOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRerollBuffOuterClass.java index 81247b6..14b4976 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 = 11; + * optional .RogueCommonBuffSelectInfo buff_select_info = 14; */ private final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo buffSelectInfo = RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo.newInstance(); @@ -34,7 +34,7 @@ public final class RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 11; + * optional .RogueCommonBuffSelectInfo buff_select_info = 14; * @return whether the buffSelectInfo field is set */ public boolean hasBuffSelectInfo() { @@ -42,7 +42,7 @@ public final class RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 11; + * optional .RogueCommonBuffSelectInfo buff_select_info = 14; * @return this */ public RogueRerollBuff clearBuffSelectInfo() { @@ -52,7 +52,7 @@ public final class RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 11; + * optional .RogueCommonBuffSelectInfo buff_select_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 RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 11; + * optional .RogueCommonBuffSelectInfo buff_select_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 @@ -81,7 +81,7 @@ public final class RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 11; + * optional .RogueCommonBuffSelectInfo buff_select_info = 14; * @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) 90); + output.writeRawByte((byte) 114); output.writeMessageNoTag(buffSelectInfo); } } @@ -173,7 +173,7 @@ public final class RogueRerollBuffOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 90: { + case 114: { // 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 e279cb5..9de60b7 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java @@ -19,25 +19,25 @@ public final class RogueRoomOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 site_id = 12; + * optional uint32 site_id = 2; */ private int siteId; /** * 
-     * uint32 BNKNFOGGPMG = 6;
+     * uint32 LFNBMDFGOOC = 11;
      *
* - * optional uint32 room_id = 15; + * optional uint32 room_id = 7; */ private int roomId; /** * 
-     * IOLBGHALAHK MHIHFPAFLDO = 8;
+     * RogueRoomStatus PJNKDHEEEGE = 5;
      *
* - * optional .RogueRoomStatus room_status = 13; + * optional .RogueRoomStatus room_status = 12; */ private int roomStatus; @@ -52,7 +52,7 @@ public final class RogueRoomOuterClass { } /** - * optional uint32 site_id = 12; + * optional uint32 site_id = 2; * @return whether the siteId field is set */ public boolean hasSiteId() { @@ -60,7 +60,7 @@ public final class RogueRoomOuterClass { } /** - * optional uint32 site_id = 12; + * optional uint32 site_id = 2; * @return this */ public RogueRoom clearSiteId() { @@ -70,7 +70,7 @@ public final class RogueRoomOuterClass { } /** - * optional uint32 site_id = 12; + * optional uint32 site_id = 2; * @return the siteId */ public int getSiteId() { @@ -78,7 +78,7 @@ public final class RogueRoomOuterClass { } /** - * optional uint32 site_id = 12; + * optional uint32 site_id = 2; * @param value the siteId to set * @return this */ @@ -90,10 +90,10 @@ public final class RogueRoomOuterClass { /** * 
-     * uint32 BNKNFOGGPMG = 6;
+     * uint32 LFNBMDFGOOC = 11;
      *
* - * optional uint32 room_id = 15; + * optional uint32 room_id = 7; * @return whether the roomId field is set */ public boolean hasRoomId() { @@ -102,10 +102,10 @@ public final class RogueRoomOuterClass { /** * 
-     * uint32 BNKNFOGGPMG = 6;
+     * uint32 LFNBMDFGOOC = 11;
      *
* - * optional uint32 room_id = 15; + * optional uint32 room_id = 7; * @return this */ public RogueRoom clearRoomId() { @@ -116,10 +116,10 @@ public final class RogueRoomOuterClass { /** * 
-     * uint32 BNKNFOGGPMG = 6;
+     * uint32 LFNBMDFGOOC = 11;
      *
* - * optional uint32 room_id = 15; + * optional uint32 room_id = 7; * @return the roomId */ public int getRoomId() { @@ -128,10 +128,10 @@ public final class RogueRoomOuterClass { /** * 
-     * uint32 BNKNFOGGPMG = 6;
+     * uint32 LFNBMDFGOOC = 11;
      *
* - * optional uint32 room_id = 15; + * optional uint32 room_id = 7; * @param value the roomId to set * @return this */ @@ -143,10 +143,10 @@ public final class RogueRoomOuterClass { /** * 
-     * IOLBGHALAHK MHIHFPAFLDO = 8;
+     * RogueRoomStatus PJNKDHEEEGE = 5;
      *
* - * optional .RogueRoomStatus room_status = 13; + * optional .RogueRoomStatus room_status = 12; * @return whether the roomStatus field is set */ public boolean hasRoomStatus() { @@ -155,10 +155,10 @@ public final class RogueRoomOuterClass { /** * 
-     * IOLBGHALAHK MHIHFPAFLDO = 8;
+     * RogueRoomStatus PJNKDHEEEGE = 5;
      *
* - * optional .RogueRoomStatus room_status = 13; + * optional .RogueRoomStatus room_status = 12; * @return this */ public RogueRoom clearRoomStatus() { @@ -169,10 +169,10 @@ public final class RogueRoomOuterClass { /** * 
-     * IOLBGHALAHK MHIHFPAFLDO = 8;
+     * RogueRoomStatus PJNKDHEEEGE = 5;
      *
* - * optional .RogueRoomStatus room_status = 13; + * optional .RogueRoomStatus room_status = 12; * @return the roomStatus */ public RogueRoomStatusOuterClass.RogueRoomStatus getRoomStatus() { @@ -206,10 +206,10 @@ public final class RogueRoomOuterClass { /** * 
-     * IOLBGHALAHK MHIHFPAFLDO = 8;
+     * RogueRoomStatus PJNKDHEEEGE = 5;
      *
* - * optional .RogueRoomStatus room_status = 13; + * optional .RogueRoomStatus room_status = 12; * @param value the roomStatus to set * @return this */ @@ -290,15 +290,15 @@ public final class RogueRoomOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(siteId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(roomId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 96); output.writeEnumNoTag(roomStatus); } } @@ -325,25 +325,25 @@ public final class RogueRoomOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 16: { // siteId siteId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 56) { break; } } - case 120: { + case 56: { // roomId roomId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 96) { break; } } - case 104: { + case 96: { // roomStatus final int value = input.readInt32(); if (RogueRoomStatusOuterClass.RogueRoomStatus.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java index ccf5b28..0397574 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java @@ -19,31 +19,31 @@ public final class RogueScoreRewardInfoOuterClass { public static final class RogueScoreRewardInfo extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * 
-     *  guess, either this or begin_time
-     *
- * - * optional int64 end_time = 3; - */ - private long endTime; - /** * 
      *  guess, either this or end_time
      *
* - * optional int64 begin_time = 6; + * optional int64 begin_time = 2; */ private long beginTime; /** - * optional uint32 score = 7; + * 
+     *  guess, either this or begin_time
+     *
+ * + * optional int64 end_time = 5; + */ + private long endTime; + + /** + * optional uint32 score = 6; */ private int score; /** - * optional uint32 pool_id = 11; + * optional uint32 pool_id = 9; */ private int poolId; @@ -52,7 +52,7 @@ public final class RogueScoreRewardInfoOuterClass { * guess * * - * optional bool has_taken_initial_score = 13; + * optional bool has_taken_initial_score = 7; */ private boolean hasTakenInitialScore; @@ -66,7 +66,7 @@ public final class RogueScoreRewardInfoOuterClass { private boolean poolRefreshed; /** - * repeated uint32 has_taken_reward = 5; + * repeated uint32 has_taken_reward = 3; */ private final RepeatedInt hasTakenReward = RepeatedInt.newEmptyInstance(); @@ -82,79 +82,26 @@ public final class RogueScoreRewardInfoOuterClass { /** * 
-     *  guess, either this or begin_time
+     *  guess, either this or end_time
      *
* - * optional int64 end_time = 3; - * @return whether the endTime field is set + * optional int64 begin_time = 2; + * @return whether the beginTime field is set */ - public boolean hasEndTime() { + public boolean hasBeginTime() { return (bitField0_ & 0x00000001) != 0; } - /** - * 
-     *  guess, either this or begin_time
-     *
- * - * optional int64 end_time = 3; - * @return this - */ - public RogueScoreRewardInfo clearEndTime() { - bitField0_ &= ~0x00000001; - endTime = 0L; - return this; - } - - /** - * 
-     *  guess, either this or begin_time
-     *
- * - * optional int64 end_time = 3; - * @return the endTime - */ - public long getEndTime() { - return endTime; - } - - /** - * 
-     *  guess, either this or begin_time
-     *
- * - * optional int64 end_time = 3; - * @param value the endTime to set - * @return this - */ - public RogueScoreRewardInfo setEndTime(final long value) { - bitField0_ |= 0x00000001; - endTime = value; - return this; - } - /** * 
      *  guess, either this or end_time
      *
* - * optional int64 begin_time = 6; - * @return whether the beginTime field is set - */ - public boolean hasBeginTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * 
-     *  guess, either this or end_time
-     *
- * - * optional int64 begin_time = 6; + * optional int64 begin_time = 2; * @return this */ public RogueScoreRewardInfo clearBeginTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; beginTime = 0L; return this; } @@ -164,7 +111,7 @@ public final class RogueScoreRewardInfoOuterClass { * guess, either this or end_time * * - * optional int64 begin_time = 6; + * optional int64 begin_time = 2; * @return the beginTime */ public long getBeginTime() { @@ -176,18 +123,71 @@ public final class RogueScoreRewardInfoOuterClass { * guess, either this or end_time * * - * optional int64 begin_time = 6; + * optional int64 begin_time = 2; * @param value the beginTime to set * @return this */ public RogueScoreRewardInfo setBeginTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; beginTime = value; return this; } /** - * optional uint32 score = 7; + * 
+     *  guess, either this or begin_time
+     *
+ * + * optional int64 end_time = 5; + * @return whether the endTime field is set + */ + public boolean hasEndTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * 
+     *  guess, either this or begin_time
+     *
+ * + * optional int64 end_time = 5; + * @return this + */ + public RogueScoreRewardInfo clearEndTime() { + bitField0_ &= ~0x00000002; + endTime = 0L; + return this; + } + + /** + * 
+     *  guess, either this or begin_time
+     *
+ * + * optional int64 end_time = 5; + * @return the endTime + */ + public long getEndTime() { + return endTime; + } + + /** + * 
+     *  guess, either this or begin_time
+     *
+ * + * optional int64 end_time = 5; + * @param value the endTime to set + * @return this + */ + public RogueScoreRewardInfo setEndTime(final long value) { + bitField0_ |= 0x00000002; + endTime = value; + return this; + } + + /** + * optional uint32 score = 6; * @return whether the score field is set */ public boolean hasScore() { @@ -195,7 +195,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 score = 7; + * optional uint32 score = 6; * @return this */ public RogueScoreRewardInfo clearScore() { @@ -205,7 +205,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 score = 7; + * optional uint32 score = 6; * @return the score */ public int getScore() { @@ -213,7 +213,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 score = 7; + * optional uint32 score = 6; * @param value the score to set * @return this */ @@ -224,7 +224,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 pool_id = 11; + * optional uint32 pool_id = 9; * @return whether the poolId field is set */ public boolean hasPoolId() { @@ -232,7 +232,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 pool_id = 11; + * optional uint32 pool_id = 9; * @return this */ public RogueScoreRewardInfo clearPoolId() { @@ -242,7 +242,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 pool_id = 11; + * optional uint32 pool_id = 9; * @return the poolId */ public int getPoolId() { @@ -250,7 +250,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 pool_id = 11; + * optional uint32 pool_id = 9; * @param value the poolId to set * @return this */ @@ -265,7 +265,7 @@ public final class RogueScoreRewardInfoOuterClass { * guess * * - * optional bool has_taken_initial_score = 13; + * optional bool has_taken_initial_score = 7; * @return whether the hasTakenInitialScore field is set */ public boolean hasHasTakenInitialScore() { @@ -277,7 +277,7 @@ public final class RogueScoreRewardInfoOuterClass { * guess * * - * optional bool has_taken_initial_score = 13; + * optional bool has_taken_initial_score = 7; * @return this */ public RogueScoreRewardInfo clearHasTakenInitialScore() { @@ -291,7 +291,7 @@ public final class RogueScoreRewardInfoOuterClass { * guess * * - * optional bool has_taken_initial_score = 13; + * optional bool has_taken_initial_score = 7; * @return the hasTakenInitialScore */ public boolean getHasTakenInitialScore() { @@ -303,7 +303,7 @@ public final class RogueScoreRewardInfoOuterClass { * guess * * - * optional bool has_taken_initial_score = 13; + * optional bool has_taken_initial_score = 7; * @param value the hasTakenInitialScore to set * @return this */ @@ -367,7 +367,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 5; + * repeated uint32 has_taken_reward = 3; * @return whether the hasTakenReward field is set */ public boolean hasHasTakenReward() { @@ -375,7 +375,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 5; + * repeated uint32 has_taken_reward = 3; * @return this */ public RogueScoreRewardInfo clearHasTakenReward() { @@ -385,7 +385,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 5; + * repeated uint32 has_taken_reward = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -399,7 +399,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 5; + * repeated uint32 has_taken_reward = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -413,7 +413,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 5; + * repeated uint32 has_taken_reward = 3; * @param value the hasTakenReward to add * @return this */ @@ -424,7 +424,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 5; + * repeated uint32 has_taken_reward = 3; * @param values the hasTakenReward to add * @return this */ @@ -439,8 +439,8 @@ public final class RogueScoreRewardInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - endTime = other.endTime; beginTime = other.beginTime; + endTime = other.endTime; score = other.score; poolId = other.poolId; hasTakenInitialScore = other.hasTakenInitialScore; @@ -456,12 +456,12 @@ public final class RogueScoreRewardInfoOuterClass { return this; } cachedSize = -1; - if (other.hasEndTime()) { - setEndTime(other.endTime); - } if (other.hasBeginTime()) { setBeginTime(other.beginTime); } + if (other.hasEndTime()) { + setEndTime(other.endTime); + } if (other.hasScore()) { setScore(other.score); } @@ -487,8 +487,8 @@ public final class RogueScoreRewardInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - endTime = 0L; beginTime = 0L; + endTime = 0L; score = 0; poolId = 0; hasTakenInitialScore = false; @@ -518,8 +518,8 @@ public final class RogueScoreRewardInfoOuterClass { } RogueScoreRewardInfo other = (RogueScoreRewardInfo) o; return bitField0_ == other.bitField0_ - && (!hasEndTime() || endTime == other.endTime) && (!hasBeginTime() || beginTime == other.beginTime) + && (!hasEndTime() || endTime == other.endTime) && (!hasScore() || score == other.score) && (!hasPoolId() || poolId == other.poolId) && (!hasHasTakenInitialScore() || hasTakenInitialScore == other.hasTakenInitialScore) @@ -530,23 +530,23 @@ public final class RogueScoreRewardInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeInt64NoTag(endTime); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 16); output.writeInt64NoTag(beginTime); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); + output.writeInt64NoTag(endTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(score); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(poolId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 56); output.writeBoolNoTag(hasTakenInitialScore); } if ((bitField0_ & 0x00000020) != 0) { @@ -555,7 +555,7 @@ public final class RogueScoreRewardInfoOuterClass { } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < hasTakenReward.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(hasTakenReward.array()[i]); } } @@ -565,10 +565,10 @@ public final class RogueScoreRewardInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(score); @@ -595,43 +595,43 @@ public final class RogueScoreRewardInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 16: { + // beginTime + beginTime = input.readInt64(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // endTime endTime = input.readInt64(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 48) { break; } } case 48: { - // beginTime - beginTime = input.readInt64(); - bitField0_ |= 0x00000002; + // score + score = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // poolId + poolId = input.readUInt32(); + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 56) { break; } } case 56: { - // score - score = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // poolId - poolId = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { // hasTakenInitialScore hasTakenInitialScore = input.readBool(); bitField0_ |= 0x00000010; @@ -645,11 +645,11 @@ public final class RogueScoreRewardInfoOuterClass { poolRefreshed = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 42) { + if (tag != 26) { break; } } - case 42: { + case 26: { // hasTakenReward [packed=true] input.readPackedUInt32(hasTakenReward, tag); bitField0_ |= 0x00000040; @@ -668,7 +668,7 @@ public final class RogueScoreRewardInfoOuterClass { tag = input.readTag(); break; } - case 40: { + case 24: { // hasTakenReward [packed=false] tag = input.readRepeatedUInt32(hasTakenReward, tag); bitField0_ |= 0x00000040; @@ -682,10 +682,10 @@ public final class RogueScoreRewardInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.endTime, endTime); + output.writeInt64(FieldNames.beginTime, beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeInt64(FieldNames.beginTime, beginTime); + output.writeInt64(FieldNames.endTime, endTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.score, score); @@ -712,11 +712,11 @@ public final class RogueScoreRewardInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1607243192: - case 1725551537: { - if (input.isAtField(FieldNames.endTime)) { + case -1072839914: + case 1112183971: { + if (input.isAtField(FieldNames.beginTime)) { if (!input.trySkipNullValue()) { - endTime = input.readInt64(); + beginTime = input.readInt64(); bitField0_ |= 0x00000001; } } else { @@ -724,11 +724,11 @@ public final class RogueScoreRewardInfoOuterClass { } break; } - case -1072839914: - case 1112183971: { - if (input.isAtField(FieldNames.beginTime)) { + case -1607243192: + case 1725551537: { + if (input.isAtField(FieldNames.endTime)) { if (!input.trySkipNullValue()) { - beginTime = input.readInt64(); + endTime = input.readInt64(); bitField0_ |= 0x00000002; } } else { @@ -848,10 +848,10 @@ public final class RogueScoreRewardInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName endTime = FieldName.forField("endTime", "end_time"); - static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); + static final FieldName endTime = FieldName.forField("endTime", "end_time"); + static final FieldName score = FieldName.forField("score"); static final FieldName poolId = FieldName.forField("poolId", "pool_id"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java index e831595..a39a434 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java @@ -19,17 +19,17 @@ public final class RogueSeasonInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 6; - */ - private long beginTime; - - /** - * optional int64 end_time = 10; + * optional int64 end_time = 3; */ private long endTime; /** - * optional uint32 season_id = 11; + * optional int64 begin_time = 15; + */ + private long beginTime; + + /** + * optional uint32 season_id = 5; */ private int seasonId; @@ -44,62 +44,25 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 begin_time = 6; - * @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 = 6; - * @return this - */ - public RogueSeasonInfo clearBeginTime() { - bitField0_ &= ~0x00000001; - beginTime = 0L; - return this; - } - - /** - * optional int64 begin_time = 6; - * @return the beginTime - */ - public long getBeginTime() { - return beginTime; - } - - /** - * optional int64 begin_time = 6; - * @param value the beginTime to set - * @return this - */ - public RogueSeasonInfo setBeginTime(final long value) { - bitField0_ |= 0x00000001; - beginTime = value; - return this; - } - - /** - * optional int64 end_time = 10; - * @return whether the endTime field is set - */ - public boolean hasEndTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 end_time = 10; + * optional int64 end_time = 3; * @return this */ public RogueSeasonInfo clearEndTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; endTime = 0L; return this; } /** - * optional int64 end_time = 10; + * optional int64 end_time = 3; * @return the endTime */ public long getEndTime() { @@ -107,18 +70,55 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 end_time = 10; + * optional int64 end_time = 3; * @param value the endTime to set * @return this */ public RogueSeasonInfo setEndTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; endTime = value; return this; } /** - * optional uint32 season_id = 11; + * optional int64 begin_time = 15; + * @return whether the beginTime field is set + */ + public boolean hasBeginTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 begin_time = 15; + * @return this + */ + public RogueSeasonInfo clearBeginTime() { + bitField0_ &= ~0x00000002; + beginTime = 0L; + return this; + } + + /** + * optional int64 begin_time = 15; + * @return the beginTime + */ + public long getBeginTime() { + return beginTime; + } + + /** + * optional int64 begin_time = 15; + * @param value the beginTime to set + * @return this + */ + public RogueSeasonInfo setBeginTime(final long value) { + bitField0_ |= 0x00000002; + beginTime = value; + return this; + } + + /** + * optional uint32 season_id = 5; * @return whether the seasonId field is set */ public boolean hasSeasonId() { @@ -126,7 +126,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional uint32 season_id = 11; + * optional uint32 season_id = 5; * @return this */ public RogueSeasonInfo clearSeasonId() { @@ -136,7 +136,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional uint32 season_id = 11; + * optional uint32 season_id = 5; * @return the seasonId */ public int getSeasonId() { @@ -144,7 +144,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional uint32 season_id = 11; + * optional uint32 season_id = 5; * @param value the seasonId to set * @return this */ @@ -159,8 +159,8 @@ public final class RogueSeasonInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - beginTime = other.beginTime; endTime = other.endTime; + beginTime = other.beginTime; seasonId = other.seasonId; } return this; @@ -172,12 +172,12 @@ public final class RogueSeasonInfoOuterClass { return this; } cachedSize = -1; - if (other.hasBeginTime()) { - setBeginTime(other.beginTime); - } if (other.hasEndTime()) { setEndTime(other.endTime); } + if (other.hasBeginTime()) { + setBeginTime(other.beginTime); + } if (other.hasSeasonId()) { setSeasonId(other.seasonId); } @@ -191,8 +191,8 @@ public final class RogueSeasonInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - beginTime = 0L; endTime = 0L; + beginTime = 0L; seasonId = 0; return this; } @@ -217,23 +217,23 @@ public final class RogueSeasonInfoOuterClass { } RogueSeasonInfo other = (RogueSeasonInfo) o; return bitField0_ == other.bitField0_ - && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) + && (!hasBeginTime() || beginTime == other.beginTime) && (!hasSeasonId() || seasonId == other.seasonId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeInt64NoTag(beginTime); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 24); output.writeInt64NoTag(endTime); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeInt64NoTag(beginTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(seasonId); } } @@ -242,10 +242,10 @@ public final class RogueSeasonInfoOuterClass { 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(seasonId); @@ -260,25 +260,25 @@ public final class RogueSeasonInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // beginTime - beginTime = input.readInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 24: { // endTime endTime = input.readInt64(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 120) { break; } } - case 88: { + case 120: { + // beginTime + beginTime = input.readInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // seasonId seasonId = input.readUInt32(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class RogueSeasonInfoOuterClass { 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.seasonId, seasonId); @@ -323,11 +323,11 @@ public final class RogueSeasonInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1072839914: - case 1112183971: { - if (input.isAtField(FieldNames.beginTime)) { + case -1607243192: + case 1725551537: { + if (input.isAtField(FieldNames.endTime)) { if (!input.trySkipNullValue()) { - beginTime = input.readInt64(); + endTime = input.readInt64(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +335,11 @@ public final class RogueSeasonInfoOuterClass { } break; } - case -1607243192: - case 1725551537: { - if (input.isAtField(FieldNames.endTime)) { + case -1072839914: + case 1112183971: { + if (input.isAtField(FieldNames.beginTime)) { if (!input.trySkipNullValue()) { - endTime = input.readInt64(); + beginTime = input.readInt64(); bitField0_ |= 0x00000002; } } else { @@ -412,10 +412,10 @@ public final class RogueSeasonInfoOuterClass { * 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 seasonId = FieldName.forField("seasonId", "season_id"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java index 273c8fd..c5745b6 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java @@ -19,15 +19,15 @@ public final class RogueSyncContextBoardEventOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 board_event_id = 1; - */ - private int boardEventId; - - /** - * optional uint32 modifier_effect_type = 6; + * optional uint32 modifier_effect_type = 4; */ private int modifierEffectType; + /** + * optional uint32 board_event_id = 13; + */ + private int boardEventId; + private RogueSyncContextBoardEvent() { } @@ -39,62 +39,25 @@ public final class RogueSyncContextBoardEventOuterClass { } /** - * optional uint32 board_event_id = 1; - * @return whether the boardEventId field is set + * optional uint32 modifier_effect_type = 4; + * @return whether the modifierEffectType field is set */ - public boolean hasBoardEventId() { + public boolean hasModifierEffectType() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 board_event_id = 1; - * @return this - */ - public RogueSyncContextBoardEvent clearBoardEventId() { - bitField0_ &= ~0x00000001; - boardEventId = 0; - return this; - } - - /** - * optional uint32 board_event_id = 1; - * @return the boardEventId - */ - public int getBoardEventId() { - return boardEventId; - } - - /** - * optional uint32 board_event_id = 1; - * @param value the boardEventId to set - * @return this - */ - public RogueSyncContextBoardEvent setBoardEventId(final int value) { - bitField0_ |= 0x00000001; - boardEventId = value; - return this; - } - - /** - * optional uint32 modifier_effect_type = 6; - * @return whether the modifierEffectType field is set - */ - public boolean hasModifierEffectType() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 modifier_effect_type = 6; + * optional uint32 modifier_effect_type = 4; * @return this */ public RogueSyncContextBoardEvent clearModifierEffectType() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; modifierEffectType = 0; return this; } /** - * optional uint32 modifier_effect_type = 6; + * optional uint32 modifier_effect_type = 4; * @return the modifierEffectType */ public int getModifierEffectType() { @@ -102,23 +65,60 @@ public final class RogueSyncContextBoardEventOuterClass { } /** - * optional uint32 modifier_effect_type = 6; + * optional uint32 modifier_effect_type = 4; * @param value the modifierEffectType to set * @return this */ public RogueSyncContextBoardEvent setModifierEffectType(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; modifierEffectType = value; return this; } + /** + * optional uint32 board_event_id = 13; + * @return whether the boardEventId field is set + */ + public boolean hasBoardEventId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 board_event_id = 13; + * @return this + */ + public RogueSyncContextBoardEvent clearBoardEventId() { + bitField0_ &= ~0x00000002; + boardEventId = 0; + return this; + } + + /** + * optional uint32 board_event_id = 13; + * @return the boardEventId + */ + public int getBoardEventId() { + return boardEventId; + } + + /** + * optional uint32 board_event_id = 13; + * @param value the boardEventId to set + * @return this + */ + public RogueSyncContextBoardEvent setBoardEventId(final int value) { + bitField0_ |= 0x00000002; + boardEventId = value; + return this; + } + @Override public RogueSyncContextBoardEvent copyFrom(final RogueSyncContextBoardEvent other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - boardEventId = other.boardEventId; modifierEffectType = other.modifierEffectType; + boardEventId = other.boardEventId; } return this; } @@ -129,12 +129,12 @@ public final class RogueSyncContextBoardEventOuterClass { return this; } cachedSize = -1; - if (other.hasBoardEventId()) { - setBoardEventId(other.boardEventId); - } if (other.hasModifierEffectType()) { setModifierEffectType(other.modifierEffectType); } + if (other.hasBoardEventId()) { + setBoardEventId(other.boardEventId); + } return this; } @@ -145,8 +145,8 @@ public final class RogueSyncContextBoardEventOuterClass { } cachedSize = -1; bitField0_ = 0; - boardEventId = 0; modifierEffectType = 0; + boardEventId = 0; return this; } @@ -170,19 +170,19 @@ public final class RogueSyncContextBoardEventOuterClass { } RogueSyncContextBoardEvent other = (RogueSyncContextBoardEvent) o; return bitField0_ == other.bitField0_ - && (!hasBoardEventId() || boardEventId == other.boardEventId) - && (!hasModifierEffectType() || modifierEffectType == other.modifierEffectType); + && (!hasModifierEffectType() || modifierEffectType == other.modifierEffectType) + && (!hasBoardEventId() || boardEventId == other.boardEventId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(boardEventId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(modifierEffectType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(modifierEffectType); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(boardEventId); } } @@ -190,10 +190,10 @@ public final class RogueSyncContextBoardEventOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(boardEventId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(modifierEffectType); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(modifierEffectType); + size += 1 + ProtoSink.computeUInt32SizeNoTag(boardEventId); } return size; } @@ -205,18 +205,18 @@ public final class RogueSyncContextBoardEventOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // boardEventId - boardEventId = input.readUInt32(); + case 32: { + // modifierEffectType + modifierEffectType = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 104) { break; } } - case 48: { - // modifierEffectType - modifierEffectType = input.readUInt32(); + case 104: { + // boardEventId + boardEventId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class RogueSyncContextBoardEventOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.boardEventId, boardEventId); + output.writeUInt32(FieldNames.modifierEffectType, modifierEffectType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.modifierEffectType, modifierEffectType); + output.writeUInt32(FieldNames.boardEventId, boardEventId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class RogueSyncContextBoardEventOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1130727537: - case -1668848103: { - if (input.isAtField(FieldNames.boardEventId)) { + case -1445000542: + case -145180736: { + if (input.isAtField(FieldNames.modifierEffectType)) { if (!input.trySkipNullValue()) { - boardEventId = input.readUInt32(); + modifierEffectType = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class RogueSyncContextBoardEventOuterClass { } break; } - case -1445000542: - case -145180736: { - if (input.isAtField(FieldNames.modifierEffectType)) { + case -1130727537: + case -1668848103: { + if (input.isAtField(FieldNames.boardEventId)) { if (!input.trySkipNullValue()) { - modifierEffectType = input.readUInt32(); + boardEventId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class RogueSyncContextBoardEventOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName boardEventId = FieldName.forField("boardEventId", "board_event_id"); - static final FieldName modifierEffectType = FieldName.forField("modifierEffectType", "modifier_effect_type"); + + static final FieldName boardEventId = FieldName.forField("boardEventId", "board_event_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueTalentInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueTalentInfoOuterClass.java index 2da35ae..d09150a 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 = 3; + * repeated .RogueTalent rogue_talent = 4; */ private final RepeatedMessage rogueTalent = RepeatedMessage.newEmptyInstance(RogueTalentOuterClass.RogueTalent.getFactory()); @@ -35,7 +35,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 3; + * repeated .RogueTalent rogue_talent = 4; * @return whether the rogueTalent field is set */ public boolean hasRogueTalent() { @@ -43,7 +43,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 3; + * repeated .RogueTalent rogue_talent = 4; * @return this */ public RogueTalentInfo clearRogueTalent() { @@ -53,7 +53,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 3; + * repeated .RogueTalent rogue_talent = 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 RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 3; + * repeated .RogueTalent rogue_talent = 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 RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 3; + * repeated .RogueTalent rogue_talent = 4; * @param value the rogueTalent to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 3; + * repeated .RogueTalent rogue_talent = 4; * @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) 26); + output.writeRawByte((byte) 34); output.writeMessageNoTag(rogueTalent.get(i)); } } @@ -185,7 +185,7 @@ public final class RogueTalentInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { + case 34: { // 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 b001c66..4299455 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 = 1; + * optional uint32 talent_id = 13; */ private int talentId; /** - * optional .RogueTalentStatus status = 3; + * optional .RogueTalentStatus status = 12; */ private int status; /** - * repeated .RogueUnlockProgress unlock_progress_list = 7; + * repeated .RogueUnlockProgress unlock_progress_list = 3; */ private final RepeatedMessage unlockProgressList = RepeatedMessage.newEmptyInstance(RogueUnlockProgressOuterClass.RogueUnlockProgress.getFactory()); @@ -45,7 +45,7 @@ public final class RogueTalentOuterClass { } /** - * optional uint32 talent_id = 1; + * optional uint32 talent_id = 13; * @return whether the talentId field is set */ public boolean hasTalentId() { @@ -53,7 +53,7 @@ public final class RogueTalentOuterClass { } /** - * optional uint32 talent_id = 1; + * optional uint32 talent_id = 13; * @return this */ public RogueTalent clearTalentId() { @@ -63,7 +63,7 @@ public final class RogueTalentOuterClass { } /** - * optional uint32 talent_id = 1; + * optional uint32 talent_id = 13; * @return the talentId */ public int getTalentId() { @@ -71,7 +71,7 @@ public final class RogueTalentOuterClass { } /** - * optional uint32 talent_id = 1; + * optional uint32 talent_id = 13; * @param value the talentId to set * @return this */ @@ -82,7 +82,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 3; + * optional .RogueTalentStatus status = 12; * @return whether the status field is set */ public boolean hasStatus() { @@ -90,7 +90,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 3; + * optional .RogueTalentStatus status = 12; * @return this */ public RogueTalent clearStatus() { @@ -100,7 +100,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 3; + * optional .RogueTalentStatus status = 12; * @return the status */ public RogueTalentStatusOuterClass.RogueTalentStatus getStatus() { @@ -133,7 +133,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 3; + * optional .RogueTalentStatus status = 12; * @param value the status to set * @return this */ @@ -144,7 +144,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 7; + * repeated .RogueUnlockProgress unlock_progress_list = 3; * @return whether the unlockProgressList field is set */ public boolean hasUnlockProgressList() { @@ -152,7 +152,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 7; + * repeated .RogueUnlockProgress unlock_progress_list = 3; * @return this */ public RogueTalent clearUnlockProgressList() { @@ -162,7 +162,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 7; + * repeated .RogueUnlockProgress unlock_progress_list = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -177,7 +177,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 7; + * repeated .RogueUnlockProgress unlock_progress_list = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -192,7 +192,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 7; + * repeated .RogueUnlockProgress unlock_progress_list = 3; * @param value the unlockProgressList to add * @return this */ @@ -204,7 +204,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 7; + * repeated .RogueUnlockProgress unlock_progress_list = 3; * @param values the unlockProgressList to add * @return this */ @@ -287,16 +287,16 @@ public final class RogueTalentOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(talentId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 96); output.writeEnumNoTag(status); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < unlockProgressList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 26); output.writeMessageNoTag(unlockProgressList.get(i)); } } @@ -324,16 +324,16 @@ public final class RogueTalentOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 104: { // talentId talentId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 96) { break; } } - case 24: { + case 96: { // 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 != 58) { + if (tag != 26) { break; } } - case 58: { + case 26: { // unlockProgressList tag = input.readRepeatedMessage(unlockProgressList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RogueUnlockProgressOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueUnlockProgressOuterClass.java index 560b2da..1a00649 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueUnlockProgressOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueUnlockProgressOuterClass.java @@ -19,17 +19,17 @@ public final class RogueUnlockProgressOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 unlock_id = 8; + * optional uint32 unlock_id = 12; */ private int unlockId; /** - * optional uint32 progress = 9; + * optional uint32 progress = 15; */ private int progress; /** - * optional bool finish = 12; + * optional bool finish = 11; */ private boolean finish; @@ -44,7 +44,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional uint32 unlock_id = 8; + * optional uint32 unlock_id = 12; * @return whether the unlockId field is set */ public boolean hasUnlockId() { @@ -52,7 +52,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional uint32 unlock_id = 8; + * optional uint32 unlock_id = 12; * @return this */ public RogueUnlockProgress clearUnlockId() { @@ -62,7 +62,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional uint32 unlock_id = 8; + * optional uint32 unlock_id = 12; * @return the unlockId */ public int getUnlockId() { @@ -70,7 +70,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional uint32 unlock_id = 8; + * optional uint32 unlock_id = 12; * @param value the unlockId to set * @return this */ @@ -81,7 +81,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional uint32 progress = 9; + * optional uint32 progress = 15; * @return whether the progress field is set */ public boolean hasProgress() { @@ -89,7 +89,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional uint32 progress = 9; + * optional uint32 progress = 15; * @return this */ public RogueUnlockProgress clearProgress() { @@ -99,7 +99,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional uint32 progress = 9; + * optional uint32 progress = 15; * @return the progress */ public int getProgress() { @@ -107,7 +107,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional uint32 progress = 9; + * optional uint32 progress = 15; * @param value the progress to set * @return this */ @@ -118,7 +118,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional bool finish = 12; + * optional bool finish = 11; * @return whether the finish field is set */ public boolean hasFinish() { @@ -126,7 +126,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional bool finish = 12; + * optional bool finish = 11; * @return this */ public RogueUnlockProgress clearFinish() { @@ -136,7 +136,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional bool finish = 12; + * optional bool finish = 11; * @return the finish */ public boolean getFinish() { @@ -144,7 +144,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional bool finish = 12; + * optional bool finish = 11; * @param value the finish to set * @return this */ @@ -225,15 +225,15 @@ public final class RogueUnlockProgressOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(unlockId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(progress); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 88); output.writeBoolNoTag(finish); } } @@ -260,25 +260,25 @@ public final class RogueUnlockProgressOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 96: { // unlockId unlockId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 120) { break; } } - case 72: { + case 120: { // progress progress = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 88) { break; } } - case 96: { + case 88: { // finish finish = input.readBool(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java index c856168..28614b0 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java @@ -19,12 +19,12 @@ public final class RogueVirtualItemInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 money = 1; + * optional uint32 money = 8; */ private int money; /** - * optional uint32 X = 4; + * optional uint32 X = 9; */ private int x; @@ -39,7 +39,7 @@ public final class RogueVirtualItemInfoOuterClass { } /** - * optional uint32 money = 1; + * optional uint32 money = 8; * @return whether the money field is set */ public boolean hasMoney() { @@ -47,7 +47,7 @@ public final class RogueVirtualItemInfoOuterClass { } /** - * optional uint32 money = 1; + * optional uint32 money = 8; * @return this */ public RogueVirtualItemInfo clearMoney() { @@ -57,7 +57,7 @@ public final class RogueVirtualItemInfoOuterClass { } /** - * optional uint32 money = 1; + * optional uint32 money = 8; * @return the money */ public int getMoney() { @@ -65,7 +65,7 @@ public final class RogueVirtualItemInfoOuterClass { } /** - * optional uint32 money = 1; + * optional uint32 money = 8; * @param value the money to set * @return this */ @@ -76,7 +76,7 @@ public final class RogueVirtualItemInfoOuterClass { } /** - * optional uint32 X = 4; + * optional uint32 X = 9; * @return whether the x field is set */ public boolean hasX() { @@ -84,7 +84,7 @@ public final class RogueVirtualItemInfoOuterClass { } /** - * optional uint32 X = 4; + * optional uint32 X = 9; * @return this */ public RogueVirtualItemInfo clearX() { @@ -94,7 +94,7 @@ public final class RogueVirtualItemInfoOuterClass { } /** - * optional uint32 X = 4; + * optional uint32 X = 9; * @return the x */ public int getX() { @@ -102,7 +102,7 @@ public final class RogueVirtualItemInfoOuterClass { } /** - * optional uint32 X = 4; + * optional uint32 X = 9; * @param value the x to set * @return this */ @@ -177,11 +177,11 @@ public final class RogueVirtualItemInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(money); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(x); } } @@ -205,16 +205,16 @@ public final class RogueVirtualItemInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 64: { // money money = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 72) { break; } } - case 32: { + case 72: { // x x = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemOuterClass.java index 8d11439..0ed9c62 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemOuterClass.java @@ -19,19 +19,19 @@ public final class RogueVirtualItemOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 MFOPPKIBGNJ = 8; + * optional uint32 JLGAKDGCBOH = 1; */ - private int mFOPPKIBGNJ; + private int jLGAKDGCBOH; /** - * optional uint32 DDOPHIJMILL = 9; + * optional uint32 FGHILCKHDDO = 4; */ - private int dDOPHIJMILL; + private int fGHILCKHDDO; /** - * optional uint32 ACJKANLIGBM = 10; + * optional uint32 LGFMKJAOICA = 8; */ - private int aCJKANLIGBM; + private int lGFMKJAOICA; /** * optional uint32 money = 15; @@ -49,113 +49,113 @@ public final class RogueVirtualItemOuterClass { } /** - * optional uint32 MFOPPKIBGNJ = 8; - * @return whether the mFOPPKIBGNJ field is set + * optional uint32 JLGAKDGCBOH = 1; + * @return whether the jLGAKDGCBOH field is set */ - public boolean hasMFOPPKIBGNJ() { + public boolean hasJLGAKDGCBOH() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 MFOPPKIBGNJ = 8; + * optional uint32 JLGAKDGCBOH = 1; * @return this */ - public RogueVirtualItem clearMFOPPKIBGNJ() { + public RogueVirtualItem clearJLGAKDGCBOH() { bitField0_ &= ~0x00000001; - mFOPPKIBGNJ = 0; + jLGAKDGCBOH = 0; return this; } /** - * optional uint32 MFOPPKIBGNJ = 8; - * @return the mFOPPKIBGNJ + * optional uint32 JLGAKDGCBOH = 1; + * @return the jLGAKDGCBOH */ - public int getMFOPPKIBGNJ() { - return mFOPPKIBGNJ; + public int getJLGAKDGCBOH() { + return jLGAKDGCBOH; } /** - * optional uint32 MFOPPKIBGNJ = 8; - * @param value the mFOPPKIBGNJ to set + * optional uint32 JLGAKDGCBOH = 1; + * @param value the jLGAKDGCBOH to set * @return this */ - public RogueVirtualItem setMFOPPKIBGNJ(final int value) { + public RogueVirtualItem setJLGAKDGCBOH(final int value) { bitField0_ |= 0x00000001; - mFOPPKIBGNJ = value; + jLGAKDGCBOH = value; return this; } /** - * optional uint32 DDOPHIJMILL = 9; - * @return whether the dDOPHIJMILL field is set + * optional uint32 FGHILCKHDDO = 4; + * @return whether the fGHILCKHDDO field is set */ - public boolean hasDDOPHIJMILL() { + public boolean hasFGHILCKHDDO() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 DDOPHIJMILL = 9; + * optional uint32 FGHILCKHDDO = 4; * @return this */ - public RogueVirtualItem clearDDOPHIJMILL() { + public RogueVirtualItem clearFGHILCKHDDO() { bitField0_ &= ~0x00000002; - dDOPHIJMILL = 0; + fGHILCKHDDO = 0; return this; } /** - * optional uint32 DDOPHIJMILL = 9; - * @return the dDOPHIJMILL + * optional uint32 FGHILCKHDDO = 4; + * @return the fGHILCKHDDO */ - public int getDDOPHIJMILL() { - return dDOPHIJMILL; + public int getFGHILCKHDDO() { + return fGHILCKHDDO; } /** - * optional uint32 DDOPHIJMILL = 9; - * @param value the dDOPHIJMILL to set + * optional uint32 FGHILCKHDDO = 4; + * @param value the fGHILCKHDDO to set * @return this */ - public RogueVirtualItem setDDOPHIJMILL(final int value) { + public RogueVirtualItem setFGHILCKHDDO(final int value) { bitField0_ |= 0x00000002; - dDOPHIJMILL = value; + fGHILCKHDDO = value; return this; } /** - * optional uint32 ACJKANLIGBM = 10; - * @return whether the aCJKANLIGBM field is set + * optional uint32 LGFMKJAOICA = 8; + * @return whether the lGFMKJAOICA field is set */ - public boolean hasACJKANLIGBM() { + public boolean hasLGFMKJAOICA() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 ACJKANLIGBM = 10; + * optional uint32 LGFMKJAOICA = 8; * @return this */ - public RogueVirtualItem clearACJKANLIGBM() { + public RogueVirtualItem clearLGFMKJAOICA() { bitField0_ &= ~0x00000004; - aCJKANLIGBM = 0; + lGFMKJAOICA = 0; return this; } /** - * optional uint32 ACJKANLIGBM = 10; - * @return the aCJKANLIGBM + * optional uint32 LGFMKJAOICA = 8; + * @return the lGFMKJAOICA */ - public int getACJKANLIGBM() { - return aCJKANLIGBM; + public int getLGFMKJAOICA() { + return lGFMKJAOICA; } /** - * optional uint32 ACJKANLIGBM = 10; - * @param value the aCJKANLIGBM to set + * optional uint32 LGFMKJAOICA = 8; + * @param value the lGFMKJAOICA to set * @return this */ - public RogueVirtualItem setACJKANLIGBM(final int value) { + public RogueVirtualItem setLGFMKJAOICA(final int value) { bitField0_ |= 0x00000004; - aCJKANLIGBM = value; + lGFMKJAOICA = value; return this; } @@ -201,9 +201,9 @@ public final class RogueVirtualItemOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - mFOPPKIBGNJ = other.mFOPPKIBGNJ; - dDOPHIJMILL = other.dDOPHIJMILL; - aCJKANLIGBM = other.aCJKANLIGBM; + jLGAKDGCBOH = other.jLGAKDGCBOH; + fGHILCKHDDO = other.fGHILCKHDDO; + lGFMKJAOICA = other.lGFMKJAOICA; money = other.money; } return this; @@ -215,14 +215,14 @@ public final class RogueVirtualItemOuterClass { return this; } cachedSize = -1; - if (other.hasMFOPPKIBGNJ()) { - setMFOPPKIBGNJ(other.mFOPPKIBGNJ); + if (other.hasJLGAKDGCBOH()) { + setJLGAKDGCBOH(other.jLGAKDGCBOH); } - if (other.hasDDOPHIJMILL()) { - setDDOPHIJMILL(other.dDOPHIJMILL); + if (other.hasFGHILCKHDDO()) { + setFGHILCKHDDO(other.fGHILCKHDDO); } - if (other.hasACJKANLIGBM()) { - setACJKANLIGBM(other.aCJKANLIGBM); + if (other.hasLGFMKJAOICA()) { + setLGFMKJAOICA(other.lGFMKJAOICA); } if (other.hasMoney()) { setMoney(other.money); @@ -237,9 +237,9 @@ public final class RogueVirtualItemOuterClass { } cachedSize = -1; bitField0_ = 0; - mFOPPKIBGNJ = 0; - dDOPHIJMILL = 0; - aCJKANLIGBM = 0; + jLGAKDGCBOH = 0; + fGHILCKHDDO = 0; + lGFMKJAOICA = 0; money = 0; return this; } @@ -264,25 +264,25 @@ public final class RogueVirtualItemOuterClass { } RogueVirtualItem other = (RogueVirtualItem) o; return bitField0_ == other.bitField0_ - && (!hasMFOPPKIBGNJ() || mFOPPKIBGNJ == other.mFOPPKIBGNJ) - && (!hasDDOPHIJMILL() || dDOPHIJMILL == other.dDOPHIJMILL) - && (!hasACJKANLIGBM() || aCJKANLIGBM == other.aCJKANLIGBM) + && (!hasJLGAKDGCBOH() || jLGAKDGCBOH == other.jLGAKDGCBOH) + && (!hasFGHILCKHDDO() || fGHILCKHDDO == other.fGHILCKHDDO) + && (!hasLGFMKJAOICA() || lGFMKJAOICA == other.lGFMKJAOICA) && (!hasMoney() || money == other.money); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(mFOPPKIBGNJ); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(jLGAKDGCBOH); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(dDOPHIJMILL); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(fGHILCKHDDO); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(aCJKANLIGBM); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(lGFMKJAOICA); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 120); @@ -294,13 +294,13 @@ public final class RogueVirtualItemOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mFOPPKIBGNJ); + size += 1 + ProtoSink.computeUInt32SizeNoTag(jLGAKDGCBOH); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dDOPHIJMILL); + size += 1 + ProtoSink.computeUInt32SizeNoTag(fGHILCKHDDO); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(aCJKANLIGBM); + size += 1 + ProtoSink.computeUInt32SizeNoTag(lGFMKJAOICA); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(money); @@ -315,27 +315,27 @@ public final class RogueVirtualItemOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // mFOPPKIBGNJ - mFOPPKIBGNJ = input.readUInt32(); + case 8: { + // jLGAKDGCBOH + jLGAKDGCBOH = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 32) { break; } } - case 72: { - // dDOPHIJMILL - dDOPHIJMILL = input.readUInt32(); + case 32: { + // fGHILCKHDDO + fGHILCKHDDO = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 64) { break; } } - case 80: { - // aCJKANLIGBM - aCJKANLIGBM = input.readUInt32(); + case 64: { + // lGFMKJAOICA + lGFMKJAOICA = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 120) { @@ -369,13 +369,13 @@ public final class RogueVirtualItemOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.mFOPPKIBGNJ, mFOPPKIBGNJ); + output.writeUInt32(FieldNames.jLGAKDGCBOH, jLGAKDGCBOH); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.dDOPHIJMILL, dDOPHIJMILL); + output.writeUInt32(FieldNames.fGHILCKHDDO, fGHILCKHDDO); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.aCJKANLIGBM, aCJKANLIGBM); + output.writeUInt32(FieldNames.lGFMKJAOICA, lGFMKJAOICA); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.money, money); @@ -390,10 +390,10 @@ public final class RogueVirtualItemOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -663962379: { - if (input.isAtField(FieldNames.mFOPPKIBGNJ)) { + case 110448746: { + if (input.isAtField(FieldNames.jLGAKDGCBOH)) { if (!input.trySkipNullValue()) { - mFOPPKIBGNJ = input.readUInt32(); + jLGAKDGCBOH = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -401,10 +401,10 @@ public final class RogueVirtualItemOuterClass { } break; } - case 155657604: { - if (input.isAtField(FieldNames.dDOPHIJMILL)) { + case -196267399: { + if (input.isAtField(FieldNames.fGHILCKHDDO)) { if (!input.trySkipNullValue()) { - dDOPHIJMILL = input.readUInt32(); + fGHILCKHDDO = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -412,10 +412,10 @@ public final class RogueVirtualItemOuterClass { } break; } - case -1408539: { - if (input.isAtField(FieldNames.aCJKANLIGBM)) { + case -1087946824: { + if (input.isAtField(FieldNames.lGFMKJAOICA)) { if (!input.trySkipNullValue()) { - aCJKANLIGBM = input.readUInt32(); + lGFMKJAOICA = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -487,11 +487,11 @@ public final class RogueVirtualItemOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName mFOPPKIBGNJ = FieldName.forField("MFOPPKIBGNJ"); + static final FieldName jLGAKDGCBOH = FieldName.forField("JLGAKDGCBOH"); - static final FieldName dDOPHIJMILL = FieldName.forField("DDOPHIJMILL"); + static final FieldName fGHILCKHDDO = FieldName.forField("FGHILCKHDDO"); - static final FieldName aCJKANLIGBM = FieldName.forField("ACJKANLIGBM"); + static final FieldName lGFMKJAOICA = FieldName.forField("LGFMKJAOICA"); static final FieldName money = FieldName.forField("money"); } diff --git a/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java index a4e4d46..f271ea3 100644 --- a/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java @@ -20,24 +20,24 @@ public final class RotateMapCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 unk_int = 8; - */ - private int unkInt; - - /** - * optional uint32 group_id = 11; + * optional uint32 group_id = 4; */ private int groupId; /** - * optional .MotionInfo motion = 2; + * optional uint32 unk_int = 13; + */ + private int unkInt; + + /** + * optional .MotionInfo motion = 10; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); /** - * optional .RotateMapCsReq.LHBLGBPKEAL rogue_map = 9; + * optional .RotateMapCsReq.NewMapRot rogue_map = 11; */ - private final LHBLGBPKEAL rogueMap = LHBLGBPKEAL.newInstance(); + private final NewMapRot rogueMap = NewMapRot.newInstance(); private RotateMapCsReq() { } @@ -50,62 +50,25 @@ public final class RotateMapCsReqOuterClass { } /** - * optional uint32 unk_int = 8; - * @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 = 8; - * @return this - */ - public RotateMapCsReq clearUnkInt() { - bitField0_ &= ~0x00000001; - unkInt = 0; - return this; - } - - /** - * optional uint32 unk_int = 8; - * @return the unkInt - */ - public int getUnkInt() { - return unkInt; - } - - /** - * optional uint32 unk_int = 8; - * @param value the unkInt to set - * @return this - */ - public RotateMapCsReq setUnkInt(final int value) { - bitField0_ |= 0x00000001; - unkInt = value; - return this; - } - - /** - * optional uint32 group_id = 11; - * @return whether the groupId field is set - */ - public boolean hasGroupId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 group_id = 11; + * optional uint32 group_id = 4; * @return this */ public RotateMapCsReq clearGroupId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; groupId = 0; return this; } /** - * optional uint32 group_id = 11; + * optional uint32 group_id = 4; * @return the groupId */ public int getGroupId() { @@ -113,18 +76,55 @@ public final class RotateMapCsReqOuterClass { } /** - * optional uint32 group_id = 11; + * optional uint32 group_id = 4; * @param value the groupId to set * @return this */ public RotateMapCsReq setGroupId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; groupId = value; return this; } /** - * optional .MotionInfo motion = 2; + * optional uint32 unk_int = 13; + * @return whether the unkInt field is set + */ + public boolean hasUnkInt() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 unk_int = 13; + * @return this + */ + public RotateMapCsReq clearUnkInt() { + bitField0_ &= ~0x00000002; + unkInt = 0; + return this; + } + + /** + * optional uint32 unk_int = 13; + * @return the unkInt + */ + public int getUnkInt() { + return unkInt; + } + + /** + * optional uint32 unk_int = 13; + * @param value the unkInt to set + * @return this + */ + public RotateMapCsReq setUnkInt(final int value) { + bitField0_ |= 0x00000002; + unkInt = value; + return this; + } + + /** + * optional .MotionInfo motion = 10; * @return whether the motion field is set */ public boolean hasMotion() { @@ -132,7 +132,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .MotionInfo motion = 2; + * optional .MotionInfo motion = 10; * @return this */ public RotateMapCsReq clearMotion() { @@ -142,7 +142,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .MotionInfo motion = 2; + * optional .MotionInfo motion = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -156,7 +156,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .MotionInfo motion = 2; + * optional .MotionInfo motion = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -170,7 +170,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .MotionInfo motion = 2; + * optional .MotionInfo motion = 10; * @param value the motion to set * @return this */ @@ -181,7 +181,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .RotateMapCsReq.LHBLGBPKEAL rogue_map = 9; + * optional .RotateMapCsReq.NewMapRot rogue_map = 11; * @return whether the rogueMap field is set */ public boolean hasRogueMap() { @@ -189,7 +189,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .RotateMapCsReq.LHBLGBPKEAL rogue_map = 9; + * optional .RotateMapCsReq.NewMapRot rogue_map = 11; * @return this */ public RotateMapCsReq clearRogueMap() { @@ -199,7 +199,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .RotateMapCsReq.LHBLGBPKEAL rogue_map = 9; + * 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. @@ -208,12 +208,12 @@ public final class RotateMapCsReqOuterClass { * * @return internal storage object for reading */ - public LHBLGBPKEAL getRogueMap() { + public NewMapRot getRogueMap() { return rogueMap; } /** - * optional .RotateMapCsReq.LHBLGBPKEAL rogue_map = 9; + * 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 @@ -221,17 +221,17 @@ public final class RotateMapCsReqOuterClass { * * @return internal storage object for modifications */ - public LHBLGBPKEAL getMutableRogueMap() { + public NewMapRot getMutableRogueMap() { bitField0_ |= 0x00000008; return rogueMap; } /** - * optional .RotateMapCsReq.LHBLGBPKEAL rogue_map = 9; + * optional .RotateMapCsReq.NewMapRot rogue_map = 11; * @param value the rogueMap to set * @return this */ - public RotateMapCsReq setRogueMap(final LHBLGBPKEAL value) { + public RotateMapCsReq setRogueMap(final NewMapRot value) { bitField0_ |= 0x00000008; rogueMap.copyFrom(value); return this; @@ -242,8 +242,8 @@ public final class RotateMapCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - unkInt = other.unkInt; groupId = other.groupId; + unkInt = other.unkInt; motion.copyFrom(other.motion); rogueMap.copyFrom(other.rogueMap); } @@ -256,12 +256,12 @@ public final class RotateMapCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasUnkInt()) { - setUnkInt(other.unkInt); - } if (other.hasGroupId()) { setGroupId(other.groupId); } + if (other.hasUnkInt()) { + setUnkInt(other.unkInt); + } if (other.hasMotion()) { getMutableMotion().mergeFrom(other.motion); } @@ -278,8 +278,8 @@ public final class RotateMapCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - unkInt = 0; groupId = 0; + unkInt = 0; motion.clear(); rogueMap.clear(); return this; @@ -307,8 +307,8 @@ public final class RotateMapCsReqOuterClass { } RotateMapCsReq other = (RotateMapCsReq) o; return bitField0_ == other.bitField0_ - && (!hasUnkInt() || unkInt == other.unkInt) && (!hasGroupId() || groupId == other.groupId) + && (!hasUnkInt() || unkInt == other.unkInt) && (!hasMotion() || motion.equals(other.motion)) && (!hasRogueMap() || rogueMap.equals(other.rogueMap)); } @@ -316,19 +316,19 @@ public final class RotateMapCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(unkInt); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(groupId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(unkInt); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 82); output.writeMessageNoTag(motion); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 90); output.writeMessageNoTag(rogueMap); } } @@ -337,10 +337,10 @@ public final class RotateMapCsReqOuterClass { 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); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(motion); @@ -358,34 +358,34 @@ public final class RotateMapCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // unkInt - unkInt = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 32: { // groupId groupId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 104) { break; } } - case 18: { + case 104: { + // unkInt + unkInt = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { // motion input.readMessage(motion); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 74) { + if (tag != 90) { break; } } - case 74: { + case 90: { // rogueMap input.readMessage(rogueMap); bitField0_ |= 0x00000008; @@ -412,10 +412,10 @@ public final class RotateMapCsReqOuterClass { 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); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.motion, motion); @@ -433,11 +433,11 @@ public final class RotateMapCsReqOuterClass { } 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 { @@ -445,11 +445,11 @@ public final class RotateMapCsReqOuterClass { } 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 { @@ -521,15 +521,15 @@ public final class RotateMapCsReqOuterClass { } /** - * Protobuf type {@code ICOFBBCMENF} + * Protobuf type {@code Vector4} */ - public static final class ICOFBBCMENF extends ProtoMessage implements Cloneable { + public static final class Vector4 extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; /** - * optional float FAAFKIAENEO = 2; + * optional float z = 1; */ - private float fAAFKIAENEO; + private float z; /** * optional float y = 3; @@ -537,59 +537,59 @@ public final class RotateMapCsReqOuterClass { private float y; /** - * optional float z = 4; - */ - private float z; - - /** - * optional float x = 15; + * optional float x = 6; */ private float x; - private ICOFBBCMENF() { + /** + * optional float w = 9; + */ + private float w; + + private Vector4() { } /** - * @return a new empty instance of {@code ICOFBBCMENF} + * @return a new empty instance of {@code Vector4} */ - public static ICOFBBCMENF newInstance() { - return new ICOFBBCMENF(); + public static Vector4 newInstance() { + return new Vector4(); } /** - * optional float FAAFKIAENEO = 2; - * @return whether the fAAFKIAENEO field is set + * optional float z = 1; + * @return whether the z field is set */ - public boolean hasFAAFKIAENEO() { + public boolean hasZ() { return (bitField0_ & 0x00000001) != 0; } /** - * optional float FAAFKIAENEO = 2; + * optional float z = 1; * @return this */ - public ICOFBBCMENF clearFAAFKIAENEO() { + public Vector4 clearZ() { bitField0_ &= ~0x00000001; - fAAFKIAENEO = 0F; + z = 0F; return this; } /** - * optional float FAAFKIAENEO = 2; - * @return the fAAFKIAENEO + * optional float z = 1; + * @return the z */ - public float getFAAFKIAENEO() { - return fAAFKIAENEO; + public float getZ() { + return z; } /** - * optional float FAAFKIAENEO = 2; - * @param value the fAAFKIAENEO to set + * optional float z = 1; + * @param value the z to set * @return this */ - public ICOFBBCMENF setFAAFKIAENEO(final float value) { + public Vector4 setZ(final float value) { bitField0_ |= 0x00000001; - fAAFKIAENEO = value; + z = value; return this; } @@ -605,7 +605,7 @@ public final class RotateMapCsReqOuterClass { * optional float y = 3; * @return this */ - public ICOFBBCMENF clearY() { + public Vector4 clearY() { bitField0_ &= ~0x00000002; y = 0F; return this; @@ -624,69 +624,32 @@ public final class RotateMapCsReqOuterClass { * @param value the y to set * @return this */ - public ICOFBBCMENF setY(final float value) { + public Vector4 setY(final float value) { bitField0_ |= 0x00000002; y = value; return this; } /** - * optional float z = 4; - * @return whether the z field is set + * optional float x = 6; + * @return whether the x field is set */ - public boolean hasZ() { + public boolean hasX() { return (bitField0_ & 0x00000004) != 0; } /** - * optional float z = 4; + * optional float x = 6; * @return this */ - public ICOFBBCMENF clearZ() { + public Vector4 clearX() { bitField0_ &= ~0x00000004; - z = 0F; - return this; - } - - /** - * optional float z = 4; - * @return the z - */ - public float getZ() { - return z; - } - - /** - * optional float z = 4; - * @param value the z to set - * @return this - */ - public ICOFBBCMENF setZ(final float value) { - bitField0_ |= 0x00000004; - z = value; - return this; - } - - /** - * optional float x = 15; - * @return whether the x field is set - */ - public boolean hasX() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional float x = 15; - * @return this - */ - public ICOFBBCMENF clearX() { - bitField0_ &= ~0x00000008; x = 0F; return this; } /** - * optional float x = 15; + * optional float x = 6; * @return the x */ public float getX() { @@ -694,66 +657,103 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float x = 15; + * optional float x = 6; * @param value the x to set * @return this */ - public ICOFBBCMENF setX(final float value) { - bitField0_ |= 0x00000008; + public Vector4 setX(final float value) { + bitField0_ |= 0x00000004; x = value; return this; } + /** + * optional float w = 9; + * @return whether the w field is set + */ + public boolean hasW() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional float w = 9; + * @return this + */ + public Vector4 clearW() { + bitField0_ &= ~0x00000008; + w = 0F; + return this; + } + + /** + * optional float w = 9; + * @return the w + */ + public float getW() { + return w; + } + + /** + * optional float w = 9; + * @param value the w to set + * @return this + */ + public Vector4 setW(final float value) { + bitField0_ |= 0x00000008; + w = value; + return this; + } + @Override - public ICOFBBCMENF copyFrom(final ICOFBBCMENF other) { + public Vector4 copyFrom(final Vector4 other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - fAAFKIAENEO = other.fAAFKIAENEO; - y = other.y; z = other.z; + y = other.y; x = other.x; + w = other.w; } return this; } @Override - public ICOFBBCMENF mergeFrom(final ICOFBBCMENF other) { + public Vector4 mergeFrom(final Vector4 other) { if (other.isEmpty()) { return this; } cachedSize = -1; - if (other.hasFAAFKIAENEO()) { - setFAAFKIAENEO(other.fAAFKIAENEO); + if (other.hasZ()) { + setZ(other.z); } if (other.hasY()) { setY(other.y); } - if (other.hasZ()) { - setZ(other.z); - } if (other.hasX()) { setX(other.x); } + if (other.hasW()) { + setW(other.w); + } return this; } @Override - public ICOFBBCMENF clear() { + public Vector4 clear() { if (isEmpty()) { return this; } cachedSize = -1; bitField0_ = 0; - fAAFKIAENEO = 0F; - y = 0F; z = 0F; + y = 0F; x = 0F; + w = 0F; return this; } @Override - public ICOFBBCMENF clearQuick() { + public Vector4 clearQuick() { if (isEmpty()) { return this; } @@ -767,34 +767,34 @@ public final class RotateMapCsReqOuterClass { if (o == this) { return true; } - if (!(o instanceof ICOFBBCMENF)) { + if (!(o instanceof Vector4)) { return false; } - ICOFBBCMENF other = (ICOFBBCMENF) o; + Vector4 other = (Vector4) o; return bitField0_ == other.bitField0_ - && (!hasFAAFKIAENEO() || ProtoUtil.isEqual(fAAFKIAENEO, other.fAAFKIAENEO)) - && (!hasY() || ProtoUtil.isEqual(y, other.y)) && (!hasZ() || ProtoUtil.isEqual(z, other.z)) - && (!hasX() || ProtoUtil.isEqual(x, other.x)); + && (!hasY() || ProtoUtil.isEqual(y, other.y)) + && (!hasX() || ProtoUtil.isEqual(x, other.x)) + && (!hasW() || ProtoUtil.isEqual(w, other.w)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 21); - output.writeFloatNoTag(fAAFKIAENEO); + output.writeRawByte((byte) 13); + output.writeFloatNoTag(z); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 29); output.writeFloatNoTag(y); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 37); - output.writeFloatNoTag(z); + output.writeRawByte((byte) 53); + output.writeFloatNoTag(x); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 125); - output.writeFloatNoTag(x); + output.writeRawByte((byte) 77); + output.writeFloatNoTag(w); } } @@ -818,14 +818,14 @@ public final class RotateMapCsReqOuterClass { @Override @SuppressWarnings("fallthrough") - public ICOFBBCMENF mergeFrom(final ProtoSource input) throws IOException { + public Vector4 mergeFrom(final ProtoSource input) throws IOException { // Enabled Fall-Through Optimization (QuickBuffers) int tag = input.readTag(); while (true) { switch (tag) { - case 21: { - // fAAFKIAENEO - fAAFKIAENEO = input.readFloat(); + case 13: { + // z + z = input.readFloat(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 29) { @@ -837,22 +837,22 @@ public final class RotateMapCsReqOuterClass { y = input.readFloat(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 37) { + if (tag != 53) { break; } } - case 37: { - // z - z = input.readFloat(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 125) { - break; - } - } - case 125: { + case 53: { // x x = input.readFloat(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 77) { + break; + } + } + case 77: { + // w + w = input.readFloat(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -877,31 +877,31 @@ public final class RotateMapCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeFloat(FieldNames.fAAFKIAENEO, fAAFKIAENEO); + output.writeFloat(FieldNames.z, z); } if ((bitField0_ & 0x00000002) != 0) { output.writeFloat(FieldNames.y, y); } if ((bitField0_ & 0x00000004) != 0) { - output.writeFloat(FieldNames.z, z); + output.writeFloat(FieldNames.x, x); } if ((bitField0_ & 0x00000008) != 0) { - output.writeFloat(FieldNames.x, x); + output.writeFloat(FieldNames.w, w); } output.endObject(); } @Override - public ICOFBBCMENF mergeFrom(final JsonSource input) throws IOException { + public Vector4 mergeFrom(final JsonSource input) throws IOException { if (!input.beginObject()) { return this; } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -908414442: { - if (input.isAtField(FieldNames.fAAFKIAENEO)) { + case 122: { + if (input.isAtField(FieldNames.z)) { if (!input.trySkipNullValue()) { - fAAFKIAENEO = input.readFloat(); + z = input.readFloat(); bitField0_ |= 0x00000001; } } else { @@ -920,10 +920,10 @@ public final class RotateMapCsReqOuterClass { } break; } - case 122: { - if (input.isAtField(FieldNames.z)) { + case 120: { + if (input.isAtField(FieldNames.x)) { if (!input.trySkipNullValue()) { - z = input.readFloat(); + x = input.readFloat(); bitField0_ |= 0x00000004; } } else { @@ -931,10 +931,10 @@ public final class RotateMapCsReqOuterClass { } break; } - case 120: { - if (input.isAtField(FieldNames.x)) { + case 119: { + if (input.isAtField(FieldNames.w)) { if (!input.trySkipNullValue()) { - x = input.readFloat(); + w = input.readFloat(); bitField0_ |= 0x00000008; } } else { @@ -953,8 +953,8 @@ public final class RotateMapCsReqOuterClass { } @Override - public ICOFBBCMENF clone() { - return new ICOFBBCMENF().copyFrom(this); + public Vector4 clone() { + return new Vector4().copyFrom(this); } @Override @@ -962,31 +962,31 @@ public final class RotateMapCsReqOuterClass { return ((bitField0_) == 0); } - public static ICOFBBCMENF parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new ICOFBBCMENF(), data).checkInitialized(); + public static Vector4 parseFrom(final byte[] data) throws InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new Vector4(), data).checkInitialized(); } - public static ICOFBBCMENF parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new ICOFBBCMENF(), input).checkInitialized(); + public static Vector4 parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new Vector4(), input).checkInitialized(); } - public static ICOFBBCMENF parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new ICOFBBCMENF(), input).checkInitialized(); + public static Vector4 parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new Vector4(), input).checkInitialized(); } /** - * @return factory for creating ICOFBBCMENF messages + * @return factory for creating Vector4 messages */ - public static MessageFactory getFactory() { - return ICOFBBCMENFFactory.INSTANCE; + public static MessageFactory getFactory() { + return Vector4Factory.INSTANCE; } - private enum ICOFBBCMENFFactory implements MessageFactory { + private enum Vector4Factory implements MessageFactory { INSTANCE; @Override - public ICOFBBCMENF create() { - return ICOFBBCMENF.newInstance(); + public Vector4 create() { + return Vector4.newInstance(); } } @@ -994,76 +994,76 @@ public final class RotateMapCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName fAAFKIAENEO = FieldName.forField("FAAFKIAENEO"); + static final FieldName z = FieldName.forField("z"); static final FieldName y = FieldName.forField("y"); - static final FieldName z = FieldName.forField("z"); - static final FieldName x = FieldName.forField("x"); + + static final FieldName w = FieldName.forField("w"); } } /** - * Protobuf type {@code LHBLGBPKEAL} + * Protobuf type {@code NewMapRot} */ - public static final class LHBLGBPKEAL extends ProtoMessage implements Cloneable { + public static final class NewMapRot extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; /** - * optional .RotateMapCsReq.ICOFBBCMENF JBCABOABIDI = 9; + * optional .Vector vector3 = 1; */ - private final ICOFBBCMENF jBCABOABIDI = ICOFBBCMENF.newInstance(); + private final VectorOuterClass.Vector vector3 = VectorOuterClass.Vector.newInstance(); /** - * optional .Vector IENLJAFIBOL = 15; + * optional .RotateMapCsReq.Vector4 vector4 = 9; */ - private final VectorOuterClass.Vector iENLJAFIBOL = VectorOuterClass.Vector.newInstance(); + private final Vector4 vector4 = Vector4.newInstance(); - private LHBLGBPKEAL() { + private NewMapRot() { } /** - * @return a new empty instance of {@code LHBLGBPKEAL} + * @return a new empty instance of {@code NewMapRot} */ - public static LHBLGBPKEAL newInstance() { - return new LHBLGBPKEAL(); + public static NewMapRot newInstance() { + return new NewMapRot(); } /** - * optional .RotateMapCsReq.ICOFBBCMENF JBCABOABIDI = 9; - * @return whether the jBCABOABIDI field is set + * optional .Vector vector3 = 1; + * @return whether the vector3 field is set */ - public boolean hasJBCABOABIDI() { + public boolean hasVector3() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .RotateMapCsReq.ICOFBBCMENF JBCABOABIDI = 9; + * optional .Vector vector3 = 1; * @return this */ - public LHBLGBPKEAL clearJBCABOABIDI() { + public NewMapRot clearVector3() { bitField0_ &= ~0x00000001; - jBCABOABIDI.clear(); + vector3.clear(); return this; } /** - * optional .RotateMapCsReq.ICOFBBCMENF JBCABOABIDI = 9; + * optional .Vector vector3 = 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 #getMutableJBCABOABIDI()} if you want to modify it. + * Use {@link #getMutableVector3()} if you want to modify it. * * @return internal storage object for reading */ - public ICOFBBCMENF getJBCABOABIDI() { - return jBCABOABIDI; + public VectorOuterClass.Vector getVector3() { + return vector3; } /** - * optional .RotateMapCsReq.ICOFBBCMENF JBCABOABIDI = 9; + * optional .Vector vector3 = 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 @@ -1071,56 +1071,56 @@ public final class RotateMapCsReqOuterClass { * * @return internal storage object for modifications */ - public ICOFBBCMENF getMutableJBCABOABIDI() { + public VectorOuterClass.Vector getMutableVector3() { bitField0_ |= 0x00000001; - return jBCABOABIDI; + return vector3; } /** - * optional .RotateMapCsReq.ICOFBBCMENF JBCABOABIDI = 9; - * @param value the jBCABOABIDI to set + * optional .Vector vector3 = 1; + * @param value the vector3 to set * @return this */ - public LHBLGBPKEAL setJBCABOABIDI(final ICOFBBCMENF value) { + public NewMapRot setVector3(final VectorOuterClass.Vector value) { bitField0_ |= 0x00000001; - jBCABOABIDI.copyFrom(value); + vector3.copyFrom(value); return this; } /** - * optional .Vector IENLJAFIBOL = 15; - * @return whether the iENLJAFIBOL field is set + * optional .RotateMapCsReq.Vector4 vector4 = 9; + * @return whether the vector4 field is set */ - public boolean hasIENLJAFIBOL() { + public boolean hasVector4() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .Vector IENLJAFIBOL = 15; + * optional .RotateMapCsReq.Vector4 vector4 = 9; * @return this */ - public LHBLGBPKEAL clearIENLJAFIBOL() { + public NewMapRot clearVector4() { bitField0_ &= ~0x00000002; - iENLJAFIBOL.clear(); + vector4.clear(); return this; } /** - * optional .Vector IENLJAFIBOL = 15; + * optional .RotateMapCsReq.Vector4 vector4 = 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 #getMutableIENLJAFIBOL()} if you want to modify it. + * Use {@link #getMutableVector4()} if you want to modify it. * * @return internal storage object for reading */ - public VectorOuterClass.Vector getIENLJAFIBOL() { - return iENLJAFIBOL; + public Vector4 getVector4() { + return vector4; } /** - * optional .Vector IENLJAFIBOL = 15; + * optional .RotateMapCsReq.Vector4 vector4 = 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 @@ -1128,69 +1128,69 @@ public final class RotateMapCsReqOuterClass { * * @return internal storage object for modifications */ - public VectorOuterClass.Vector getMutableIENLJAFIBOL() { + public Vector4 getMutableVector4() { bitField0_ |= 0x00000002; - return iENLJAFIBOL; + return vector4; } /** - * optional .Vector IENLJAFIBOL = 15; - * @param value the iENLJAFIBOL to set + * optional .RotateMapCsReq.Vector4 vector4 = 9; + * @param value the vector4 to set * @return this */ - public LHBLGBPKEAL setIENLJAFIBOL(final VectorOuterClass.Vector value) { + public NewMapRot setVector4(final Vector4 value) { bitField0_ |= 0x00000002; - iENLJAFIBOL.copyFrom(value); + vector4.copyFrom(value); return this; } @Override - public LHBLGBPKEAL copyFrom(final LHBLGBPKEAL other) { + public NewMapRot copyFrom(final NewMapRot other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - jBCABOABIDI.copyFrom(other.jBCABOABIDI); - iENLJAFIBOL.copyFrom(other.iENLJAFIBOL); + vector3.copyFrom(other.vector3); + vector4.copyFrom(other.vector4); } return this; } @Override - public LHBLGBPKEAL mergeFrom(final LHBLGBPKEAL other) { + public NewMapRot mergeFrom(final NewMapRot other) { if (other.isEmpty()) { return this; } cachedSize = -1; - if (other.hasJBCABOABIDI()) { - getMutableJBCABOABIDI().mergeFrom(other.jBCABOABIDI); + if (other.hasVector3()) { + getMutableVector3().mergeFrom(other.vector3); } - if (other.hasIENLJAFIBOL()) { - getMutableIENLJAFIBOL().mergeFrom(other.iENLJAFIBOL); + if (other.hasVector4()) { + getMutableVector4().mergeFrom(other.vector4); } return this; } @Override - public LHBLGBPKEAL clear() { + public NewMapRot clear() { if (isEmpty()) { return this; } cachedSize = -1; bitField0_ = 0; - jBCABOABIDI.clear(); - iENLJAFIBOL.clear(); + vector3.clear(); + vector4.clear(); return this; } @Override - public LHBLGBPKEAL clearQuick() { + public NewMapRot clearQuick() { if (isEmpty()) { return this; } cachedSize = -1; bitField0_ = 0; - jBCABOABIDI.clearQuick(); - iENLJAFIBOL.clearQuick(); + vector3.clearQuick(); + vector4.clearQuick(); return this; } @@ -1199,24 +1199,24 @@ public final class RotateMapCsReqOuterClass { if (o == this) { return true; } - if (!(o instanceof LHBLGBPKEAL)) { + if (!(o instanceof NewMapRot)) { return false; } - LHBLGBPKEAL other = (LHBLGBPKEAL) o; + NewMapRot other = (NewMapRot) o; return bitField0_ == other.bitField0_ - && (!hasJBCABOABIDI() || jBCABOABIDI.equals(other.jBCABOABIDI)) - && (!hasIENLJAFIBOL() || iENLJAFIBOL.equals(other.iENLJAFIBOL)); + && (!hasVector3() || vector3.equals(other.vector3)) + && (!hasVector4() || vector4.equals(other.vector4)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(jBCABOABIDI); + output.writeRawByte((byte) 10); + output.writeMessageNoTag(vector3); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(iENLJAFIBOL); + output.writeRawByte((byte) 74); + output.writeMessageNoTag(vector4); } } @@ -1224,33 +1224,33 @@ public final class RotateMapCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(jBCABOABIDI); + size += 1 + ProtoSink.computeMessageSizeNoTag(vector3); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(iENLJAFIBOL); + size += 1 + ProtoSink.computeMessageSizeNoTag(vector4); } return size; } @Override @SuppressWarnings("fallthrough") - public LHBLGBPKEAL mergeFrom(final ProtoSource input) throws IOException { + public NewMapRot mergeFrom(final ProtoSource input) throws IOException { // Enabled Fall-Through Optimization (QuickBuffers) int tag = input.readTag(); while (true) { switch (tag) { - case 74: { - // jBCABOABIDI - input.readMessage(jBCABOABIDI); + case 10: { + // vector3 + input.readMessage(vector3); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 74) { break; } } - case 122: { - // iENLJAFIBOL - input.readMessage(iENLJAFIBOL); + case 74: { + // vector4 + input.readMessage(vector4); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -1275,25 +1275,25 @@ public final class RotateMapCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.jBCABOABIDI, jBCABOABIDI); + output.writeMessage(FieldNames.vector3, vector3); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.iENLJAFIBOL, iENLJAFIBOL); + output.writeMessage(FieldNames.vector4, vector4); } output.endObject(); } @Override - public LHBLGBPKEAL mergeFrom(final JsonSource input) throws IOException { + public NewMapRot mergeFrom(final JsonSource input) throws IOException { if (!input.beginObject()) { return this; } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1627224650: { - if (input.isAtField(FieldNames.jBCABOABIDI)) { + case 337790800: { + if (input.isAtField(FieldNames.vector3)) { if (!input.trySkipNullValue()) { - input.readMessage(jBCABOABIDI); + input.readMessage(vector3); bitField0_ |= 0x00000001; } } else { @@ -1301,10 +1301,10 @@ public final class RotateMapCsReqOuterClass { } break; } - case 237656587: { - if (input.isAtField(FieldNames.iENLJAFIBOL)) { + case 337790801: { + if (input.isAtField(FieldNames.vector4)) { if (!input.trySkipNullValue()) { - input.readMessage(iENLJAFIBOL); + input.readMessage(vector4); bitField0_ |= 0x00000002; } } else { @@ -1323,8 +1323,8 @@ public final class RotateMapCsReqOuterClass { } @Override - public LHBLGBPKEAL clone() { - return new LHBLGBPKEAL().copyFrom(this); + public NewMapRot clone() { + return new NewMapRot().copyFrom(this); } @Override @@ -1332,31 +1332,31 @@ public final class RotateMapCsReqOuterClass { return ((bitField0_) == 0); } - public static LHBLGBPKEAL parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new LHBLGBPKEAL(), data).checkInitialized(); + public static NewMapRot parseFrom(final byte[] data) throws InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new NewMapRot(), data).checkInitialized(); } - public static LHBLGBPKEAL parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new LHBLGBPKEAL(), input).checkInitialized(); + public static NewMapRot parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new NewMapRot(), input).checkInitialized(); } - public static LHBLGBPKEAL parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new LHBLGBPKEAL(), input).checkInitialized(); + public static NewMapRot parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new NewMapRot(), input).checkInitialized(); } /** - * @return factory for creating LHBLGBPKEAL messages + * @return factory for creating NewMapRot messages */ - public static MessageFactory getFactory() { - return LHBLGBPKEALFactory.INSTANCE; + public static MessageFactory getFactory() { + return NewMapRotFactory.INSTANCE; } - private enum LHBLGBPKEALFactory implements MessageFactory { + private enum NewMapRotFactory implements MessageFactory { INSTANCE; @Override - public LHBLGBPKEAL create() { - return LHBLGBPKEAL.newInstance(); + public NewMapRot create() { + return NewMapRot.newInstance(); } } @@ -1364,9 +1364,9 @@ public final class RotateMapCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName jBCABOABIDI = FieldName.forField("JBCABOABIDI"); + static final FieldName vector3 = FieldName.forField("vector3"); - static final FieldName iENLJAFIBOL = FieldName.forField("IENLJAFIBOL"); + static final FieldName vector4 = FieldName.forField("vector4"); } } @@ -1383,10 +1383,10 @@ public final class RotateMapCsReqOuterClass { * 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"); + 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 321a0bf..21b82e9 100644 --- a/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java @@ -19,17 +19,17 @@ public final class RotateMapScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional uint32 client_pos_version = 14; + * optional uint32 client_pos_version = 10; */ private int clientPosVersion; /** - * optional .MotionInfo motion = 13; + * optional .MotionInfo motion = 8; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -44,7 +44,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +52,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 7; * @return this */ public RotateMapScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -81,7 +81,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 client_pos_version = 14; + * optional uint32 client_pos_version = 10; * @return whether the clientPosVersion field is set */ public boolean hasClientPosVersion() { @@ -89,7 +89,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 client_pos_version = 14; + * optional uint32 client_pos_version = 10; * @return this */ public RotateMapScRsp clearClientPosVersion() { @@ -99,7 +99,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 client_pos_version = 14; + * optional uint32 client_pos_version = 10; * @return the clientPosVersion */ public int getClientPosVersion() { @@ -107,7 +107,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 client_pos_version = 14; + * optional uint32 client_pos_version = 10; * @param value the clientPosVersion to set * @return this */ @@ -118,7 +118,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 13; + * optional .MotionInfo motion = 8; * @return whether the motion field is set */ public boolean hasMotion() { @@ -126,7 +126,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 13; + * optional .MotionInfo motion = 8; * @return this */ public RotateMapScRsp clearMotion() { @@ -136,7 +136,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 13; + * optional .MotionInfo motion = 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 RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 13; + * optional .MotionInfo motion = 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 RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 13; + * optional .MotionInfo motion = 8; * @param value the motion to set * @return this */ @@ -246,15 +246,15 @@ public final class RotateMapScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 66); output.writeMessageNoTag(motion); } } @@ -281,25 +281,25 @@ public final class RotateMapScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 80) { break; } } - case 112: { + case 80: { // clientPosVersion clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 106) { + if (tag != 66) { break; } } - case 106: { + case 66: { // 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 079e0d7..0f4daa1 100644 --- a/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java @@ -20,19 +20,19 @@ public final class RotaterDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional float GNECDPPELLO = 8; + * optional float APDIFCCFAGG = 6; */ - private float gNECDPPELLO; + private float aPDIFCCFAGG; /** - * optional uint32 group_id = 3; + * optional uint32 group_id = 2; */ private int groupId; /** - * optional uint32 BPFADJDEGHP = 5; + * optional uint32 unk_int = 12; */ - private int bPFADJDEGHP; + private int unkInt; private RotaterData() { } @@ -45,44 +45,44 @@ public final class RotaterDataOuterClass { } /** - * optional float GNECDPPELLO = 8; - * @return whether the gNECDPPELLO field is set + * optional float APDIFCCFAGG = 6; + * @return whether the aPDIFCCFAGG field is set */ - public boolean hasGNECDPPELLO() { + public boolean hasAPDIFCCFAGG() { return (bitField0_ & 0x00000001) != 0; } /** - * optional float GNECDPPELLO = 8; + * optional float APDIFCCFAGG = 6; * @return this */ - public RotaterData clearGNECDPPELLO() { + public RotaterData clearAPDIFCCFAGG() { bitField0_ &= ~0x00000001; - gNECDPPELLO = 0F; + aPDIFCCFAGG = 0F; return this; } /** - * optional float GNECDPPELLO = 8; - * @return the gNECDPPELLO + * optional float APDIFCCFAGG = 6; + * @return the aPDIFCCFAGG */ - public float getGNECDPPELLO() { - return gNECDPPELLO; + public float getAPDIFCCFAGG() { + return aPDIFCCFAGG; } /** - * optional float GNECDPPELLO = 8; - * @param value the gNECDPPELLO to set + * optional float APDIFCCFAGG = 6; + * @param value the aPDIFCCFAGG to set * @return this */ - public RotaterData setGNECDPPELLO(final float value) { + public RotaterData setAPDIFCCFAGG(final float value) { bitField0_ |= 0x00000001; - gNECDPPELLO = value; + aPDIFCCFAGG = value; return this; } /** - * optional uint32 group_id = 3; + * optional uint32 group_id = 2; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -90,7 +90,7 @@ public final class RotaterDataOuterClass { } /** - * optional uint32 group_id = 3; + * optional uint32 group_id = 2; * @return this */ public RotaterData clearGroupId() { @@ -100,7 +100,7 @@ public final class RotaterDataOuterClass { } /** - * optional uint32 group_id = 3; + * optional uint32 group_id = 2; * @return the groupId */ public int getGroupId() { @@ -108,7 +108,7 @@ public final class RotaterDataOuterClass { } /** - * optional uint32 group_id = 3; + * optional uint32 group_id = 2; * @param value the groupId to set * @return this */ @@ -119,39 +119,39 @@ public final class RotaterDataOuterClass { } /** - * optional uint32 BPFADJDEGHP = 5; - * @return whether the bPFADJDEGHP field is set + * optional uint32 unk_int = 12; + * @return whether the unkInt field is set */ - public boolean hasBPFADJDEGHP() { + public boolean hasUnkInt() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 BPFADJDEGHP = 5; + * optional uint32 unk_int = 12; * @return this */ - public RotaterData clearBPFADJDEGHP() { + public RotaterData clearUnkInt() { bitField0_ &= ~0x00000004; - bPFADJDEGHP = 0; + unkInt = 0; return this; } /** - * optional uint32 BPFADJDEGHP = 5; - * @return the bPFADJDEGHP + * optional uint32 unk_int = 12; + * @return the unkInt */ - public int getBPFADJDEGHP() { - return bPFADJDEGHP; + public int getUnkInt() { + return unkInt; } /** - * optional uint32 BPFADJDEGHP = 5; - * @param value the bPFADJDEGHP to set + * optional uint32 unk_int = 12; + * @param value the unkInt to set * @return this */ - public RotaterData setBPFADJDEGHP(final int value) { + public RotaterData setUnkInt(final int value) { bitField0_ |= 0x00000004; - bPFADJDEGHP = value; + unkInt = value; return this; } @@ -160,9 +160,9 @@ public final class RotaterDataOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - gNECDPPELLO = other.gNECDPPELLO; + aPDIFCCFAGG = other.aPDIFCCFAGG; groupId = other.groupId; - bPFADJDEGHP = other.bPFADJDEGHP; + unkInt = other.unkInt; } return this; } @@ -173,14 +173,14 @@ public final class RotaterDataOuterClass { return this; } cachedSize = -1; - if (other.hasGNECDPPELLO()) { - setGNECDPPELLO(other.gNECDPPELLO); + if (other.hasAPDIFCCFAGG()) { + setAPDIFCCFAGG(other.aPDIFCCFAGG); } if (other.hasGroupId()) { setGroupId(other.groupId); } - if (other.hasBPFADJDEGHP()) { - setBPFADJDEGHP(other.bPFADJDEGHP); + if (other.hasUnkInt()) { + setUnkInt(other.unkInt); } return this; } @@ -192,9 +192,9 @@ public final class RotaterDataOuterClass { } cachedSize = -1; bitField0_ = 0; - gNECDPPELLO = 0F; + aPDIFCCFAGG = 0F; groupId = 0; - bPFADJDEGHP = 0; + unkInt = 0; return this; } @@ -218,24 +218,24 @@ public final class RotaterDataOuterClass { } RotaterData other = (RotaterData) o; return bitField0_ == other.bitField0_ - && (!hasGNECDPPELLO() || ProtoUtil.isEqual(gNECDPPELLO, other.gNECDPPELLO)) + && (!hasAPDIFCCFAGG() || ProtoUtil.isEqual(aPDIFCCFAGG, other.aPDIFCCFAGG)) && (!hasGroupId() || groupId == other.groupId) - && (!hasBPFADJDEGHP() || bPFADJDEGHP == other.bPFADJDEGHP); + && (!hasUnkInt() || unkInt == other.unkInt); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 69); - output.writeFloatNoTag(gNECDPPELLO); + output.writeRawByte((byte) 53); + output.writeFloatNoTag(aPDIFCCFAGG); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(bPFADJDEGHP); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(unkInt); } } @@ -249,7 +249,7 @@ public final class RotaterDataOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bPFADJDEGHP); + size += 1 + ProtoSink.computeUInt32SizeNoTag(unkInt); } return size; } @@ -261,27 +261,27 @@ public final class RotaterDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 69: { - // gNECDPPELLO - gNECDPPELLO = input.readFloat(); + case 53: { + // aPDIFCCFAGG + aPDIFCCFAGG = input.readFloat(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 16) { break; } } - case 24: { + case 16: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 96) { break; } } - case 40: { - // bPFADJDEGHP - bPFADJDEGHP = input.readUInt32(); + case 96: { + // unkInt + unkInt = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -306,13 +306,13 @@ public final class RotaterDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeFloat(FieldNames.gNECDPPELLO, gNECDPPELLO); + output.writeFloat(FieldNames.aPDIFCCFAGG, aPDIFCCFAGG); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.bPFADJDEGHP, bPFADJDEGHP); + output.writeUInt32(FieldNames.unkInt, unkInt); } output.endObject(); } @@ -324,10 +324,10 @@ public final class RotaterDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 2053242953: { - if (input.isAtField(FieldNames.gNECDPPELLO)) { + case 327278477: { + if (input.isAtField(FieldNames.aPDIFCCFAGG)) { if (!input.trySkipNullValue()) { - gNECDPPELLO = input.readFloat(); + aPDIFCCFAGG = input.readFloat(); bitField0_ |= 0x00000001; } } else { @@ -347,10 +347,11 @@ public final class RotaterDataOuterClass { } break; } - case 874068223: { - if (input.isAtField(FieldNames.bPFADJDEGHP)) { + case -840508003: + case -285293790: { + if (input.isAtField(FieldNames.unkInt)) { if (!input.trySkipNullValue()) { - bPFADJDEGHP = input.readUInt32(); + unkInt = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -410,11 +411,11 @@ public final class RotaterDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName gNECDPPELLO = FieldName.forField("GNECDPPELLO"); + static final FieldName aPDIFCCFAGG = FieldName.forField("APDIFCCFAGG"); static final FieldName groupId = FieldName.forField("groupId", "group_id"); - static final FieldName bPFADJDEGHP = FieldName.forField("BPFADJDEGHP"); + static final FieldName unkInt = FieldName.forField("unkInt", "unk_int"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java index 6afb1bd..2e368b0 100644 --- a/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java @@ -19,12 +19,12 @@ public final class RotatorEnergyInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_num = 3; + * optional uint32 cur_num = 2; */ private int curNum; /** - * optional uint32 max_num = 14; + * optional uint32 max_num = 6; */ private int maxNum; @@ -39,7 +39,7 @@ public final class RotatorEnergyInfoOuterClass { } /** - * optional uint32 cur_num = 3; + * optional uint32 cur_num = 2; * @return whether the curNum field is set */ public boolean hasCurNum() { @@ -47,7 +47,7 @@ public final class RotatorEnergyInfoOuterClass { } /** - * optional uint32 cur_num = 3; + * optional uint32 cur_num = 2; * @return this */ public RotatorEnergyInfo clearCurNum() { @@ -57,7 +57,7 @@ public final class RotatorEnergyInfoOuterClass { } /** - * optional uint32 cur_num = 3; + * optional uint32 cur_num = 2; * @return the curNum */ public int getCurNum() { @@ -65,7 +65,7 @@ public final class RotatorEnergyInfoOuterClass { } /** - * optional uint32 cur_num = 3; + * optional uint32 cur_num = 2; * @param value the curNum to set * @return this */ @@ -76,7 +76,7 @@ public final class RotatorEnergyInfoOuterClass { } /** - * optional uint32 max_num = 14; + * optional uint32 max_num = 6; * @return whether the maxNum field is set */ public boolean hasMaxNum() { @@ -84,7 +84,7 @@ public final class RotatorEnergyInfoOuterClass { } /** - * optional uint32 max_num = 14; + * optional uint32 max_num = 6; * @return this */ public RotatorEnergyInfo clearMaxNum() { @@ -94,7 +94,7 @@ public final class RotatorEnergyInfoOuterClass { } /** - * optional uint32 max_num = 14; + * optional uint32 max_num = 6; * @return the maxNum */ public int getMaxNum() { @@ -102,7 +102,7 @@ public final class RotatorEnergyInfoOuterClass { } /** - * optional uint32 max_num = 14; + * optional uint32 max_num = 6; * @param value the maxNum to set * @return this */ @@ -177,11 +177,11 @@ public final class RotatorEnergyInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(curNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(maxNum); } } @@ -205,16 +205,16 @@ public final class RotatorEnergyInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 16: { // curNum curNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 48) { break; } } - case 112: { + case 48: { // maxNum maxNum = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java index 7264446..5a192f6 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 = 12; - */ - private int mapLayer; - - /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 6; */ private int baseAvatarId; /** - * optional .AvatarType avatar_type = 13; + * optional uint32 map_layer = 14; + */ + private int mapLayer; + + /** + * optional .AvatarType avatar_type = 12; */ 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 */ @@ -86,62 +86,25 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 map_layer = 12; - * @return whether the mapLayer field is set + * optional uint32 base_avatar_id = 6; + * @return whether the baseAvatarId field is set */ - public boolean hasMapLayer() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 map_layer = 12; - * @return this - */ - public SceneActorInfo clearMapLayer() { - bitField0_ &= ~0x00000002; - mapLayer = 0; - return this; - } - - /** - * optional uint32 map_layer = 12; - * @return the mapLayer - */ - public int getMapLayer() { - return mapLayer; - } - - /** - * optional uint32 map_layer = 12; - * @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 = 14; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 6; * @return this */ public SceneActorInfo clearBaseAvatarId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; baseAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 6; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -149,18 +112,55 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 6; * @param value the baseAvatarId to set * @return this */ public SceneActorInfo setBaseAvatarId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; baseAvatarId = value; return this; } /** - * optional .AvatarType avatar_type = 13; + * optional uint32 map_layer = 14; + * @return whether the mapLayer field is set + */ + public boolean hasMapLayer() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 map_layer = 14; + * @return this + */ + public SceneActorInfo clearMapLayer() { + bitField0_ &= ~0x00000004; + mapLayer = 0; + return this; + } + + /** + * optional uint32 map_layer = 14; + * @return the mapLayer + */ + public int getMapLayer() { + return mapLayer; + } + + /** + * optional uint32 map_layer = 14; + * @param value the mapLayer to set + * @return this + */ + public SceneActorInfo setMapLayer(final int value) { + bitField0_ |= 0x00000004; + mapLayer = value; + return this; + } + + /** + * optional .AvatarType avatar_type = 12; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -168,7 +168,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional .AvatarType avatar_type = 13; + * optional .AvatarType avatar_type = 12; * @return this */ public SceneActorInfo clearAvatarType() { @@ -178,7 +178,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional .AvatarType avatar_type = 13; + * optional .AvatarType avatar_type = 12; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -211,7 +211,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional .AvatarType avatar_type = 13; + * optional .AvatarType avatar_type = 12; * @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) 96); - output.writeUInt32NoTag(mapLayer); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(baseAvatarId); + output.writeUInt32NoTag(mapLayer); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 96); 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,18 +340,18 @@ 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 != 96) { + if (tag != 48) { break; } } - case 96: { - // mapLayer - mapLayer = input.readUInt32(); + case 48: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 112) { @@ -359,15 +359,15 @@ public final class SceneActorInfoOuterClass { } } case 112: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + // mapLayer + mapLayer = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 96) { break; } } - case 104: { + case 96: { // 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 b3bfddb..9fd2808 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 = 3; - */ - private int roundsLimit; - - /** - * optional uint32 world_level = 8; + * optional uint32 world_level = 1; */ private int worldLevel; /** - * optional uint32 battle_id = 9; - */ - private int battleId; - - /** - * optional uint32 logic_random_seed = 12; + * optional uint32 logic_random_seed = 7; */ private int logicRandomSeed; /** - * optional uint32 stage_id = 15; + * optional uint32 stage_id = 9; */ private int stageId; /** - * repeated .SceneMonsterWave monster_wave_list = 1; + * optional uint32 rounds_limit = 13; */ - private final RepeatedMessage monsterWaveList = RepeatedMessage.newEmptyInstance(SceneMonsterWaveOuterClass.SceneMonsterWave.getFactory()); + private int roundsLimit; /** - * repeated .BattleAvatar battle_avatar_list = 7; + * optional uint32 battle_id = 14; + */ + private int battleId; + + /** + * repeated .BattleAvatar battle_avatar_list = 5; */ private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory()); /** - * repeated .BattleBuff buff_list = 11; + * repeated .SceneMonsterWave monster_wave_list = 8; + */ + private final RepeatedMessage monsterWaveList = RepeatedMessage.newEmptyInstance(SceneMonsterWaveOuterClass.SceneMonsterWave.getFactory()); + + /** + * repeated .BattleBuff buff_list = 12; */ private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(BattleBuffOuterClass.BattleBuff.getFactory()); /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 136; - */ - private final RepeatedMessage battleTargetInfo = RepeatedMessage.newEmptyInstance(BattleTargetInfoEntry.getFactory()); - - /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1367; + * repeated .BattleEventBattleInfo event_battle_info_list = 1395; */ private final RepeatedMessage eventBattleInfoList = RepeatedMessage.newEmptyInstance(BattleEventBattleInfoOuterClass.BattleEventBattleInfo.getFactory()); + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1498; + */ + private final RepeatedMessage battleTargetInfo = RepeatedMessage.newEmptyInstance(BattleTargetInfoEntry.getFactory()); + private SceneBattleInfo() { } @@ -80,62 +80,25 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 rounds_limit = 3; - * @return whether the roundsLimit field is set + * optional uint32 world_level = 1; + * @return whether the worldLevel field is set */ - public boolean hasRoundsLimit() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 rounds_limit = 3; - * @return this - */ - public SceneBattleInfo clearRoundsLimit() { - bitField0_ &= ~0x00000001; - roundsLimit = 0; - return this; - } - - /** - * optional uint32 rounds_limit = 3; - * @return the roundsLimit - */ - public int getRoundsLimit() { - return roundsLimit; - } - - /** - * optional uint32 rounds_limit = 3; - * @param value the roundsLimit to set - * @return this - */ - public SceneBattleInfo setRoundsLimit(final int value) { - bitField0_ |= 0x00000001; - roundsLimit = value; - return this; - } - - /** - * optional uint32 world_level = 8; - * @return whether the worldLevel field is set - */ - public boolean hasWorldLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 world_level = 8; + * optional uint32 world_level = 1; * @return this */ public SceneBattleInfo clearWorldLevel() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; worldLevel = 0; return this; } /** - * optional uint32 world_level = 8; + * optional uint32 world_level = 1; * @return the worldLevel */ public int getWorldLevel() { @@ -143,73 +106,36 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 world_level = 8; + * optional uint32 world_level = 1; * @param value the worldLevel to set * @return this */ public SceneBattleInfo setWorldLevel(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; worldLevel = value; return this; } /** - * optional uint32 battle_id = 9; - * @return whether the battleId field is set - */ - public boolean hasBattleId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 battle_id = 9; - * @return this - */ - public SceneBattleInfo clearBattleId() { - bitField0_ &= ~0x00000004; - 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 SceneBattleInfo setBattleId(final int value) { - bitField0_ |= 0x00000004; - battleId = value; - return this; - } - - /** - * optional uint32 logic_random_seed = 12; + * optional uint32 logic_random_seed = 7; * @return whether the logicRandomSeed field is set */ public boolean hasLogicRandomSeed() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 logic_random_seed = 12; + * optional uint32 logic_random_seed = 7; * @return this */ public SceneBattleInfo clearLogicRandomSeed() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; logicRandomSeed = 0; return this; } /** - * optional uint32 logic_random_seed = 12; + * optional uint32 logic_random_seed = 7; * @return the logicRandomSeed */ public int getLogicRandomSeed() { @@ -217,36 +143,36 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 logic_random_seed = 12; + * optional uint32 logic_random_seed = 7; * @param value the logicRandomSeed to set * @return this */ public SceneBattleInfo setLogicRandomSeed(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; logicRandomSeed = value; return this; } /** - * optional uint32 stage_id = 15; + * optional uint32 stage_id = 9; * @return whether the stageId field is set */ public boolean hasStageId() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 stage_id = 15; + * optional uint32 stage_id = 9; * @return this */ public SceneBattleInfo clearStageId() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; stageId = 0; return this; } /** - * optional uint32 stage_id = 15; + * optional uint32 stage_id = 9; * @return the stageId */ public int getStageId() { @@ -254,107 +180,110 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 stage_id = 15; + * optional uint32 stage_id = 9; * @param value the stageId to set * @return this */ public SceneBattleInfo setStageId(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; stageId = value; return this; } /** - * repeated .SceneMonsterWave monster_wave_list = 1; - * @return whether the monsterWaveList field is set + * optional uint32 rounds_limit = 13; + * @return whether the roundsLimit field is set */ - public boolean hasMonsterWaveList() { + public boolean hasRoundsLimit() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 rounds_limit = 13; + * @return this + */ + public SceneBattleInfo clearRoundsLimit() { + bitField0_ &= ~0x00000008; + roundsLimit = 0; + return this; + } + + /** + * optional uint32 rounds_limit = 13; + * @return the roundsLimit + */ + public int getRoundsLimit() { + return roundsLimit; + } + + /** + * optional uint32 rounds_limit = 13; + * @param value the roundsLimit to set + * @return this + */ + public SceneBattleInfo setRoundsLimit(final int value) { + bitField0_ |= 0x00000008; + roundsLimit = value; + return this; + } + + /** + * optional uint32 battle_id = 14; + * @return whether the battleId field is set + */ + public boolean hasBattleId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 battle_id = 14; + * @return this + */ + public SceneBattleInfo clearBattleId() { + bitField0_ &= ~0x00000010; + battleId = 0; + return this; + } + + /** + * optional uint32 battle_id = 14; + * @return the battleId + */ + public int getBattleId() { + return battleId; + } + + /** + * optional uint32 battle_id = 14; + * @param value the battleId to set + * @return this + */ + public SceneBattleInfo setBattleId(final int value) { + bitField0_ |= 0x00000010; + battleId = value; + return this; + } + + /** + * repeated .BattleAvatar battle_avatar_list = 5; + * @return whether the battleAvatarList field is set + */ + public boolean hasBattleAvatarList() { 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 .BattleAvatar battle_avatar_list = 7; - * @return whether the battleAvatarList field is set - */ - public boolean hasBattleAvatarList() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * repeated .BattleAvatar battle_avatar_list = 7; + * repeated .BattleAvatar battle_avatar_list = 5; * @return this */ public SceneBattleInfo clearBattleAvatarList() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000020; battleAvatarList.clear(); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 7; + * repeated .BattleAvatar battle_avatar_list = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -368,7 +297,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 7; + * repeated .BattleAvatar battle_avatar_list = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -377,35 +306,106 @@ public final class SceneBattleInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableBattleAvatarList() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; return battleAvatarList; } /** - * repeated .BattleAvatar battle_avatar_list = 7; + * repeated .BattleAvatar battle_avatar_list = 5; * @param value the battleAvatarList to add * @return this */ public SceneBattleInfo addBattleAvatarList(final BattleAvatarOuterClass.BattleAvatar value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; battleAvatarList.add(value); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 7; + * repeated .BattleAvatar battle_avatar_list = 5; * @param values the battleAvatarList to add * @return this */ public SceneBattleInfo addAllBattleAvatarList( final BattleAvatarOuterClass.BattleAvatar... values) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; battleAvatarList.addAll(values); return this; } /** - * repeated .BattleBuff buff_list = 11; + * repeated .SceneMonsterWave monster_wave_list = 8; + * @return whether the monsterWaveList field is set + */ + public boolean hasMonsterWaveList() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * repeated .SceneMonsterWave monster_wave_list = 8; + * @return this + */ + public SceneBattleInfo clearMonsterWaveList() { + bitField0_ &= ~0x00000040; + monsterWaveList.clear(); + return this; + } + + /** + * repeated .SceneMonsterWave monster_wave_list = 8; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableMonsterWaveList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMonsterWaveList() { + return monsterWaveList; + } + + /** + * repeated .SceneMonsterWave monster_wave_list = 8; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableMonsterWaveList( + ) { + bitField0_ |= 0x00000040; + return monsterWaveList; + } + + /** + * repeated .SceneMonsterWave monster_wave_list = 8; + * @param value the monsterWaveList to add + * @return this + */ + public SceneBattleInfo addMonsterWaveList( + final SceneMonsterWaveOuterClass.SceneMonsterWave value) { + bitField0_ |= 0x00000040; + monsterWaveList.add(value); + return this; + } + + /** + * repeated .SceneMonsterWave monster_wave_list = 8; + * @param values the monsterWaveList to add + * @return this + */ + public SceneBattleInfo addAllMonsterWaveList( + final SceneMonsterWaveOuterClass.SceneMonsterWave... values) { + bitField0_ |= 0x00000040; + monsterWaveList.addAll(values); + return this; + } + + /** + * repeated .BattleBuff buff_list = 12; * @return whether the buffList field is set */ public boolean hasBuffList() { @@ -413,7 +413,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleBuff buff_list = 11; + * repeated .BattleBuff buff_list = 12; * @return this */ public SceneBattleInfo clearBuffList() { @@ -423,7 +423,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleBuff buff_list = 11; + * repeated .BattleBuff buff_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -437,7 +437,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleBuff buff_list = 11; + * repeated .BattleBuff buff_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -451,7 +451,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleBuff buff_list = 11; + * repeated .BattleBuff buff_list = 12; * @param value the buffList to add * @return this */ @@ -462,7 +462,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleBuff buff_list = 11; + * repeated .BattleBuff buff_list = 12; * @param values the buffList to add * @return this */ @@ -473,93 +473,25 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 136; - * @return whether the battleTargetInfo field is set + * repeated .BattleEventBattleInfo event_battle_info_list = 1395; + * @return whether the eventBattleInfoList field is set */ - public boolean hasBattleTargetInfo() { + public boolean hasEventBattleInfoList() { return (bitField0_ & 0x00000100) != 0; } /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 136; - * @return this - */ - public SceneBattleInfo clearBattleTargetInfo() { - bitField0_ &= ~0x00000100; - battleTargetInfo.clear(); - return this; - } - - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 136; - * - * This method returns 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 = 136; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableBattleTargetInfo() { - bitField0_ |= 0x00000100; - return battleTargetInfo; - } - - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 136; - * @param value the battleTargetInfo to add - * @return this - */ - public SceneBattleInfo addBattleTargetInfo(final BattleTargetInfoEntry value) { - bitField0_ |= 0x00000100; - battleTargetInfo.add(value); - return this; - } - - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 136; - * @param values the battleTargetInfo to add - * @return this - */ - public SceneBattleInfo addAllBattleTargetInfo(final BattleTargetInfoEntry... values) { - bitField0_ |= 0x00000100; - battleTargetInfo.addAll(values); - return this; - } - - /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1367; - * @return whether the eventBattleInfoList field is set - */ - public boolean hasEventBattleInfoList() { - return (bitField0_ & 0x00000200) != 0; - } - - /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1367; + * repeated .BattleEventBattleInfo event_battle_info_list = 1395; * @return this */ public SceneBattleInfo clearEventBattleInfoList() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000100; eventBattleInfoList.clear(); return this; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1367; + * repeated .BattleEventBattleInfo event_battle_info_list = 1395; * * This 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 = 1367; + * repeated .BattleEventBattleInfo event_battle_info_list = 1395; * * 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 = 1367; + * repeated .BattleEventBattleInfo event_battle_info_list = 1395; * @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 = 1367; + * repeated .BattleEventBattleInfo event_battle_info_list = 1395; * @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 = 1498; + * @return whether the battleTargetInfo field is set + */ + public boolean hasBattleTargetInfo() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1498; + * @return this + */ + public SceneBattleInfo clearBattleTargetInfo() { + bitField0_ &= ~0x00000200; + battleTargetInfo.clear(); + return this; + } + + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1498; + * + * This method returns 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 = 1498; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of 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 = 1498; + * @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 = 1498; + * @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; worldLevel = other.worldLevel; - battleId = other.battleId; logicRandomSeed = other.logicRandomSeed; stageId = other.stageId; - monsterWaveList.copyFrom(other.monsterWaveList); + roundsLimit = other.roundsLimit; + battleId = other.battleId; battleAvatarList.copyFrom(other.battleAvatarList); + monsterWaveList.copyFrom(other.monsterWaveList); buffList.copyFrom(other.buffList); - battleTargetInfo.copyFrom(other.battleTargetInfo); 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.hasWorldLevel()) { setWorldLevel(other.worldLevel); } - if (other.hasBattleId()) { - setBattleId(other.battleId); - } if (other.hasLogicRandomSeed()) { setLogicRandomSeed(other.logicRandomSeed); } if (other.hasStageId()) { setStageId(other.stageId); } - if (other.hasMonsterWaveList()) { - getMutableMonsterWaveList().addAll(other.monsterWaveList); + if (other.hasRoundsLimit()) { + setRoundsLimit(other.roundsLimit); + } + if (other.hasBattleId()) { + setBattleId(other.battleId); } if (other.hasBattleAvatarList()) { getMutableBattleAvatarList().addAll(other.battleAvatarList); } + if (other.hasMonsterWaveList()) { + getMutableMonsterWaveList().addAll(other.monsterWaveList); + } if (other.hasBuffList()) { getMutableBuffList().addAll(other.buffList); } - if (other.hasBattleTargetInfo()) { - getMutableBattleTargetInfo().addAll(other.battleTargetInfo); - } 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; worldLevel = 0; - battleId = 0; logicRandomSeed = 0; stageId = 0; - monsterWaveList.clear(); + roundsLimit = 0; + battleId = 0; battleAvatarList.clear(); + monsterWaveList.clear(); buffList.clear(); - battleTargetInfo.clear(); eventBattleInfoList.clear(); + battleTargetInfo.clear(); return this; } @@ -697,11 +697,11 @@ public final class SceneBattleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - monsterWaveList.clearQuick(); battleAvatarList.clearQuick(); + monsterWaveList.clearQuick(); buffList.clearQuick(); - battleTargetInfo.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) && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasBattleId() || battleId == other.battleId) && (!hasLogicRandomSeed() || logicRandomSeed == other.logicRandomSeed) && (!hasStageId() || stageId == other.stageId) - && (!hasMonsterWaveList() || monsterWaveList.equals(other.monsterWaveList)) + && (!hasRoundsLimit() || roundsLimit == other.roundsLimit) + && (!hasBattleId() || battleId == other.battleId) && (!hasBattleAvatarList() || battleAvatarList.equals(other.battleAvatarList)) + && (!hasMonsterWaveList() || monsterWaveList.equals(other.monsterWaveList)) && (!hasBuffList() || buffList.equals(other.buffList)) - && (!hasBattleTargetInfo() || battleTargetInfo.equals(other.battleTargetInfo)) - && (!hasEventBattleInfoList() || eventBattleInfoList.equals(other.eventBattleInfoList)); + && (!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) 24); - output.writeUInt32NoTag(roundsLimit); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(worldLevel); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(logicRandomSeed); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 72); - output.writeUInt32NoTag(battleId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(logicRandomSeed); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); output.writeUInt32NoTag(stageId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(roundsLimit); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(battleId); + } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < monsterWaveList.length(); i++) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(monsterWaveList.get(i)); + for (int i = 0; i < battleAvatarList.length(); i++) { + output.writeRawByte((byte) 42); + output.writeMessageNoTag(battleAvatarList.get(i)); } } if ((bitField0_ & 0x00000040) != 0) { - for (int i = 0; i < battleAvatarList.length(); i++) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(battleAvatarList.get(i)); + for (int i = 0; i < monsterWaveList.length(); i++) { + output.writeRawByte((byte) 66); + output.writeMessageNoTag(monsterWaveList.get(i)); } } if ((bitField0_ & 0x00000080) != 0) { for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 98); output.writeMessageNoTag(buffList.get(i)); } } if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < battleTargetInfo.length(); i++) { - output.writeRawLittleEndian16((short) 2242); - output.writeMessageNoTag(battleTargetInfo.get(i)); + for (int i = 0; i < eventBattleInfoList.length(); i++) { + output.writeRawLittleEndian16((short) 22426); + output.writeMessageNoTag(eventBattleInfoList.get(i)); } } if ((bitField0_ & 0x00000200) != 0) { - for (int i = 0; i < eventBattleInfoList.length(); i++) { - output.writeRawLittleEndian16((short) 21946); - output.writeMessageNoTag(eventBattleInfoList.get(i)); + for (int i = 0; i < battleTargetInfo.length(); i++) { + output.writeRawLittleEndian16((short) 24018); + output.writeMessageNoTag(battleTargetInfo.get(i)); } } } @@ -785,34 +785,34 @@ 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(worldLevel); } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); - } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(logicRandomSeed); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(roundsLimit); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); + } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * monsterWaveList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterWaveList); + size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList); } if ((bitField0_ & 0x00000040) != 0) { - size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList); + size += (1 * monsterWaveList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterWaveList); } if ((bitField0_ & 0x00000080) != 0) { size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList); } 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,18 +824,18 @@ public final class SceneBattleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // roundsLimit - roundsLimit = input.readUInt32(); + case 8: { + // worldLevel + worldLevel = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 56) { break; } } - case 64: { - // worldLevel - worldLevel = input.readUInt32(); + case 56: { + // logicRandomSeed + logicRandomSeed = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 72) { @@ -843,67 +843,67 @@ public final class SceneBattleInfoOuterClass { } } case 72: { - // battleId - battleId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // logicRandomSeed - logicRandomSeed = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { // stageId stageId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // roundsLimit + roundsLimit = 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 != 58) { - break; - } - } - case 58: { + case 42: { // battleAvatarList tag = input.readRepeatedMessage(battleAvatarList, tag); - bitField0_ |= 0x00000040; - if (tag != 90) { + bitField0_ |= 0x00000020; + if (tag != 66) { break; } } - case 90: { + case 66: { + // monsterWaveList + tag = input.readRepeatedMessage(monsterWaveList, tag); + bitField0_ |= 0x00000040; + if (tag != 98) { + break; + } + } + case 98: { // buffList tag = input.readRepeatedMessage(buffList, tag); bitField0_ |= 0x00000080; - if (tag != 1090) { + if (tag != 11162) { break; } } - case 1090: { - // battleTargetInfo - tag = input.readRepeatedMessage(battleTargetInfo, tag); - bitField0_ |= 0x00000100; - if (tag != 10938) { - break; - } - } - case 10938: { + case 11162: { // eventBattleInfoList tag = input.readRepeatedMessage(eventBattleInfoList, tag); + bitField0_ |= 0x00000100; + if (tag != 11986) { + break; + } + } + case 11986: { + // battleTargetInfo + tag = input.readRepeatedMessage(battleTargetInfo, tag); bitField0_ |= 0x00000200; if (tag != 0) { break; @@ -927,34 +927,34 @@ public final class SceneBattleInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.roundsLimit, roundsLimit); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.worldLevel, worldLevel); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.battleId, battleId); - } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.logicRandomSeed, logicRandomSeed); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.stageId, stageId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.roundsLimit, roundsLimit); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.battleId, battleId); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.monsterWaveList, monsterWaveList); + output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList); + output.writeRepeatedMessage(FieldNames.monsterWaveList, monsterWaveList); } if ((bitField0_ & 0x00000080) != 0) { output.writeRepeatedMessage(FieldNames.buffList, buffList); } 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,36 +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 440007442: case 1305257111: { if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { worldLevel = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1678308365: - case -487930366: { - if (input.isAtField(FieldNames.battleId)) { - if (!input.trySkipNullValue()) { - battleId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -1007,7 +983,7 @@ public final class SceneBattleInfoOuterClass { if (input.isAtField(FieldNames.logicRandomSeed)) { if (!input.trySkipNullValue()) { logicRandomSeed = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -1019,19 +995,31 @@ public final class SceneBattleInfoOuterClass { if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { stageId = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); } break; } - case 697746737: - case -1492024321: { - if (input.isAtField(FieldNames.monsterWaveList)) { + case 306477590: + case 1457479585: { + if (input.isAtField(FieldNames.roundsLimit)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(monsterWaveList); - bitField0_ |= 0x00000020; + roundsLimit = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1678308365: + case -487930366: { + if (input.isAtField(FieldNames.battleId)) { + if (!input.trySkipNullValue()) { + battleId = input.readUInt32(); + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -1043,6 +1031,18 @@ public final class SceneBattleInfoOuterClass { if (input.isAtField(FieldNames.battleAvatarList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(battleAvatarList); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case 697746737: + case -1492024321: { + if (input.isAtField(FieldNames.monsterWaveList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(monsterWaveList); bitField0_ |= 0x00000040; } } else { @@ -1062,11 +1062,11 @@ public final class SceneBattleInfoOuterClass { } break; } - case 1657979063: - case 2141477269: { - if (input.isAtField(FieldNames.battleTargetInfo)) { + case 1643489406: + case 1679998413: { + if (input.isAtField(FieldNames.eventBattleInfoList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(battleTargetInfo); + input.readRepeatedMessage(eventBattleInfoList); bitField0_ |= 0x00000100; } } else { @@ -1074,11 +1074,11 @@ public final class SceneBattleInfoOuterClass { } break; } - case 1643489406: - case 1679998413: { - if (input.isAtField(FieldNames.eventBattleInfoList)) { + case 1657979063: + case 2141477269: { + if (input.isAtField(FieldNames.battleTargetInfo)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(eventBattleInfoList); + 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 worldLevel = FieldName.forField("worldLevel", "world_level"); - static final FieldName battleId = FieldName.forField("battleId", "battle_id"); - static final FieldName logicRandomSeed = FieldName.forField("logicRandomSeed", "logic_random_seed"); static final FieldName stageId = FieldName.forField("stageId", "stage_id"); - static final FieldName monsterWaveList = FieldName.forField("monsterWaveList", "monster_wave_list"); + static final FieldName roundsLimit = FieldName.forField("roundsLimit", "rounds_limit"); + + static final FieldName battleId = FieldName.forField("battleId", "battle_id"); static final FieldName battleAvatarList = FieldName.forField("battleAvatarList", "battle_avatar_list"); + static final FieldName monsterWaveList = FieldName.forField("monsterWaveList", "monster_wave_list"); + static final FieldName buffList = FieldName.forField("buffList", "buff_list"); - static final FieldName battleTargetInfo = FieldName.forField("battleTargetInfo", "battle_target_info"); - 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/SceneCastSkillCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java index a6b5334..3b6acd4 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java @@ -20,12 +20,7 @@ public final class SceneCastSkillCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 caster_id = 1; - */ - private int casterId; - - /** - * optional uint32 skill_index = 6; + * optional uint32 skill_index = 1; */ private int skillIndex; @@ -35,20 +30,25 @@ public final class SceneCastSkillCsReqOuterClass { private int attackedGroupId; /** - * optional .MotionInfo target_motion = 15; + * optional uint32 caster_id = 10; + */ + private int casterId; + + /** + * optional .MotionInfo target_motion = 2; */ private final MotionInfoOuterClass.MotionInfo targetMotion = MotionInfoOuterClass.MotionInfo.newInstance(); /** - * repeated uint32 hit_target_entity_id_list = 13; - */ - private final RepeatedInt hitTargetEntityIdList = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 assist_monster_entity_id_list = 14; + * repeated uint32 assist_monster_entity_id_list = 6; */ private final RepeatedInt assistMonsterEntityIdList = RepeatedInt.newEmptyInstance(); + /** + * repeated uint32 hit_target_entity_id_list = 9; + */ + private final RepeatedInt hitTargetEntityIdList = RepeatedInt.newEmptyInstance(); + private SceneCastSkillCsReq() { } @@ -60,62 +60,25 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 caster_id = 1; - * @return whether the casterId field is set + * optional uint32 skill_index = 1; + * @return whether the skillIndex field is set */ - public boolean hasCasterId() { + public boolean hasSkillIndex() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 caster_id = 1; - * @return this - */ - public SceneCastSkillCsReq clearCasterId() { - bitField0_ &= ~0x00000001; - casterId = 0; - return this; - } - - /** - * optional uint32 caster_id = 1; - * @return the casterId - */ - public int getCasterId() { - return casterId; - } - - /** - * optional uint32 caster_id = 1; - * @param value the casterId to set - * @return this - */ - public SceneCastSkillCsReq setCasterId(final int value) { - bitField0_ |= 0x00000001; - casterId = value; - return this; - } - - /** - * optional uint32 skill_index = 6; - * @return whether the skillIndex field is set - */ - public boolean hasSkillIndex() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 skill_index = 6; + * optional uint32 skill_index = 1; * @return this */ public SceneCastSkillCsReq clearSkillIndex() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; skillIndex = 0; return this; } /** - * optional uint32 skill_index = 6; + * optional uint32 skill_index = 1; * @return the skillIndex */ public int getSkillIndex() { @@ -123,12 +86,12 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 skill_index = 6; + * optional uint32 skill_index = 1; * @param value the skillIndex to set * @return this */ public SceneCastSkillCsReq setSkillIndex(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; skillIndex = value; return this; } @@ -138,7 +101,7 @@ public final class SceneCastSkillCsReqOuterClass { * @return whether the attackedGroupId field is set */ public boolean hasAttackedGroupId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -146,7 +109,7 @@ public final class SceneCastSkillCsReqOuterClass { * @return this */ public SceneCastSkillCsReq clearAttackedGroupId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; attackedGroupId = 0; return this; } @@ -165,13 +128,50 @@ public final class SceneCastSkillCsReqOuterClass { * @return this */ public SceneCastSkillCsReq setAttackedGroupId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; attackedGroupId = value; return this; } /** - * optional .MotionInfo target_motion = 15; + * optional uint32 caster_id = 10; + * @return whether the casterId field is set + */ + public boolean hasCasterId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 caster_id = 10; + * @return this + */ + public SceneCastSkillCsReq clearCasterId() { + bitField0_ &= ~0x00000004; + casterId = 0; + return this; + } + + /** + * optional uint32 caster_id = 10; + * @return the casterId + */ + public int getCasterId() { + return casterId; + } + + /** + * optional uint32 caster_id = 10; + * @param value the casterId to set + * @return this + */ + public SceneCastSkillCsReq setCasterId(final int value) { + bitField0_ |= 0x00000004; + casterId = value; + return this; + } + + /** + * optional .MotionInfo target_motion = 2; * @return whether the targetMotion field is set */ public boolean hasTargetMotion() { @@ -179,7 +179,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 15; + * optional .MotionInfo target_motion = 2; * @return this */ public SceneCastSkillCsReq clearTargetMotion() { @@ -189,7 +189,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 15; + * optional .MotionInfo target_motion = 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. @@ -203,7 +203,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 15; + * optional .MotionInfo target_motion = 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 @@ -217,7 +217,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 15; + * optional .MotionInfo target_motion = 2; * @param value the targetMotion to set * @return this */ @@ -228,93 +228,25 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated uint32 hit_target_entity_id_list = 13; - * @return whether the hitTargetEntityIdList field is set + * repeated uint32 assist_monster_entity_id_list = 6; + * @return whether the assistMonsterEntityIdList field is set */ - public boolean hasHitTargetEntityIdList() { + public boolean hasAssistMonsterEntityIdList() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated uint32 hit_target_entity_id_list = 13; - * @return this - */ - public SceneCastSkillCsReq clearHitTargetEntityIdList() { - bitField0_ &= ~0x00000010; - hitTargetEntityIdList.clear(); - return this; - } - - /** - * repeated uint32 hit_target_entity_id_list = 13; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableHitTargetEntityIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getHitTargetEntityIdList() { - return hitTargetEntityIdList; - } - - /** - * repeated uint32 hit_target_entity_id_list = 13; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableHitTargetEntityIdList() { - bitField0_ |= 0x00000010; - return hitTargetEntityIdList; - } - - /** - * repeated uint32 hit_target_entity_id_list = 13; - * @param value the hitTargetEntityIdList to add - * @return this - */ - public SceneCastSkillCsReq addHitTargetEntityIdList(final int value) { - bitField0_ |= 0x00000010; - hitTargetEntityIdList.add(value); - return this; - } - - /** - * repeated uint32 hit_target_entity_id_list = 13; - * @param values the hitTargetEntityIdList to add - * @return this - */ - public SceneCastSkillCsReq addAllHitTargetEntityIdList(final int... values) { - bitField0_ |= 0x00000010; - hitTargetEntityIdList.addAll(values); - return this; - } - - /** - * repeated uint32 assist_monster_entity_id_list = 14; - * @return whether the assistMonsterEntityIdList field is set - */ - public boolean hasAssistMonsterEntityIdList() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * repeated uint32 assist_monster_entity_id_list = 14; + * repeated uint32 assist_monster_entity_id_list = 6; * @return this */ public SceneCastSkillCsReq clearAssistMonsterEntityIdList() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; assistMonsterEntityIdList.clear(); return this; } /** - * repeated uint32 assist_monster_entity_id_list = 14; + * repeated uint32 assist_monster_entity_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. @@ -328,7 +260,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated uint32 assist_monster_entity_id_list = 14; + * repeated uint32 assist_monster_entity_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 @@ -337,43 +269,111 @@ public final class SceneCastSkillCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableAssistMonsterEntityIdList() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return assistMonsterEntityIdList; } /** - * repeated uint32 assist_monster_entity_id_list = 14; + * repeated uint32 assist_monster_entity_id_list = 6; * @param value the assistMonsterEntityIdList to add * @return this */ public SceneCastSkillCsReq addAssistMonsterEntityIdList(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; assistMonsterEntityIdList.add(value); return this; } /** - * repeated uint32 assist_monster_entity_id_list = 14; + * repeated uint32 assist_monster_entity_id_list = 6; * @param values the assistMonsterEntityIdList to add * @return this */ public SceneCastSkillCsReq addAllAssistMonsterEntityIdList(final int... values) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; assistMonsterEntityIdList.addAll(values); return this; } + /** + * repeated uint32 hit_target_entity_id_list = 9; + * @return whether the hitTargetEntityIdList field is set + */ + public boolean hasHitTargetEntityIdList() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * repeated uint32 hit_target_entity_id_list = 9; + * @return this + */ + public SceneCastSkillCsReq clearHitTargetEntityIdList() { + bitField0_ &= ~0x00000020; + hitTargetEntityIdList.clear(); + return this; + } + + /** + * repeated uint32 hit_target_entity_id_list = 9; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableHitTargetEntityIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getHitTargetEntityIdList() { + return hitTargetEntityIdList; + } + + /** + * repeated uint32 hit_target_entity_id_list = 9; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableHitTargetEntityIdList() { + bitField0_ |= 0x00000020; + return hitTargetEntityIdList; + } + + /** + * repeated uint32 hit_target_entity_id_list = 9; + * @param value the hitTargetEntityIdList to add + * @return this + */ + public SceneCastSkillCsReq addHitTargetEntityIdList(final int value) { + bitField0_ |= 0x00000020; + hitTargetEntityIdList.add(value); + return this; + } + + /** + * repeated uint32 hit_target_entity_id_list = 9; + * @param values the hitTargetEntityIdList to add + * @return this + */ + public SceneCastSkillCsReq addAllHitTargetEntityIdList(final int... values) { + bitField0_ |= 0x00000020; + hitTargetEntityIdList.addAll(values); + return this; + } + @Override public SceneCastSkillCsReq copyFrom(final SceneCastSkillCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - casterId = other.casterId; skillIndex = other.skillIndex; attackedGroupId = other.attackedGroupId; + casterId = other.casterId; targetMotion.copyFrom(other.targetMotion); - hitTargetEntityIdList.copyFrom(other.hitTargetEntityIdList); assistMonsterEntityIdList.copyFrom(other.assistMonsterEntityIdList); + hitTargetEntityIdList.copyFrom(other.hitTargetEntityIdList); } return this; } @@ -384,24 +384,24 @@ public final class SceneCastSkillCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasCasterId()) { - setCasterId(other.casterId); - } if (other.hasSkillIndex()) { setSkillIndex(other.skillIndex); } if (other.hasAttackedGroupId()) { setAttackedGroupId(other.attackedGroupId); } + if (other.hasCasterId()) { + setCasterId(other.casterId); + } if (other.hasTargetMotion()) { getMutableTargetMotion().mergeFrom(other.targetMotion); } - if (other.hasHitTargetEntityIdList()) { - getMutableHitTargetEntityIdList().addAll(other.hitTargetEntityIdList); - } if (other.hasAssistMonsterEntityIdList()) { getMutableAssistMonsterEntityIdList().addAll(other.assistMonsterEntityIdList); } + if (other.hasHitTargetEntityIdList()) { + getMutableHitTargetEntityIdList().addAll(other.hitTargetEntityIdList); + } return this; } @@ -412,12 +412,12 @@ public final class SceneCastSkillCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - casterId = 0; skillIndex = 0; attackedGroupId = 0; + casterId = 0; targetMotion.clear(); - hitTargetEntityIdList.clear(); assistMonsterEntityIdList.clear(); + hitTargetEntityIdList.clear(); return this; } @@ -429,8 +429,8 @@ public final class SceneCastSkillCsReqOuterClass { cachedSize = -1; bitField0_ = 0; targetMotion.clearQuick(); - hitTargetEntityIdList.clear(); assistMonsterEntityIdList.clear(); + hitTargetEntityIdList.clear(); return this; } @@ -444,42 +444,42 @@ public final class SceneCastSkillCsReqOuterClass { } SceneCastSkillCsReq other = (SceneCastSkillCsReq) o; return bitField0_ == other.bitField0_ - && (!hasCasterId() || casterId == other.casterId) && (!hasSkillIndex() || skillIndex == other.skillIndex) && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) + && (!hasCasterId() || casterId == other.casterId) && (!hasTargetMotion() || targetMotion.equals(other.targetMotion)) - && (!hasHitTargetEntityIdList() || hitTargetEntityIdList.equals(other.hitTargetEntityIdList)) - && (!hasAssistMonsterEntityIdList() || assistMonsterEntityIdList.equals(other.assistMonsterEntityIdList)); + && (!hasAssistMonsterEntityIdList() || assistMonsterEntityIdList.equals(other.assistMonsterEntityIdList)) + && (!hasHitTargetEntityIdList() || hitTargetEntityIdList.equals(other.hitTargetEntityIdList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(casterId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); output.writeUInt32NoTag(skillIndex); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 64); output.writeUInt32NoTag(attackedGroupId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(casterId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 18); output.writeMessageNoTag(targetMotion); } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < hitTargetEntityIdList.length(); i++) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(hitTargetEntityIdList.array()[i]); + for (int i = 0; i < assistMonsterEntityIdList.length(); i++) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(assistMonsterEntityIdList.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < assistMonsterEntityIdList.length(); i++) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(assistMonsterEntityIdList.array()[i]); + for (int i = 0; i < hitTargetEntityIdList.length(); i++) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(hitTargetEntityIdList.array()[i]); } } } @@ -488,22 +488,22 @@ public final class SceneCastSkillCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(casterId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(skillIndex); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(casterId); + } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(targetMotion); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * hitTargetEntityIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(hitTargetEntityIdList); + size += (1 * assistMonsterEntityIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(assistMonsterEntityIdList); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * assistMonsterEntityIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(assistMonsterEntityIdList); + size += (1 * hitTargetEntityIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(hitTargetEntityIdList); } return size; } @@ -516,18 +516,9 @@ public final class SceneCastSkillCsReqOuterClass { while (true) { switch (tag) { case 8: { - // casterId - casterId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { // skillIndex skillIndex = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 64) { break; @@ -536,33 +527,42 @@ public final class SceneCastSkillCsReqOuterClass { case 64: { // attackedGroupId attackedGroupId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 80) { break; } } - case 122: { + case 80: { + // casterId + casterId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { // targetMotion input.readMessage(targetMotion); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 106) { + if (tag != 50) { break; } } - case 106: { - // hitTargetEntityIdList [packed=true] - input.readPackedUInt32(hitTargetEntityIdList, tag); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { + case 50: { // assistMonsterEntityIdList [packed=true] input.readPackedUInt32(assistMonsterEntityIdList, tag); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // hitTargetEntityIdList [packed=true] + input.readPackedUInt32(hitTargetEntityIdList, tag); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 0) { @@ -579,15 +579,15 @@ public final class SceneCastSkillCsReqOuterClass { tag = input.readTag(); break; } - case 104: { - // hitTargetEntityIdList [packed=false] - tag = input.readRepeatedUInt32(hitTargetEntityIdList, tag); + case 48: { + // assistMonsterEntityIdList [packed=false] + tag = input.readRepeatedUInt32(assistMonsterEntityIdList, tag); bitField0_ |= 0x00000010; break; } - case 112: { - // assistMonsterEntityIdList [packed=false] - tag = input.readRepeatedUInt32(assistMonsterEntityIdList, tag); + case 72: { + // hitTargetEntityIdList [packed=false] + tag = input.readRepeatedUInt32(hitTargetEntityIdList, tag); bitField0_ |= 0x00000020; break; } @@ -599,22 +599,22 @@ public final class SceneCastSkillCsReqOuterClass { 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.skillIndex, skillIndex); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.casterId, casterId); + } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.targetMotion, targetMotion); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedUInt32(FieldNames.hitTargetEntityIdList, hitTargetEntityIdList); + output.writeRepeatedUInt32(FieldNames.assistMonsterEntityIdList, assistMonsterEntityIdList); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedUInt32(FieldNames.assistMonsterEntityIdList, assistMonsterEntityIdList); + output.writeRepeatedUInt32(FieldNames.hitTargetEntityIdList, hitTargetEntityIdList); } output.endObject(); } @@ -626,24 +626,12 @@ public final class SceneCastSkillCsReqOuterClass { } 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 1587034369: case -1716021916: { if (input.isAtField(FieldNames.skillIndex)) { if (!input.trySkipNullValue()) { skillIndex = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -655,6 +643,18 @@ public final class SceneCastSkillCsReqOuterClass { if (input.isAtField(FieldNames.attackedGroupId)) { if (!input.trySkipNullValue()) { attackedGroupId = 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 { @@ -674,11 +674,11 @@ public final class SceneCastSkillCsReqOuterClass { } break; } - case 1319168832: - case -35493464: { - if (input.isAtField(FieldNames.hitTargetEntityIdList)) { + case -1391993363: + case -1507247487: { + if (input.isAtField(FieldNames.assistMonsterEntityIdList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(hitTargetEntityIdList); + input.readRepeatedUInt32(assistMonsterEntityIdList); bitField0_ |= 0x00000010; } } else { @@ -686,11 +686,11 @@ public final class SceneCastSkillCsReqOuterClass { } break; } - case -1391993363: - case -1507247487: { - if (input.isAtField(FieldNames.assistMonsterEntityIdList)) { + case 1319168832: + case -35493464: { + if (input.isAtField(FieldNames.hitTargetEntityIdList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(assistMonsterEntityIdList); + input.readRepeatedUInt32(hitTargetEntityIdList); bitField0_ |= 0x00000020; } } else { @@ -751,17 +751,17 @@ public final class SceneCastSkillCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - 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 casterId = FieldName.forField("casterId", "caster_id"); + static final FieldName targetMotion = FieldName.forField("targetMotion", "target_motion"); - static final FieldName hitTargetEntityIdList = FieldName.forField("hitTargetEntityIdList", "hit_target_entity_id_list"); - static final FieldName assistMonsterEntityIdList = FieldName.forField("assistMonsterEntityIdList", "assist_monster_entity_id_list"); + + static final FieldName hitTargetEntityIdList = FieldName.forField("hitTargetEntityIdList", "hit_target_entity_id_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java index 884fd67..b2147f5 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java @@ -19,12 +19,12 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 attacked_group_id = 8; + * optional uint32 attacked_group_id = 5; */ private int attackedGroupId; /** - * optional uint32 mp = 13; + * optional uint32 mp = 11; */ private int mp; @@ -39,7 +39,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 8; + * optional uint32 attacked_group_id = 5; * @return whether the attackedGroupId field is set */ public boolean hasAttackedGroupId() { @@ -47,7 +47,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 8; + * optional uint32 attacked_group_id = 5; * @return this */ public SceneCastSkillMpUpdateScNotify clearAttackedGroupId() { @@ -57,7 +57,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 8; + * optional uint32 attacked_group_id = 5; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -65,7 +65,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 8; + * optional uint32 attacked_group_id = 5; * @param value the attackedGroupId to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 13; + * optional uint32 mp = 11; * @return whether the mp field is set */ public boolean hasMp() { @@ -84,7 +84,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 13; + * optional uint32 mp = 11; * @return this */ public SceneCastSkillMpUpdateScNotify clearMp() { @@ -94,7 +94,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 13; + * optional uint32 mp = 11; * @return the mp */ public int getMp() { @@ -102,7 +102,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 13; + * optional uint32 mp = 11; * @param value the mp to set * @return this */ @@ -177,11 +177,11 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(attackedGroupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(mp); } } @@ -205,16 +205,16 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 40: { // attackedGroupId attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 88) { break; } } - case 104: { + case 88: { // mp mp = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java index 244f561..d79d74d 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java @@ -19,17 +19,17 @@ public final class SceneCastSkillScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 attacked_group_id = 6; - */ - private int attackedGroupId; - - /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional .SceneBattleInfo battle_info = 5; + * optional uint32 attacked_group_id = 15; + */ + private int attackedGroupId; + + /** + * optional .SceneBattleInfo battle_info = 8; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -44,62 +44,25 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 attacked_group_id = 6; - * @return whether the attackedGroupId field is set + * optional uint32 retcode = 3; + * @return whether the retcode field is set */ - public boolean hasAttackedGroupId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 attacked_group_id = 6; - * @return this - */ - public SceneCastSkillScRsp clearAttackedGroupId() { - bitField0_ &= ~0x00000001; - attackedGroupId = 0; - return this; - } - - /** - * optional uint32 attacked_group_id = 6; - * @return the attackedGroupId - */ - public int getAttackedGroupId() { - return attackedGroupId; - } - - /** - * optional uint32 attacked_group_id = 6; - * @param value the attackedGroupId to set - * @return this - */ - public SceneCastSkillScRsp setAttackedGroupId(final int value) { - bitField0_ |= 0x00000001; - attackedGroupId = value; - return this; - } - - /** - * optional uint32 retcode = 12; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @return this */ public SceneCastSkillScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -107,18 +70,55 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ public SceneCastSkillScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional .SceneBattleInfo battle_info = 5; + * optional uint32 attacked_group_id = 15; + * @return whether the attackedGroupId field is set + */ + public boolean hasAttackedGroupId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 attacked_group_id = 15; + * @return this + */ + public SceneCastSkillScRsp clearAttackedGroupId() { + bitField0_ &= ~0x00000002; + attackedGroupId = 0; + return this; + } + + /** + * optional uint32 attacked_group_id = 15; + * @return the attackedGroupId + */ + public int getAttackedGroupId() { + return attackedGroupId; + } + + /** + * optional uint32 attacked_group_id = 15; + * @param value the attackedGroupId to set + * @return this + */ + public SceneCastSkillScRsp setAttackedGroupId(final int value) { + bitField0_ |= 0x00000002; + attackedGroupId = value; + return this; + } + + /** + * optional .SceneBattleInfo battle_info = 8; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -126,7 +126,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 5; + * optional .SceneBattleInfo battle_info = 8; * @return this */ public SceneCastSkillScRsp clearBattleInfo() { @@ -136,7 +136,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 5; + * optional .SceneBattleInfo battle_info = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 5; + * optional .SceneBattleInfo battle_info = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 5; + * optional .SceneBattleInfo battle_info = 8; * @param value the battleInfo to set * @return this */ @@ -180,8 +180,8 @@ public final class SceneCastSkillScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - attackedGroupId = other.attackedGroupId; retcode = other.retcode; + attackedGroupId = other.attackedGroupId; battleInfo.copyFrom(other.battleInfo); } return this; @@ -193,12 +193,12 @@ public final class SceneCastSkillScRspOuterClass { return this; } cachedSize = -1; - if (other.hasAttackedGroupId()) { - setAttackedGroupId(other.attackedGroupId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasAttackedGroupId()) { + setAttackedGroupId(other.attackedGroupId); + } if (other.hasBattleInfo()) { getMutableBattleInfo().mergeFrom(other.battleInfo); } @@ -212,8 +212,8 @@ public final class SceneCastSkillScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - attackedGroupId = 0; retcode = 0; + attackedGroupId = 0; battleInfo.clear(); return this; } @@ -239,23 +239,23 @@ public final class SceneCastSkillScRspOuterClass { } SceneCastSkillScRsp other = (SceneCastSkillScRsp) o; return bitField0_ == other.bitField0_ - && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) && (!hasRetcode() || retcode == other.retcode) + && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) && (!hasBattleInfo() || battleInfo.equals(other.battleInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(attackedGroupId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(attackedGroupId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 66); output.writeMessageNoTag(battleInfo); } } @@ -264,10 +264,10 @@ public final class SceneCastSkillScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(battleInfo); @@ -282,25 +282,25 @@ public final class SceneCastSkillScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // attackedGroupId - attackedGroupId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 24: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 120) { break; } } - case 42: { + case 120: { + // attackedGroupId + attackedGroupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000004; @@ -327,10 +327,10 @@ public final class SceneCastSkillScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.battleInfo, battleInfo); @@ -345,11 +345,10 @@ public final class SceneCastSkillScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1725961965: - case -715836621: { - if (input.isAtField(FieldNames.attackedGroupId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - attackedGroupId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -357,10 +356,11 @@ public final class SceneCastSkillScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1725961965: + case -715836621: { + if (input.isAtField(FieldNames.attackedGroupId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -433,10 +433,10 @@ public final class SceneCastSkillScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); + static final FieldName battleInfo = FieldName.forField("battleInfo", "battle_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java index dff3ec0..c1b53ed 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java @@ -19,12 +19,12 @@ public final class SceneEnterStageScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_info = 12; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -39,7 +39,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @return this */ public SceneEnterStageScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * 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 = 10; + * optional .SceneBattleInfo battle_info = 12; * @return this */ public SceneEnterStageScRsp clearBattleInfo() { @@ -94,7 +94,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * 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 = 10; + * 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 = 10; + * 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) 40); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 98); output.writeMessageNoTag(battleInfo); } } @@ -227,16 +227,16 @@ public final class SceneEnterStageScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 98) { break; } } - case 82: { + 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 5d2eed9..979dd03 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 state = 6; + * optional uint32 state = 7; */ private int state; /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 8; */ private int groupId; /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 12; */ private final RepeatedMessage entityList = RepeatedMessage.newEmptyInstance(SceneEntityInfoOuterClass.SceneEntityInfo.getFactory()); @@ -45,7 +45,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 7; * @return whether the state field is set */ public boolean hasState() { @@ -53,7 +53,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 7; * @return this */ public SceneEntityGroupInfo clearState() { @@ -63,7 +63,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 7; * @return the state */ public int getState() { @@ -71,7 +71,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 7; * @param value the state to set * @return this */ @@ -82,7 +82,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 8; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -90,7 +90,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 8; * @return this */ public SceneEntityGroupInfo clearGroupId() { @@ -100,7 +100,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 8; * @return the groupId */ public int getGroupId() { @@ -108,7 +108,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 8; * @param value the groupId to set * @return this */ @@ -119,7 +119,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 12; * @return whether the entityList field is set */ public boolean hasEntityList() { @@ -127,7 +127,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 12; * @return this */ public SceneEntityGroupInfo clearEntityList() { @@ -137,7 +137,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 12; * @param value the entityList to add * @return this */ @@ -177,7 +177,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 12; * @param values the entityList to add * @return this */ @@ -260,16 +260,16 @@ public final class SceneEntityGroupInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < entityList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 98); output.writeMessageNoTag(entityList.get(i)); } } @@ -297,25 +297,25 @@ public final class SceneEntityGroupInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 56: { // state state = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 64) { break; } } - case 80: { + case 64: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 98) { break; } } - case 18: { + case 98: { // entityList tag = input.readRepeatedMessage(entityList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java index 911a08e..8e67262 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java @@ -19,49 +19,49 @@ public final class SceneEntityInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 inst_id = 4; + * optional uint32 inst_id = 3; */ private int instId; /** - * optional uint32 entity_id = 6; - */ - private int entityId; - - /** - * optional uint32 group_id = 11; + * optional uint32 group_id = 5; */ private int groupId; /** - * optional .ScenePropInfo prop = 5; + * optional uint32 entity_id = 13; */ - private final ScenePropInfoOuterClass.ScenePropInfo prop = ScenePropInfoOuterClass.ScenePropInfo.newInstance(); + private int entityId; /** - * optional .MotionInfo motion = 8; + * optional .MotionInfo motion = 4; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); /** - * optional .SceneNpcMonsterInfo npc_monster = 9; + * optional .SceneNpcInfo npc = 8; */ - private final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo npcMonster = SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo.newInstance(); + private final SceneNpcInfoOuterClass.SceneNpcInfo npc = SceneNpcInfoOuterClass.SceneNpcInfo.newInstance(); /** - * optional .SceneSummonUnitInfo summon_unit = 12; + * optional .SceneSummonUnitInfo summon_unit = 9; */ private final SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo summonUnit = SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo.newInstance(); /** - * optional .SceneActorInfo actor = 13; + * optional .ScenePropInfo prop = 10; + */ + private final ScenePropInfoOuterClass.ScenePropInfo prop = ScenePropInfoOuterClass.ScenePropInfo.newInstance(); + + /** + * optional .SceneActorInfo actor = 11; */ private final SceneActorInfoOuterClass.SceneActorInfo actor = SceneActorInfoOuterClass.SceneActorInfo.newInstance(); /** - * optional .SceneNpcInfo npc = 14; + * optional .SceneNpcMonsterInfo npc_monster = 12; */ - private final SceneNpcInfoOuterClass.SceneNpcInfo npc = SceneNpcInfoOuterClass.SceneNpcInfo.newInstance(); + private final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo npcMonster = SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo.newInstance(); private SceneEntityInfo() { } @@ -74,7 +74,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional uint32 inst_id = 4; + * optional uint32 inst_id = 3; * @return whether the instId field is set */ public boolean hasInstId() { @@ -82,7 +82,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional uint32 inst_id = 4; + * optional uint32 inst_id = 3; * @return this */ public SceneEntityInfo clearInstId() { @@ -92,7 +92,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional uint32 inst_id = 4; + * optional uint32 inst_id = 3; * @return the instId */ public int getInstId() { @@ -100,7 +100,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional uint32 inst_id = 4; + * optional uint32 inst_id = 3; * @param value the instId to set * @return this */ @@ -111,62 +111,25 @@ public final class SceneEntityInfoOuterClass { } /** - * optional uint32 entity_id = 6; - * @return whether the entityId field is set + * optional uint32 group_id = 5; + * @return whether the groupId field is set */ - public boolean hasEntityId() { + public boolean hasGroupId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 entity_id = 6; - * @return this - */ - public SceneEntityInfo clearEntityId() { - bitField0_ &= ~0x00000002; - entityId = 0; - return this; - } - - /** - * optional uint32 entity_id = 6; - * @return the entityId - */ - public int getEntityId() { - return entityId; - } - - /** - * optional uint32 entity_id = 6; - * @param value the entityId to set - * @return this - */ - public SceneEntityInfo setEntityId(final int value) { - bitField0_ |= 0x00000002; - entityId = value; - return this; - } - - /** - * optional uint32 group_id = 11; - * @return whether the groupId field is set - */ - public boolean hasGroupId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 group_id = 11; + * optional uint32 group_id = 5; * @return this */ public SceneEntityInfo clearGroupId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; groupId = 0; return this; } /** - * optional uint32 group_id = 11; + * optional uint32 group_id = 5; * @return the groupId */ public int getGroupId() { @@ -174,93 +137,73 @@ public final class SceneEntityInfoOuterClass { } /** - * optional uint32 group_id = 11; + * optional uint32 group_id = 5; * @param value the groupId to set * @return this */ public SceneEntityInfo setGroupId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; groupId = value; return this; } /** - * optional .ScenePropInfo prop = 5; - * @return whether the prop field is set + * optional uint32 entity_id = 13; + * @return whether the entityId field is set */ - public boolean hasProp() { + public boolean hasEntityId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 entity_id = 13; + * @return this + */ + public SceneEntityInfo clearEntityId() { + bitField0_ &= ~0x00000004; + 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 SceneEntityInfo setEntityId(final int value) { + bitField0_ |= 0x00000004; + entityId = value; + return this; + } + + /** + * optional .MotionInfo motion = 4; + * @return whether the motion field is set + */ + public boolean hasMotion() { return (bitField0_ & 0x00000008) != 0; } /** - * optional .ScenePropInfo prop = 5; - * @return this - */ - public SceneEntityInfo clearProp() { - bitField0_ &= ~0x00000008; - prop.clear(); - return this; - } - - /** - * optional .ScenePropInfo prop = 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 #getMutableProp()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ScenePropInfoOuterClass.ScenePropInfo getProp() { - return prop; - } - - /** - * optional .ScenePropInfo prop = 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 ScenePropInfoOuterClass.ScenePropInfo getMutableProp() { - bitField0_ |= 0x00000008; - return prop; - } - - /** - * optional .ScenePropInfo prop = 5; - * @param value the prop to set - * @return this - */ - public SceneEntityInfo setProp(final ScenePropInfoOuterClass.ScenePropInfo value) { - bitField0_ |= 0x00000008; - prop.copyFrom(value); - return this; - } - - /** - * optional .MotionInfo motion = 8; - * @return whether the motion field is set - */ - public boolean hasMotion() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .MotionInfo motion = 8; + * optional .MotionInfo motion = 4; * @return this */ public SceneEntityInfo clearMotion() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; motion.clear(); return this; } /** - * optional .MotionInfo motion = 8; + * 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. @@ -274,7 +217,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .MotionInfo motion = 8; + * 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 @@ -283,214 +226,41 @@ public final class SceneEntityInfoOuterClass { * @return internal storage object for modifications */ public MotionInfoOuterClass.MotionInfo getMutableMotion() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return motion; } /** - * optional .MotionInfo motion = 8; + * optional .MotionInfo motion = 4; * @param value the motion to set * @return this */ public SceneEntityInfo setMotion(final MotionInfoOuterClass.MotionInfo value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; motion.copyFrom(value); return this; } /** - * optional .SceneNpcMonsterInfo npc_monster = 9; - * @return whether the npcMonster field is set - */ - public boolean hasNpcMonster() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional .SceneNpcMonsterInfo npc_monster = 9; - * @return this - */ - public SceneEntityInfo clearNpcMonster() { - bitField0_ &= ~0x00000020; - npcMonster.clear(); - return this; - } - - /** - * optional .SceneNpcMonsterInfo npc_monster = 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 #getMutableNpcMonster()} if you want to modify it. - * - * @return internal storage object for reading - */ - public SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getNpcMonster() { - return npcMonster; - } - - /** - * optional .SceneNpcMonsterInfo npc_monster = 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 SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getMutableNpcMonster() { - bitField0_ |= 0x00000020; - return npcMonster; - } - - /** - * optional .SceneNpcMonsterInfo npc_monster = 9; - * @param value the npcMonster to set - * @return this - */ - public SceneEntityInfo setNpcMonster( - final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo value) { - bitField0_ |= 0x00000020; - npcMonster.copyFrom(value); - return this; - } - - /** - * optional .SceneSummonUnitInfo summon_unit = 12; - * @return whether the summonUnit field is set - */ - public boolean hasSummonUnit() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional .SceneSummonUnitInfo summon_unit = 12; - * @return this - */ - public SceneEntityInfo clearSummonUnit() { - bitField0_ &= ~0x00000040; - summonUnit.clear(); - return this; - } - - /** - * optional .SceneSummonUnitInfo summon_unit = 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 #getMutableSummonUnit()} if you want to modify it. - * - * @return internal storage object for reading - */ - public SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo getSummonUnit() { - return summonUnit; - } - - /** - * optional .SceneSummonUnitInfo summon_unit = 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 SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo getMutableSummonUnit() { - bitField0_ |= 0x00000040; - return summonUnit; - } - - /** - * optional .SceneSummonUnitInfo summon_unit = 12; - * @param value the summonUnit to set - * @return this - */ - public SceneEntityInfo setSummonUnit( - final SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo value) { - bitField0_ |= 0x00000040; - summonUnit.copyFrom(value); - return this; - } - - /** - * optional .SceneActorInfo actor = 13; - * @return whether the actor field is set - */ - public boolean hasActor() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional .SceneActorInfo actor = 13; - * @return this - */ - public SceneEntityInfo clearActor() { - bitField0_ &= ~0x00000080; - actor.clear(); - return this; - } - - /** - * optional .SceneActorInfo actor = 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 #getMutableActor()} if you want to modify it. - * - * @return internal storage object for reading - */ - public SceneActorInfoOuterClass.SceneActorInfo getActor() { - return actor; - } - - /** - * optional .SceneActorInfo actor = 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 SceneActorInfoOuterClass.SceneActorInfo getMutableActor() { - bitField0_ |= 0x00000080; - return actor; - } - - /** - * optional .SceneActorInfo actor = 13; - * @param value the actor to set - * @return this - */ - public SceneEntityInfo setActor(final SceneActorInfoOuterClass.SceneActorInfo value) { - bitField0_ |= 0x00000080; - actor.copyFrom(value); - return this; - } - - /** - * optional .SceneNpcInfo npc = 14; + * optional .SceneNpcInfo npc = 8; * @return whether the npc field is set */ public boolean hasNpc() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000010) != 0; } /** - * optional .SceneNpcInfo npc = 14; + * optional .SceneNpcInfo npc = 8; * @return this */ public SceneEntityInfo clearNpc() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000010; npc.clear(); return this; } /** - * optional .SceneNpcInfo npc = 14; + * optional .SceneNpcInfo npc = 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. @@ -504,7 +274,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneNpcInfo npc = 14; + * optional .SceneNpcInfo npc = 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 @@ -513,35 +283,265 @@ public final class SceneEntityInfoOuterClass { * @return internal storage object for modifications */ public SceneNpcInfoOuterClass.SceneNpcInfo getMutableNpc() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000010; return npc; } /** - * optional .SceneNpcInfo npc = 14; + * optional .SceneNpcInfo npc = 8; * @param value the npc to set * @return this */ public SceneEntityInfo setNpc(final SceneNpcInfoOuterClass.SceneNpcInfo value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000010; npc.copyFrom(value); return this; } + /** + * optional .SceneSummonUnitInfo summon_unit = 9; + * @return whether the summonUnit field is set + */ + public boolean hasSummonUnit() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional .SceneSummonUnitInfo summon_unit = 9; + * @return this + */ + public SceneEntityInfo clearSummonUnit() { + bitField0_ &= ~0x00000020; + summonUnit.clear(); + return this; + } + + /** + * optional .SceneSummonUnitInfo summon_unit = 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 #getMutableSummonUnit()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo getSummonUnit() { + return summonUnit; + } + + /** + * optional .SceneSummonUnitInfo summon_unit = 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 SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo getMutableSummonUnit() { + bitField0_ |= 0x00000020; + return summonUnit; + } + + /** + * optional .SceneSummonUnitInfo summon_unit = 9; + * @param value the summonUnit to set + * @return this + */ + public SceneEntityInfo setSummonUnit( + final SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo value) { + bitField0_ |= 0x00000020; + summonUnit.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 .SceneActorInfo actor = 11; + * @return whether the actor field is set + */ + public boolean hasActor() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional .SceneActorInfo actor = 11; + * @return this + */ + public SceneEntityInfo clearActor() { + bitField0_ &= ~0x00000080; + actor.clear(); + return this; + } + + /** + * optional .SceneActorInfo actor = 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 #getMutableActor()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneActorInfoOuterClass.SceneActorInfo getActor() { + return actor; + } + + /** + * optional .SceneActorInfo actor = 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 SceneActorInfoOuterClass.SceneActorInfo getMutableActor() { + bitField0_ |= 0x00000080; + return actor; + } + + /** + * optional .SceneActorInfo actor = 11; + * @param value the actor to set + * @return this + */ + public SceneEntityInfo setActor(final SceneActorInfoOuterClass.SceneActorInfo value) { + bitField0_ |= 0x00000080; + actor.copyFrom(value); + return this; + } + + /** + * optional .SceneNpcMonsterInfo npc_monster = 12; + * @return whether the npcMonster field is set + */ + public boolean hasNpcMonster() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * optional .SceneNpcMonsterInfo npc_monster = 12; + * @return this + */ + public SceneEntityInfo clearNpcMonster() { + bitField0_ &= ~0x00000100; + npcMonster.clear(); + return this; + } + + /** + * optional .SceneNpcMonsterInfo npc_monster = 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 #getMutableNpcMonster()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getNpcMonster() { + return npcMonster; + } + + /** + * optional .SceneNpcMonsterInfo npc_monster = 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 SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getMutableNpcMonster() { + bitField0_ |= 0x00000100; + return npcMonster; + } + + /** + * optional .SceneNpcMonsterInfo npc_monster = 12; + * @param value the npcMonster to set + * @return this + */ + public SceneEntityInfo setNpcMonster( + final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo value) { + bitField0_ |= 0x00000100; + npcMonster.copyFrom(value); + return this; + } + @Override public SceneEntityInfo copyFrom(final SceneEntityInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; instId = other.instId; - entityId = other.entityId; groupId = other.groupId; - prop.copyFrom(other.prop); + entityId = other.entityId; motion.copyFrom(other.motion); - npcMonster.copyFrom(other.npcMonster); - summonUnit.copyFrom(other.summonUnit); - actor.copyFrom(other.actor); npc.copyFrom(other.npc); + summonUnit.copyFrom(other.summonUnit); + prop.copyFrom(other.prop); + actor.copyFrom(other.actor); + npcMonster.copyFrom(other.npcMonster); } return this; } @@ -555,29 +555,29 @@ public final class SceneEntityInfoOuterClass { if (other.hasInstId()) { setInstId(other.instId); } - if (other.hasEntityId()) { - setEntityId(other.entityId); - } if (other.hasGroupId()) { setGroupId(other.groupId); } - if (other.hasProp()) { - getMutableProp().mergeFrom(other.prop); + if (other.hasEntityId()) { + setEntityId(other.entityId); } if (other.hasMotion()) { getMutableMotion().mergeFrom(other.motion); } - if (other.hasNpcMonster()) { - getMutableNpcMonster().mergeFrom(other.npcMonster); + if (other.hasNpc()) { + getMutableNpc().mergeFrom(other.npc); } if (other.hasSummonUnit()) { getMutableSummonUnit().mergeFrom(other.summonUnit); } + if (other.hasProp()) { + getMutableProp().mergeFrom(other.prop); + } if (other.hasActor()) { getMutableActor().mergeFrom(other.actor); } - if (other.hasNpc()) { - getMutableNpc().mergeFrom(other.npc); + if (other.hasNpcMonster()) { + getMutableNpcMonster().mergeFrom(other.npcMonster); } return this; } @@ -590,14 +590,14 @@ public final class SceneEntityInfoOuterClass { cachedSize = -1; bitField0_ = 0; instId = 0; - entityId = 0; groupId = 0; - prop.clear(); + entityId = 0; motion.clear(); - npcMonster.clear(); - summonUnit.clear(); - actor.clear(); npc.clear(); + summonUnit.clear(); + prop.clear(); + actor.clear(); + npcMonster.clear(); return this; } @@ -608,12 +608,12 @@ public final class SceneEntityInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - prop.clearQuick(); motion.clearQuick(); - npcMonster.clearQuick(); - summonUnit.clearQuick(); - actor.clearQuick(); npc.clearQuick(); + summonUnit.clearQuick(); + prop.clearQuick(); + actor.clearQuick(); + npcMonster.clearQuick(); return this; } @@ -628,53 +628,53 @@ public final class SceneEntityInfoOuterClass { SceneEntityInfo other = (SceneEntityInfo) o; return bitField0_ == other.bitField0_ && (!hasInstId() || instId == other.instId) - && (!hasEntityId() || entityId == other.entityId) && (!hasGroupId() || groupId == other.groupId) - && (!hasProp() || prop.equals(other.prop)) + && (!hasEntityId() || entityId == other.entityId) && (!hasMotion() || motion.equals(other.motion)) - && (!hasNpcMonster() || npcMonster.equals(other.npcMonster)) + && (!hasNpc() || npc.equals(other.npc)) && (!hasSummonUnit() || summonUnit.equals(other.summonUnit)) + && (!hasProp() || prop.equals(other.prop)) && (!hasActor() || actor.equals(other.actor)) - && (!hasNpc() || npc.equals(other.npc)); + && (!hasNpcMonster() || npcMonster.equals(other.npcMonster)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(instId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(entityId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(groupId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(entityId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(prop); + output.writeRawByte((byte) 34); + output.writeMessageNoTag(motion); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 66); - output.writeMessageNoTag(motion); + output.writeMessageNoTag(npc); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 74); - output.writeMessageNoTag(npcMonster); - } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 98); output.writeMessageNoTag(summonUnit); } + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawByte((byte) 82); + output.writeMessageNoTag(prop); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 90); output.writeMessageNoTag(actor); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(npc); + output.writeRawByte((byte) 98); + output.writeMessageNoTag(npcMonster); } } @@ -685,28 +685,28 @@ public final class SceneEntityInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(instId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(prop); + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(motion); } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(npc); + } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(npcMonster); + size += 1 + ProtoSink.computeMessageSizeNoTag(summonUnit); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(summonUnit); + size += 1 + ProtoSink.computeMessageSizeNoTag(prop); } if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(actor); } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(npc); + size += 1 + ProtoSink.computeMessageSizeNoTag(npcMonster); } return size; } @@ -718,36 +718,36 @@ public final class SceneEntityInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 24: { // instId instId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 40) { break; } } - case 48: { - // entityId - entityId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 40: { // groupId groupId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 104) { break; } } - case 42: { - // prop - input.readMessage(prop); + case 104: { + // entityId + entityId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 34) { + break; + } + } + case 34: { + // motion + input.readMessage(motion); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 66) { @@ -755,8 +755,8 @@ public final class SceneEntityInfoOuterClass { } } case 66: { - // motion - input.readMessage(motion); + // npc + input.readMessage(npc); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 74) { @@ -764,35 +764,35 @@ public final class SceneEntityInfoOuterClass { } } case 74: { - // npcMonster - input.readMessage(npcMonster); + // summonUnit + input.readMessage(summonUnit); bitField0_ |= 0x00000020; tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { + // prop + input.readMessage(prop); + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { + // actor + input.readMessage(actor); + bitField0_ |= 0x00000080; + tag = input.readTag(); if (tag != 98) { break; } } case 98: { - // summonUnit - input.readMessage(summonUnit); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { - // actor - input.readMessage(actor); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { - // npc - input.readMessage(npc); + // npcMonster + input.readMessage(npcMonster); bitField0_ |= 0x00000100; tag = input.readTag(); if (tag != 0) { @@ -820,28 +820,28 @@ public final class SceneEntityInfoOuterClass { output.writeUInt32(FieldNames.instId, instId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.groupId, groupId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.prop, prop); + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.entityId, entityId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.motion, motion); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeMessage(FieldNames.npc, npc); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeMessage(FieldNames.npcMonster, npcMonster); + output.writeMessage(FieldNames.summonUnit, summonUnit); } if ((bitField0_ & 0x00000040) != 0) { - output.writeMessage(FieldNames.summonUnit, summonUnit); + output.writeMessage(FieldNames.prop, prop); } if ((bitField0_ & 0x00000080) != 0) { output.writeMessage(FieldNames.actor, actor); } if ((bitField0_ & 0x00000100) != 0) { - output.writeMessage(FieldNames.npc, npc); + output.writeMessage(FieldNames.npcMonster, npcMonster); } output.endObject(); } @@ -865,11 +865,11 @@ public final class SceneEntityInfoOuterClass { } break; } - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - entityId = 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 -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + entityId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -889,34 +889,22 @@ public final class SceneEntityInfoOuterClass { } break; } - case 3449699: { - if (input.isAtField(FieldNames.prop)) { - if (!input.trySkipNullValue()) { - input.readMessage(prop); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case -1068318794: { if (input.isAtField(FieldNames.motion)) { if (!input.trySkipNullValue()) { input.readMessage(motion); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); } break; } - case -1367251527: - case 119679100: { - if (input.isAtField(FieldNames.npcMonster)) { + case 109281: { + if (input.isAtField(FieldNames.npc)) { if (!input.trySkipNullValue()) { - input.readMessage(npcMonster); - bitField0_ |= 0x00000020; + input.readMessage(npc); + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -928,6 +916,17 @@ public final class SceneEntityInfoOuterClass { if (input.isAtField(FieldNames.summonUnit)) { if (!input.trySkipNullValue()) { input.readMessage(summonUnit); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case 3449699: { + if (input.isAtField(FieldNames.prop)) { + if (!input.trySkipNullValue()) { + input.readMessage(prop); bitField0_ |= 0x00000040; } } else { @@ -946,10 +945,11 @@ public final class SceneEntityInfoOuterClass { } break; } - case 109281: { - if (input.isAtField(FieldNames.npc)) { + case -1367251527: + case 119679100: { + if (input.isAtField(FieldNames.npcMonster)) { if (!input.trySkipNullValue()) { - input.readMessage(npc); + input.readMessage(npcMonster); bitField0_ |= 0x00000100; } } else { @@ -1012,21 +1012,21 @@ public final class SceneEntityInfoOuterClass { static class FieldNames { static final FieldName instId = FieldName.forField("instId", "inst_id"); - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); - static final FieldName groupId = FieldName.forField("groupId", "group_id"); - static final FieldName prop = FieldName.forField("prop"); + static final FieldName entityId = FieldName.forField("entityId", "entity_id"); static final FieldName motion = FieldName.forField("motion"); - static final FieldName npcMonster = FieldName.forField("npcMonster", "npc_monster"); + static final FieldName npc = FieldName.forField("npc"); static final FieldName summonUnit = FieldName.forField("summonUnit", "summon_unit"); + static final FieldName prop = FieldName.forField("prop"); + static final FieldName actor = FieldName.forField("actor"); - static final FieldName npc = FieldName.forField("npc"); + static final FieldName npcMonster = FieldName.forField("npcMonster", "npc_monster"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java index 33c446a..38a71ff 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 = 8; + * optional uint32 entry_id = 5; */ private int entryId; /** - * repeated .EntityMotion entity_motion_list = 7; + * repeated .EntityMotion entity_motion_list = 1; */ private final RepeatedMessage entityMotionList = RepeatedMessage.newEmptyInstance(EntityMotionOuterClass.EntityMotion.getFactory()); @@ -40,7 +40,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * optional uint32 entry_id = 8; + * optional uint32 entry_id = 5; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -48,7 +48,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * optional uint32 entry_id = 8; + * optional uint32 entry_id = 5; * @return this */ public SceneEntityMoveCsReq clearEntryId() { @@ -58,7 +58,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * optional uint32 entry_id = 8; + * optional uint32 entry_id = 5; * @return the entryId */ public int getEntryId() { @@ -66,7 +66,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * optional uint32 entry_id = 8; + * optional uint32 entry_id = 5; * @param value the entryId to set * @return this */ @@ -77,7 +77,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 7; + * repeated .EntityMotion entity_motion_list = 1; * @return whether the entityMotionList field is set */ public boolean hasEntityMotionList() { @@ -85,7 +85,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 7; + * repeated .EntityMotion entity_motion_list = 1; * @return this */ public SceneEntityMoveCsReq clearEntityMotionList() { @@ -95,7 +95,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 7; + * repeated .EntityMotion entity_motion_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 SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 7; + * repeated .EntityMotion entity_motion_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 SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 7; + * repeated .EntityMotion entity_motion_list = 1; * @param value the entityMotionList to add * @return this */ @@ -135,7 +135,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 7; + * repeated .EntityMotion entity_motion_list = 1; * @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) 64); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < entityMotionList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 10); output.writeMessageNoTag(entityMotionList.get(i)); } } @@ -242,16 +242,16 @@ public final class SceneEntityMoveCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 40: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 10) { break; } } - case 58: { + case 10: { // 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 dfa4626..9b403ed 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 entry_id = 10; - */ - private int entryId; - - /** - * optional uint32 entity_id = 11; + * optional uint32 entity_id = 1; */ private int entityId; /** - * optional uint32 client_pos_version = 13; + * optional uint32 client_pos_version = 6; */ private int clientPosVersion; /** - * optional .MotionInfo motion = 8; + * optional uint32 entry_id = 8; + */ + private int entryId; + + /** + * optional .MotionInfo motion = 10; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -49,62 +49,25 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entry_id = 10; - * @return whether the entryId field is set + * optional uint32 entity_id = 1; + * @return whether the entityId field is set */ - public boolean hasEntryId() { + public boolean hasEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entry_id = 10; - * @return this - */ - public SceneEntityMoveScNotify clearEntryId() { - bitField0_ &= ~0x00000001; - entryId = 0; - return this; - } - - /** - * optional uint32 entry_id = 10; - * @return the entryId - */ - public int getEntryId() { - return entryId; - } - - /** - * optional uint32 entry_id = 10; - * @param value the entryId to set - * @return this - */ - public SceneEntityMoveScNotify setEntryId(final int value) { - bitField0_ |= 0x00000001; - entryId = 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 = 1; * @return this */ public SceneEntityMoveScNotify clearEntityId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; entityId = 0; return this; } /** - * optional uint32 entity_id = 11; + * optional uint32 entity_id = 1; * @return the entityId */ public int getEntityId() { @@ -112,36 +75,36 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entity_id = 11; + * optional uint32 entity_id = 1; * @param value the entityId to set * @return this */ public SceneEntityMoveScNotify setEntityId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; entityId = value; return this; } /** - * optional uint32 client_pos_version = 13; + * optional uint32 client_pos_version = 6; * @return whether the clientPosVersion field is set */ public boolean hasClientPosVersion() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 client_pos_version = 13; + * optional uint32 client_pos_version = 6; * @return this */ public SceneEntityMoveScNotify clearClientPosVersion() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; clientPosVersion = 0; return this; } /** - * optional uint32 client_pos_version = 13; + * optional uint32 client_pos_version = 6; * @return the clientPosVersion */ public int getClientPosVersion() { @@ -149,18 +112,55 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 client_pos_version = 13; + * optional uint32 client_pos_version = 6; * @param value the clientPosVersion to set * @return this */ public SceneEntityMoveScNotify setClientPosVersion(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; clientPosVersion = value; return this; } /** - * optional .MotionInfo motion = 8; + * optional uint32 entry_id = 8; + * @return whether the entryId field is set + */ + public boolean hasEntryId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 entry_id = 8; + * @return this + */ + public SceneEntityMoveScNotify clearEntryId() { + bitField0_ &= ~0x00000004; + entryId = 0; + return this; + } + + /** + * optional uint32 entry_id = 8; + * @return the entryId + */ + public int getEntryId() { + return entryId; + } + + /** + * optional uint32 entry_id = 8; + * @param value the entryId to set + * @return this + */ + public SceneEntityMoveScNotify setEntryId(final int value) { + bitField0_ |= 0x00000004; + entryId = value; + return this; + } + + /** + * optional .MotionInfo motion = 10; * @return whether the motion field is set */ public boolean hasMotion() { @@ -168,7 +168,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 8; + * optional .MotionInfo motion = 10; * @return this */ public SceneEntityMoveScNotify clearMotion() { @@ -178,7 +178,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 8; + * optional .MotionInfo motion = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -192,7 +192,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 8; + * optional .MotionInfo motion = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -206,7 +206,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 8; + * optional .MotionInfo motion = 10; * @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; entityId = other.entityId; clientPosVersion = other.clientPosVersion; + 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.hasEntityId()) { setEntityId(other.entityId); } if (other.hasClientPosVersion()) { setClientPosVersion(other.clientPosVersion); } + 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; entityId = 0; clientPosVersion = 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) && (!hasEntityId() || entityId == other.entityId) && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) + && (!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(entryId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(entityId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); output.writeUInt32NoTag(clientPosVersion); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(entryId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 82); output.writeMessageNoTag(motion); } } @@ -315,14 +315,14 @@ public final class SceneEntityMoveScNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(motion); } @@ -336,34 +336,34 @@ public final class SceneEntityMoveScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { - // entryId - entryId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 8: { // entityId entityId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 48) { break; } } - case 104: { + case 48: { // clientPosVersion clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 66) { + if (tag != 64) { break; } } - case 66: { + case 64: { + // entryId + entryId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { // motion input.readMessage(motion); bitField0_ |= 0x00000008; @@ -390,14 +390,14 @@ public final class SceneEntityMoveScNotifyOuterClass { 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.entityId, entityId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.entryId, entryId); + } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.motion, motion); } @@ -411,24 +411,12 @@ 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 -2102099874: case -740565257: { if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { entityId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -440,6 +428,18 @@ public final class SceneEntityMoveScNotifyOuterClass { if (input.isAtField(FieldNames.clientPosVersion)) { if (!input.trySkipNullValue()) { clientPosVersion = 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 entityId = FieldName.forField("entityId", "entity_id"); static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + static final FieldName 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 76e3a66..a69f054 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 = 7; + * optional uint32 del_entity = 13; */ private int delEntity; /** - * optional .SceneEntityInfo add_entity = 1; + * optional .SceneEntityInfo add_entity = 8; */ private final SceneEntityInfoOuterClass.SceneEntityInfo addEntity = SceneEntityInfoOuterClass.SceneEntityInfo.newInstance(); @@ -39,7 +39,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 7; + * optional uint32 del_entity = 13; * @return whether the delEntity field is set */ public boolean hasDelEntity() { @@ -47,7 +47,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 7; + * optional uint32 del_entity = 13; * @return this */ public SceneEntityRefreshInfo clearDelEntity() { @@ -57,7 +57,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 7; + * optional uint32 del_entity = 13; * @return the delEntity */ public int getDelEntity() { @@ -65,7 +65,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 7; + * optional uint32 del_entity = 13; * @param value the delEntity to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 1; + * optional .SceneEntityInfo add_entity = 8; * @return whether the addEntity field is set */ public boolean hasAddEntity() { @@ -84,7 +84,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 1; + * optional .SceneEntityInfo add_entity = 8; * @return this */ public SceneEntityRefreshInfo clearAddEntity() { @@ -94,7 +94,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 1; + * optional .SceneEntityInfo add_entity = 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 SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 1; + * optional .SceneEntityInfo add_entity = 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 SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 1; + * optional .SceneEntityInfo add_entity = 8; * @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) 56); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(delEntity); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 66); output.writeMessageNoTag(addEntity); } } @@ -227,16 +227,16 @@ public final class SceneEntityRefreshInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 104: { // delEntity delEntity = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 66) { break; } } - case 10: { + case 66: { // 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 7fa0046..a68e0d2 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class SceneEntityTeleportCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entry_id = 2; + * optional uint32 entry_id = 10; */ private int entryId; /** - * optional .EntityMotion entity_motion = 8; + * optional .EntityMotion entity_motion = 3; */ private final EntityMotionOuterClass.EntityMotion entityMotion = EntityMotionOuterClass.EntityMotion.newInstance(); @@ -39,7 +39,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 2; + * optional uint32 entry_id = 10; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -47,7 +47,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 2; + * optional uint32 entry_id = 10; * @return this */ public SceneEntityTeleportCsReq clearEntryId() { @@ -57,7 +57,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 2; + * optional uint32 entry_id = 10; * @return the entryId */ public int getEntryId() { @@ -65,7 +65,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 2; + * optional uint32 entry_id = 10; * @param value the entryId to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 8; + * optional .EntityMotion entity_motion = 3; * @return whether the entityMotion field is set */ public boolean hasEntityMotion() { @@ -84,7 +84,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 8; + * optional .EntityMotion entity_motion = 3; * @return this */ public SceneEntityTeleportCsReq clearEntityMotion() { @@ -94,7 +94,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 8; + * optional .EntityMotion entity_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. @@ -108,7 +108,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 8; + * optional .EntityMotion entity_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 @@ -122,7 +122,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 8; + * optional .EntityMotion entity_motion = 3; * @param value the entityMotion to set * @return this */ @@ -199,11 +199,11 @@ public final class SceneEntityTeleportCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 26); output.writeMessageNoTag(entityMotion); } } @@ -227,16 +227,16 @@ public final class SceneEntityTeleportCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 80: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 26) { break; } } - case 66: { + case 26: { // entityMotion input.readMessage(entityMotion); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java index af9f989..abc3cb7 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java @@ -19,17 +19,17 @@ public final class SceneEntityTeleportScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 client_pos_version = 6; - */ - private int clientPosVersion; - - /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional .EntityMotion entity_motion = 13; + * optional uint32 client_pos_version = 14; + */ + private int clientPosVersion; + + /** + * optional .EntityMotion entity_motion = 9; */ private final EntityMotionOuterClass.EntityMotion entityMotion = EntityMotionOuterClass.EntityMotion.newInstance(); @@ -44,62 +44,25 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional uint32 client_pos_version = 6; - * @return whether the clientPosVersion field is set + * optional uint32 retcode = 6; + * @return whether the retcode field is set */ - public boolean hasClientPosVersion() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 client_pos_version = 6; - * @return this - */ - public SceneEntityTeleportScRsp clearClientPosVersion() { - bitField0_ &= ~0x00000001; - clientPosVersion = 0; - return this; - } - - /** - * optional uint32 client_pos_version = 6; - * @return the clientPosVersion - */ - public int getClientPosVersion() { - return clientPosVersion; - } - - /** - * optional uint32 client_pos_version = 6; - * @param value the clientPosVersion to set - * @return this - */ - public SceneEntityTeleportScRsp setClientPosVersion(final int value) { - 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; + * optional uint32 retcode = 6; * @return this */ public SceneEntityTeleportScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -107,18 +70,55 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ public SceneEntityTeleportScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional .EntityMotion entity_motion = 13; + * optional uint32 client_pos_version = 14; + * @return whether the clientPosVersion field is set + */ + public boolean hasClientPosVersion() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 client_pos_version = 14; + * @return this + */ + public SceneEntityTeleportScRsp clearClientPosVersion() { + bitField0_ &= ~0x00000002; + clientPosVersion = 0; + return this; + } + + /** + * optional uint32 client_pos_version = 14; + * @return the clientPosVersion + */ + public int getClientPosVersion() { + return clientPosVersion; + } + + /** + * optional uint32 client_pos_version = 14; + * @param value the clientPosVersion to set + * @return this + */ + public SceneEntityTeleportScRsp setClientPosVersion(final int value) { + bitField0_ |= 0x00000002; + clientPosVersion = value; + return this; + } + + /** + * optional .EntityMotion entity_motion = 9; * @return whether the entityMotion field is set */ public boolean hasEntityMotion() { @@ -126,7 +126,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 13; + * optional .EntityMotion entity_motion = 9; * @return this */ public SceneEntityTeleportScRsp clearEntityMotion() { @@ -136,7 +136,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 13; + * optional .EntityMotion entity_motion = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 13; + * optional .EntityMotion entity_motion = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 13; + * optional .EntityMotion entity_motion = 9; * @param value the entityMotion to set * @return this */ @@ -180,8 +180,8 @@ public final class SceneEntityTeleportScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - clientPosVersion = other.clientPosVersion; retcode = other.retcode; + clientPosVersion = other.clientPosVersion; entityMotion.copyFrom(other.entityMotion); } return this; @@ -193,12 +193,12 @@ public final class SceneEntityTeleportScRspOuterClass { return this; } cachedSize = -1; - if (other.hasClientPosVersion()) { - setClientPosVersion(other.clientPosVersion); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasClientPosVersion()) { + setClientPosVersion(other.clientPosVersion); + } if (other.hasEntityMotion()) { getMutableEntityMotion().mergeFrom(other.entityMotion); } @@ -212,8 +212,8 @@ public final class SceneEntityTeleportScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - clientPosVersion = 0; retcode = 0; + clientPosVersion = 0; entityMotion.clear(); return this; } @@ -239,8 +239,8 @@ public final class SceneEntityTeleportScRspOuterClass { } SceneEntityTeleportScRsp other = (SceneEntityTeleportScRsp) o; return bitField0_ == other.bitField0_ - && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) && (!hasRetcode() || retcode == other.retcode) + && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) && (!hasEntityMotion() || entityMotion.equals(other.entityMotion)); } @@ -248,14 +248,14 @@ public final class SceneEntityTeleportScRspOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 48); - output.writeUInt32NoTag(clientPosVersion); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(clientPosVersion); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 74); output.writeMessageNoTag(entityMotion); } } @@ -264,10 +264,10 @@ public final class SceneEntityTeleportScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(entityMotion); @@ -283,24 +283,24 @@ public final class SceneEntityTeleportScRspOuterClass { while (true) { switch (tag) { case 48: { - // clientPosVersion - clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 112) { break; } } - case 106: { + case 112: { + // clientPosVersion + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { // entityMotion input.readMessage(entityMotion); bitField0_ |= 0x00000004; @@ -327,10 +327,10 @@ public final class SceneEntityTeleportScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.entityMotion, entityMotion); @@ -345,11 +345,10 @@ public final class SceneEntityTeleportScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1787644431: - case 1278860153: { - if (input.isAtField(FieldNames.clientPosVersion)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - clientPosVersion = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -357,10 +356,11 @@ public final class SceneEntityTeleportScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -433,10 +433,10 @@ public final class SceneEntityTeleportScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + static final FieldName entityMotion = FieldName.forField("entityMotion", "entity_motion"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java index be92e08..8296139 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java @@ -20,17 +20,22 @@ public final class SceneGroupRefreshInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 state = 3; - */ - private int state; - - /** - * optional uint32 group_id = 12; + * optional uint32 group_id = 9; */ private int groupId; /** - * repeated .SceneEntityRefreshInfo refresh_entity = 14; + * optional uint32 state = 12; + */ + private int state; + + /** + * optional .SceneGroupRefreshType refresh_type = 11; + */ + private int refreshType; + + /** + * repeated .SceneEntityRefreshInfo refresh_entity = 10; */ private final RepeatedMessage refreshEntity = RepeatedMessage.newEmptyInstance(SceneEntityRefreshInfoOuterClass.SceneEntityRefreshInfo.getFactory()); @@ -45,62 +50,25 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 state = 3; - * @return whether the state field is set + * optional uint32 group_id = 9; + * @return whether the groupId field is set */ - public boolean hasState() { + public boolean hasGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 state = 3; - * @return this - */ - public SceneGroupRefreshInfo clearState() { - bitField0_ &= ~0x00000001; - state = 0; - return this; - } - - /** - * optional uint32 state = 3; - * @return the state - */ - public int getState() { - return state; - } - - /** - * optional uint32 state = 3; - * @param value the state to set - * @return this - */ - public SceneGroupRefreshInfo setState(final int value) { - bitField0_ |= 0x00000001; - state = value; - return this; - } - - /** - * optional uint32 group_id = 12; - * @return whether the groupId field is set - */ - public boolean hasGroupId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 group_id = 12; + * optional uint32 group_id = 9; * @return this */ public SceneGroupRefreshInfo clearGroupId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; groupId = 0; return this; } /** - * optional uint32 group_id = 12; + * optional uint32 group_id = 9; * @return the groupId */ public int getGroupId() { @@ -108,36 +76,136 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 group_id = 12; + * optional uint32 group_id = 9; * @param value the groupId to set * @return this */ public SceneGroupRefreshInfo setGroupId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; groupId = value; return this; } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 14; - * @return whether the refreshEntity field is set + * optional uint32 state = 12; + * @return whether the state field is set */ - public boolean hasRefreshEntity() { + public boolean hasState() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 state = 12; + * @return this + */ + public SceneGroupRefreshInfo clearState() { + bitField0_ &= ~0x00000002; + state = 0; + return this; + } + + /** + * optional uint32 state = 12; + * @return the state + */ + public int getState() { + return state; + } + + /** + * optional uint32 state = 12; + * @param value the state to set + * @return this + */ + public SceneGroupRefreshInfo setState(final int value) { + bitField0_ |= 0x00000002; + state = value; + return this; + } + + /** + * optional .SceneGroupRefreshType refresh_type = 11; + * @return whether the refreshType field is set + */ + public boolean hasRefreshType() { return (bitField0_ & 0x00000004) != 0; } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 14; + * optional .SceneGroupRefreshType refresh_type = 11; + * @return this + */ + public SceneGroupRefreshInfo clearRefreshType() { + bitField0_ &= ~0x00000004; + refreshType = 0; + return this; + } + + /** + * optional .SceneGroupRefreshType refresh_type = 11; + * @return the refreshType + */ + public SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType getRefreshType() { + return SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType.forNumber(refreshType); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link SceneGroupRefreshInfo#getRefreshType()}.getNumber(). + * + * @return numeric wire representation + */ + public int getRefreshTypeValue() { + return refreshType; + } + + /** + * 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 SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType}. Setting an invalid value + * can cause {@link SceneGroupRefreshInfo#getRefreshType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public SceneGroupRefreshInfo setRefreshTypeValue(final int value) { + bitField0_ |= 0x00000004; + refreshType = value; + return this; + } + + /** + * optional .SceneGroupRefreshType refresh_type = 11; + * @param value the refreshType to set + * @return this + */ + public SceneGroupRefreshInfo setRefreshType( + final SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType value) { + bitField0_ |= 0x00000004; + refreshType = value.getNumber(); + return this; + } + + /** + * repeated .SceneEntityRefreshInfo refresh_entity = 10; + * @return whether the refreshEntity field is set + */ + public boolean hasRefreshEntity() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * repeated .SceneEntityRefreshInfo refresh_entity = 10; * @return this */ public SceneGroupRefreshInfo clearRefreshEntity() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; refreshEntity.clear(); return this; } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 14; + * repeated .SceneEntityRefreshInfo refresh_entity = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -152,7 +220,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 14; + * repeated .SceneEntityRefreshInfo refresh_entity = 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 @@ -162,30 +230,30 @@ public final class SceneGroupRefreshInfoOuterClass { */ public RepeatedMessage getMutableRefreshEntity( ) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return refreshEntity; } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 14; + * repeated .SceneEntityRefreshInfo refresh_entity = 10; * @param value the refreshEntity to add * @return this */ public SceneGroupRefreshInfo addRefreshEntity( final SceneEntityRefreshInfoOuterClass.SceneEntityRefreshInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; refreshEntity.add(value); return this; } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 14; + * repeated .SceneEntityRefreshInfo refresh_entity = 10; * @param values the refreshEntity to add * @return this */ public SceneGroupRefreshInfo addAllRefreshEntity( final SceneEntityRefreshInfoOuterClass.SceneEntityRefreshInfo... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; refreshEntity.addAll(values); return this; } @@ -195,8 +263,9 @@ public final class SceneGroupRefreshInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - state = other.state; groupId = other.groupId; + state = other.state; + refreshType = other.refreshType; refreshEntity.copyFrom(other.refreshEntity); } return this; @@ -208,11 +277,14 @@ public final class SceneGroupRefreshInfoOuterClass { return this; } cachedSize = -1; + if (other.hasGroupId()) { + setGroupId(other.groupId); + } if (other.hasState()) { setState(other.state); } - if (other.hasGroupId()) { - setGroupId(other.groupId); + if (other.hasRefreshType()) { + setRefreshTypeValue(other.refreshType); } if (other.hasRefreshEntity()) { getMutableRefreshEntity().addAll(other.refreshEntity); @@ -227,8 +299,9 @@ public final class SceneGroupRefreshInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - state = 0; groupId = 0; + state = 0; + refreshType = 0; refreshEntity.clear(); return this; } @@ -254,24 +327,29 @@ public final class SceneGroupRefreshInfoOuterClass { } SceneGroupRefreshInfo other = (SceneGroupRefreshInfo) o; return bitField0_ == other.bitField0_ - && (!hasState() || state == other.state) && (!hasGroupId() || groupId == other.groupId) + && (!hasState() || state == other.state) + && (!hasRefreshType() || refreshType == other.refreshType) && (!hasRefreshEntity() || refreshEntity.equals(other.refreshEntity)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(state); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(groupId); + output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 88); + output.writeEnumNoTag(refreshType); + } + if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < refreshEntity.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 82); output.writeMessageNoTag(refreshEntity.get(i)); } } @@ -281,12 +359,15 @@ public final class SceneGroupRefreshInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(state); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(state); + } if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeEnumSizeNoTag(refreshType); + } + if ((bitField0_ & 0x00000008) != 0) { size += (1 * refreshEntity.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(refreshEntity); } return size; @@ -299,9 +380,9 @@ public final class SceneGroupRefreshInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // state - state = input.readUInt32(); + case 72: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 96) { @@ -309,18 +390,30 @@ public final class SceneGroupRefreshInfoOuterClass { } } case 96: { - // groupId - groupId = input.readUInt32(); + // state + state = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 114) { + if (tag != 88) { break; } } - case 114: { + case 88: { + // refreshType + final int value = input.readInt32(); + if (SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType.forNumber(value) != null) { + refreshType = value; + bitField0_ |= 0x00000004; + } + tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { // refreshEntity tag = input.readRepeatedMessage(refreshEntity, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; if (tag != 0) { break; } @@ -343,12 +436,15 @@ public final class SceneGroupRefreshInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.state, state); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.groupId, groupId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.state, state); + } if ((bitField0_ & 0x00000004) != 0) { + output.writeEnum(FieldNames.refreshType, refreshType, SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType.converter()); + } + if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.refreshEntity, refreshEntity); } output.endObject(); @@ -361,10 +457,11 @@ public final class SceneGroupRefreshInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 109757585: { - if (input.isAtField(FieldNames.state)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - state = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -372,11 +469,10 @@ public final class SceneGroupRefreshInfoOuterClass { } break; } - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case 109757585: { + if (input.isAtField(FieldNames.state)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + state = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -384,12 +480,29 @@ public final class SceneGroupRefreshInfoOuterClass { } break; } + case -1387286347: + case -46184930: { + if (input.isAtField(FieldNames.refreshType)) { + if (!input.trySkipNullValue()) { + final SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType value = input.readEnum(SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType.converter()); + if (value != null) { + refreshType = value.getNumber(); + bitField0_ |= 0x00000004; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } case 2113180318: case -1873514041: { if (input.isAtField(FieldNames.refreshEntity)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(refreshEntity); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -449,9 +562,11 @@ public final class SceneGroupRefreshInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName state = FieldName.forField("state"); - static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName refreshType = FieldName.forField("refreshType", "refresh_type"); static final FieldName refreshEntity = FieldName.forField("refreshEntity", "refresh_entity"); } diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java index 647c93a..a83656c 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 = 5; + * repeated .SceneGroupRefreshInfo group_refresh_info = 11; */ private final RepeatedMessage groupRefreshInfo = RepeatedMessage.newEmptyInstance(SceneGroupRefreshInfoOuterClass.SceneGroupRefreshInfo.getFactory()); @@ -35,7 +35,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 5; + * repeated .SceneGroupRefreshInfo group_refresh_info = 11; * @return whether the groupRefreshInfo field is set */ public boolean hasGroupRefreshInfo() { @@ -43,7 +43,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 5; + * repeated .SceneGroupRefreshInfo group_refresh_info = 11; * @return this */ public SceneGroupRefreshScNotify clearGroupRefreshInfo() { @@ -53,7 +53,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 5; + * repeated .SceneGroupRefreshInfo group_refresh_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. @@ -68,7 +68,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 5; + * repeated .SceneGroupRefreshInfo group_refresh_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 @@ -83,7 +83,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 5; + * repeated .SceneGroupRefreshInfo group_refresh_info = 11; * @param value the groupRefreshInfo to add * @return this */ @@ -95,7 +95,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 5; + * repeated .SceneGroupRefreshInfo group_refresh_info = 11; * @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) 42); + output.writeRawByte((byte) 90); output.writeMessageNoTag(groupRefreshInfo.get(i)); } } @@ -189,7 +189,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 42: { + case 90: { // 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 new file mode 100644 index 0000000..d0500bf --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshTypeOuterClass.java @@ -0,0 +1,130 @@ +// 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 SceneGroupRefreshTypeOuterClass { + /** + * Protobuf enum {@code SceneGroupRefreshType} + */ + public enum SceneGroupRefreshType implements ProtoEnum { + /** + * SCENE_GROUP_REFRESH_TYPE_NONE = 0; + */ + SCENE_GROUP_REFRESH_TYPE_NONE("SCENE_GROUP_REFRESH_TYPE_NONE", 0), + + /** + * SCENE_GROUP_REFRESH_TYPE_LOADED = 1; + */ + SCENE_GROUP_REFRESH_TYPE_LOADED("SCENE_GROUP_REFRESH_TYPE_LOADED", 1), + + /** + * SCENE_GROUP_REFRESH_TYPE_UNLOAD = 2; + */ + SCENE_GROUP_REFRESH_TYPE_UNLOAD("SCENE_GROUP_REFRESH_TYPE_UNLOAD", 2); + + /** + * SCENE_GROUP_REFRESH_TYPE_NONE = 0; + */ + public static final int SCENE_GROUP_REFRESH_TYPE_NONE_VALUE = 0; + + /** + * SCENE_GROUP_REFRESH_TYPE_LOADED = 1; + */ + public static final int SCENE_GROUP_REFRESH_TYPE_LOADED_VALUE = 1; + + /** + * SCENE_GROUP_REFRESH_TYPE_UNLOAD = 2; + */ + public static final int SCENE_GROUP_REFRESH_TYPE_UNLOAD_VALUE = 2; + + private final String name; + + private final int number; + + private SceneGroupRefreshType(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 SceneGroupRefreshTypeConverter.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 SceneGroupRefreshType forNumber(int value) { + return SceneGroupRefreshTypeConverter.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 SceneGroupRefreshType forNumberOr(int number, SceneGroupRefreshType other) { + SceneGroupRefreshType value = forNumber(number); + return value == null ? other : value; + } + + enum SceneGroupRefreshTypeConverter implements ProtoEnum.EnumConverter { + INSTANCE; + + private static final SceneGroupRefreshType[] lookup = new SceneGroupRefreshType[3]; + + static { + lookup[0] = SCENE_GROUP_REFRESH_TYPE_NONE; + lookup[1] = SCENE_GROUP_REFRESH_TYPE_LOADED; + lookup[2] = SCENE_GROUP_REFRESH_TYPE_UNLOAD; + } + + @Override + public final SceneGroupRefreshType forNumber(final int value) { + if (value >= 0 && value < lookup.length) { + return lookup[value]; + } + return null; + } + + @Override + public final SceneGroupRefreshType forName(final CharSequence value) { + if (value.length() == 29) { + if (ProtoUtil.isEqual("SCENE_GROUP_REFRESH_TYPE_NONE", value)) { + return SCENE_GROUP_REFRESH_TYPE_NONE; + } + } + if (value.length() == 31) { + if (ProtoUtil.isEqual("SCENE_GROUP_REFRESH_TYPE_LOADED", value)) { + return SCENE_GROUP_REFRESH_TYPE_LOADED; + } + if (ProtoUtil.isEqual("SCENE_GROUP_REFRESH_TYPE_UNLOAD", value)) { + return SCENE_GROUP_REFRESH_TYPE_UNLOAD; + } + } + return null; + } + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java index 975c0d3..a09ef82 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 = 11; + * optional uint32 state = 4; */ private int state; /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 10; */ private int groupId; /** - * optional bool is_default = 7; + * optional bool is_default = 5; */ private boolean isDefault; @@ -44,7 +44,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 state = 11; + * optional uint32 state = 4; * @return whether the state field is set */ public boolean hasState() { @@ -52,7 +52,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 state = 11; + * optional uint32 state = 4; * @return this */ public SceneGroupState clearState() { @@ -62,7 +62,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 state = 11; + * optional uint32 state = 4; * @return the state */ public int getState() { @@ -70,7 +70,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 state = 11; + * optional uint32 state = 4; * @param value the state to set * @return this */ @@ -81,7 +81,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 group_id = 15; + * 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 = 15; + * optional uint32 group_id = 10; * @return this */ public SceneGroupState clearGroupId() { @@ -99,7 +99,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 10; * @return the groupId */ public int getGroupId() { @@ -107,7 +107,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 group_id = 15; + * 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 = 7; + * 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 = 7; + * optional bool is_default = 5; * @return this */ public SceneGroupState clearIsDefault() { @@ -136,7 +136,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional bool is_default = 7; + * optional bool is_default = 5; * @return the isDefault */ public boolean getIsDefault() { @@ -144,7 +144,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional bool is_default = 7; + * 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) 88); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 40); output.writeBoolNoTag(isDefault); } } @@ -260,25 +260,25 @@ public final class SceneGroupStateOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 32: { // state state = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 80) { break; } } - case 120: { + case 80: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 56) { + if (tag != 40) { break; } } - case 56: { + 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 abbf705..7c99a4a 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java @@ -12,6 +12,7 @@ import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; import us.hebi.quickbuf.RepeatedInt; import us.hebi.quickbuf.RepeatedMessage; +import us.hebi.quickbuf.Utf8String; public final class SceneInfoOuterClass { /** @@ -21,19 +22,14 @@ public final class SceneInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 leader_entity_id = 2; + * optional uint32 game_mode_type = 2; */ - private int leaderEntityId; + private int gameModeType; /** - * optional uint32 floor_id = 3; + * optional uint32 entry_id = 5; */ - private int floorId; - - /** - * optional uint32 world_id = 5; - */ - private int worldId; + private int entryId; /** * optional uint32 client_pos_version = 7; @@ -41,42 +37,60 @@ public final class SceneInfoOuterClass { private int clientPosVersion; /** - * optional uint32 entry_id = 11; - */ - private int entryId; - - /** - * optional uint32 plane_id = 13; + * optional uint32 plane_id = 8; */ private int planeId; /** - * optional uint32 game_mode_type = 15; + * optional uint32 floor_id = 10; */ - private int gameModeType; + private int floorId; /** - * repeated uint32 group_id_list = 4; + * 
+     *  ?
+     *
+ * + * optional uint32 world_id = 11; */ - private final RepeatedInt groupIdList = RepeatedInt.newEmptyInstance(); + private int worldId; /** - * repeated uint32 lighten_section_list = 9; + * 
+     *  ?
+     *
+ * + * optional uint32 leader_entity_id = 14; + */ + private int leaderEntityId; + + /** + * repeated uint32 lighten_section_list = 3; */ private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); /** - * repeated .SceneEntityInfo entity_list = 1; + * repeated uint32 group_id_list = 13; + */ + private final RepeatedInt groupIdList = RepeatedInt.newEmptyInstance(); + + /** + * repeated .SceneEntityInfo entity_list = 6; */ private final RepeatedMessage entityList = RepeatedMessage.newEmptyInstance(SceneEntityInfoOuterClass.SceneEntityInfo.getFactory()); /** - * repeated .SceneGroupState group_state_list = 347; + * repeated .SceneInfo.ExtraDataEntry extra_data = 81; + */ + private final RepeatedMessage extraData = RepeatedMessage.newEmptyInstance(ExtraDataEntry.getFactory()); + + /** + * repeated .SceneGroupState group_state_list = 1244; */ private final RepeatedMessage groupStateList = RepeatedMessage.newEmptyInstance(SceneGroupStateOuterClass.SceneGroupState.getFactory()); /** - * repeated .SceneEntityGroupInfo entity_group_list = 1538; + * repeated .SceneEntityGroupInfo entity_group_list = 1649; */ private final RepeatedMessage entityGroupList = RepeatedMessage.newEmptyInstance(SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo.getFactory()); @@ -91,113 +105,76 @@ public final class SceneInfoOuterClass { } /** - * optional uint32 leader_entity_id = 2; - * @return whether the leaderEntityId field is set + * optional uint32 game_mode_type = 2; + * @return whether the gameModeType field is set */ - public boolean hasLeaderEntityId() { + public boolean hasGameModeType() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 leader_entity_id = 2; + * optional uint32 game_mode_type = 2; * @return this */ - public SceneInfo clearLeaderEntityId() { + public SceneInfo clearGameModeType() { bitField0_ &= ~0x00000001; - leaderEntityId = 0; + gameModeType = 0; return this; } /** - * optional uint32 leader_entity_id = 2; - * @return the leaderEntityId + * optional uint32 game_mode_type = 2; + * @return the gameModeType */ - public int getLeaderEntityId() { - return leaderEntityId; + public int getGameModeType() { + return gameModeType; } /** - * optional uint32 leader_entity_id = 2; - * @param value the leaderEntityId to set + * optional uint32 game_mode_type = 2; + * @param value the gameModeType to set * @return this */ - public SceneInfo setLeaderEntityId(final int value) { + public SceneInfo setGameModeType(final int value) { bitField0_ |= 0x00000001; - leaderEntityId = value; + gameModeType = value; return this; } /** - * optional uint32 floor_id = 3; - * @return whether the floorId field is set + * optional uint32 entry_id = 5; + * @return whether the entryId field is set */ - public boolean hasFloorId() { + public boolean hasEntryId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 floor_id = 3; + * optional uint32 entry_id = 5; * @return this */ - public SceneInfo clearFloorId() { + public SceneInfo clearEntryId() { bitField0_ &= ~0x00000002; - floorId = 0; + entryId = 0; return this; } /** - * optional uint32 floor_id = 3; - * @return the floorId + * optional uint32 entry_id = 5; + * @return the entryId */ - public int getFloorId() { - return floorId; + public int getEntryId() { + return entryId; } /** - * optional uint32 floor_id = 3; - * @param value the floorId to set + * optional uint32 entry_id = 5; + * @param value the entryId to set * @return this */ - public SceneInfo setFloorId(final int value) { + public SceneInfo setEntryId(final int value) { bitField0_ |= 0x00000002; - floorId = value; - return this; - } - - /** - * optional uint32 world_id = 5; - * @return whether the worldId field is set - */ - public boolean hasWorldId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 world_id = 5; - * @return this - */ - public SceneInfo clearWorldId() { - bitField0_ &= ~0x00000004; - worldId = 0; - return this; - } - - /** - * optional uint32 world_id = 5; - * @return the worldId - */ - public int getWorldId() { - return worldId; - } - - /** - * optional uint32 world_id = 5; - * @param value the worldId to set - * @return this - */ - public SceneInfo setWorldId(final int value) { - bitField0_ |= 0x00000004; - worldId = value; + entryId = value; return this; } @@ -206,7 +183,7 @@ public final class SceneInfoOuterClass { * @return whether the clientPosVersion field is set */ public boolean hasClientPosVersion() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -214,7 +191,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo clearClientPosVersion() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; clientPosVersion = 0; return this; } @@ -233,68 +210,31 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo setClientPosVersion(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; clientPosVersion = value; return this; } /** - * optional uint32 entry_id = 11; - * @return whether the entryId field is set - */ - public boolean hasEntryId() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 entry_id = 11; - * @return this - */ - public SceneInfo clearEntryId() { - bitField0_ &= ~0x00000010; - entryId = 0; - return this; - } - - /** - * optional uint32 entry_id = 11; - * @return the entryId - */ - public int getEntryId() { - return entryId; - } - - /** - * optional uint32 entry_id = 11; - * @param value the entryId to set - * @return this - */ - public SceneInfo setEntryId(final int value) { - bitField0_ |= 0x00000010; - entryId = value; - return this; - } - - /** - * optional uint32 plane_id = 13; + * optional uint32 plane_id = 8; * @return whether the planeId field is set */ public boolean hasPlaneId() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 plane_id = 13; + * optional uint32 plane_id = 8; * @return this */ public SceneInfo clearPlaneId() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000008; planeId = 0; return this; } /** - * optional uint32 plane_id = 13; + * optional uint32 plane_id = 8; * @return the planeId */ public int getPlaneId() { @@ -302,141 +242,179 @@ public final class SceneInfoOuterClass { } /** - * optional uint32 plane_id = 13; + * optional uint32 plane_id = 8; * @param value the planeId to set * @return this */ public SceneInfo setPlaneId(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; planeId = value; return this; } /** - * optional uint32 game_mode_type = 15; - * @return whether the gameModeType field is set + * optional uint32 floor_id = 10; + * @return whether the floorId field is set */ - public boolean hasGameModeType() { + public boolean hasFloorId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 floor_id = 10; + * @return this + */ + public SceneInfo clearFloorId() { + bitField0_ &= ~0x00000010; + floorId = 0; + return this; + } + + /** + * optional uint32 floor_id = 10; + * @return the floorId + */ + public int getFloorId() { + return floorId; + } + + /** + * optional uint32 floor_id = 10; + * @param value the floorId to set + * @return this + */ + public SceneInfo setFloorId(final int value) { + bitField0_ |= 0x00000010; + floorId = value; + return this; + } + + /** + * 
+     *  ?
+     *
+ * + * optional uint32 world_id = 11; + * @return whether the worldId field is set + */ + public boolean hasWorldId() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * 
+     *  ?
+     *
+ * + * optional uint32 world_id = 11; + * @return this + */ + public SceneInfo clearWorldId() { + bitField0_ &= ~0x00000020; + worldId = 0; + return this; + } + + /** + * 
+     *  ?
+     *
+ * + * optional uint32 world_id = 11; + * @return the worldId + */ + public int getWorldId() { + return worldId; + } + + /** + * 
+     *  ?
+     *
+ * + * optional uint32 world_id = 11; + * @param value the worldId to set + * @return this + */ + public SceneInfo setWorldId(final int value) { + bitField0_ |= 0x00000020; + worldId = value; + return this; + } + + /** + * 
+     *  ?
+     *
+ * + * optional uint32 leader_entity_id = 14; + * @return whether the leaderEntityId field is set + */ + public boolean hasLeaderEntityId() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 game_mode_type = 15; + * 
+     *  ?
+     *
+ * + * optional uint32 leader_entity_id = 14; * @return this */ - public SceneInfo clearGameModeType() { + public SceneInfo clearLeaderEntityId() { bitField0_ &= ~0x00000040; - gameModeType = 0; + leaderEntityId = 0; return this; } /** - * optional uint32 game_mode_type = 15; - * @return the gameModeType + * 
+     *  ?
+     *
+ * + * optional uint32 leader_entity_id = 14; + * @return the leaderEntityId */ - public int getGameModeType() { - return gameModeType; + public int getLeaderEntityId() { + return leaderEntityId; } /** - * optional uint32 game_mode_type = 15; - * @param value the gameModeType to set + * 
+     *  ?
+     *
+ * + * optional uint32 leader_entity_id = 14; + * @param value the leaderEntityId to set * @return this */ - public SceneInfo setGameModeType(final int value) { + public SceneInfo setLeaderEntityId(final int value) { bitField0_ |= 0x00000040; - gameModeType = value; + leaderEntityId = value; return this; } /** - * repeated uint32 group_id_list = 4; - * @return whether the groupIdList field is set + * repeated uint32 lighten_section_list = 3; + * @return whether the lightenSectionList field is set */ - public boolean hasGroupIdList() { + public boolean hasLightenSectionList() { return (bitField0_ & 0x00000080) != 0; } /** - * repeated uint32 group_id_list = 4; - * @return this - */ - public SceneInfo clearGroupIdList() { - bitField0_ &= ~0x00000080; - groupIdList.clear(); - return this; - } - - /** - * repeated uint32 group_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. - * - * Use {@link #getMutableGroupIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getGroupIdList() { - return groupIdList; - } - - /** - * repeated uint32 group_id_list = 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 getMutableGroupIdList() { - bitField0_ |= 0x00000080; - return groupIdList; - } - - /** - * repeated uint32 group_id_list = 4; - * @param value the groupIdList to add - * @return this - */ - public SceneInfo addGroupIdList(final int value) { - bitField0_ |= 0x00000080; - groupIdList.add(value); - return this; - } - - /** - * repeated uint32 group_id_list = 4; - * @param values the groupIdList to add - * @return this - */ - public SceneInfo addAllGroupIdList(final int... values) { - bitField0_ |= 0x00000080; - groupIdList.addAll(values); - return this; - } - - /** - * repeated uint32 lighten_section_list = 9; - * @return whether the lightenSectionList field is set - */ - public boolean hasLightenSectionList() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * repeated uint32 lighten_section_list = 9; + * repeated uint32 lighten_section_list = 3; * @return this */ public SceneInfo clearLightenSectionList() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000080; lightenSectionList.clear(); return this; } /** - * repeated uint32 lighten_section_list = 9; + * repeated uint32 lighten_section_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. @@ -450,7 +428,7 @@ public final class SceneInfoOuterClass { } /** - * repeated uint32 lighten_section_list = 9; + * repeated uint32 lighten_section_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 @@ -459,34 +437,102 @@ public final class SceneInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableLightenSectionList() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; return lightenSectionList; } /** - * repeated uint32 lighten_section_list = 9; + * repeated uint32 lighten_section_list = 3; * @param value the lightenSectionList to add * @return this */ public SceneInfo addLightenSectionList(final int value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; lightenSectionList.add(value); return this; } /** - * repeated uint32 lighten_section_list = 9; + * repeated uint32 lighten_section_list = 3; * @param values the lightenSectionList to add * @return this */ public SceneInfo addAllLightenSectionList(final int... values) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; lightenSectionList.addAll(values); return this; } /** - * repeated .SceneEntityInfo entity_list = 1; + * repeated uint32 group_id_list = 13; + * @return whether the groupIdList field is set + */ + public boolean hasGroupIdList() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * repeated uint32 group_id_list = 13; + * @return this + */ + public SceneInfo clearGroupIdList() { + bitField0_ &= ~0x00000100; + groupIdList.clear(); + return this; + } + + /** + * repeated uint32 group_id_list = 13; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableGroupIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getGroupIdList() { + return groupIdList; + } + + /** + * repeated uint32 group_id_list = 13; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableGroupIdList() { + bitField0_ |= 0x00000100; + return groupIdList; + } + + /** + * repeated uint32 group_id_list = 13; + * @param value the groupIdList to add + * @return this + */ + public SceneInfo addGroupIdList(final int value) { + bitField0_ |= 0x00000100; + groupIdList.add(value); + return this; + } + + /** + * repeated uint32 group_id_list = 13; + * @param values the groupIdList to add + * @return this + */ + public SceneInfo addAllGroupIdList(final int... values) { + bitField0_ |= 0x00000100; + groupIdList.addAll(values); + return this; + } + + /** + * repeated .SceneEntityInfo entity_list = 6; * @return whether the entityList field is set */ public boolean hasEntityList() { @@ -494,7 +540,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 1; + * repeated .SceneEntityInfo entity_list = 6; * @return this */ public SceneInfo clearEntityList() { @@ -504,7 +550,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 1; + * 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. @@ -518,7 +564,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 1; + * 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 @@ -532,7 +578,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 1; + * repeated .SceneEntityInfo entity_list = 6; * @param value the entityList to add * @return this */ @@ -543,7 +589,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 1; + * repeated .SceneEntityInfo entity_list = 6; * @param values the entityList to add * @return this */ @@ -554,25 +600,93 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneGroupState group_state_list = 347; - * @return whether the groupStateList field is set + * repeated .SceneInfo.ExtraDataEntry extra_data = 81; + * @return whether the extraData field is set */ - public boolean hasGroupStateList() { + public boolean hasExtraData() { return (bitField0_ & 0x00000400) != 0; } /** - * repeated .SceneGroupState group_state_list = 347; + * repeated .SceneInfo.ExtraDataEntry extra_data = 81; + * @return this + */ + public SceneInfo clearExtraData() { + bitField0_ &= ~0x00000400; + extraData.clear(); + return this; + } + + /** + * repeated .SceneInfo.ExtraDataEntry extra_data = 81; + * + * This method returns 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 = 81; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableExtraData() { + bitField0_ |= 0x00000400; + return extraData; + } + + /** + * repeated .SceneInfo.ExtraDataEntry extra_data = 81; + * @param value the extraData to add + * @return this + */ + public SceneInfo addExtraData(final ExtraDataEntry value) { + bitField0_ |= 0x00000400; + extraData.add(value); + return this; + } + + /** + * repeated .SceneInfo.ExtraDataEntry extra_data = 81; + * @param values the extraData to add + * @return this + */ + public SceneInfo addAllExtraData(final ExtraDataEntry... values) { + bitField0_ |= 0x00000400; + extraData.addAll(values); + return this; + } + + /** + * repeated .SceneGroupState group_state_list = 1244; + * @return whether the groupStateList field is set + */ + public boolean hasGroupStateList() { + return (bitField0_ & 0x00000800) != 0; + } + + /** + * repeated .SceneGroupState group_state_list = 1244; * @return this */ public SceneInfo clearGroupStateList() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00000800; groupStateList.clear(); return this; } /** - * repeated .SceneGroupState group_state_list = 347; + * repeated .SceneGroupState group_state_list = 1244; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -586,7 +700,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneGroupState group_state_list = 347; + * repeated .SceneGroupState group_state_list = 1244; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -595,53 +709,53 @@ public final class SceneInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableGroupStateList() { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; return groupStateList; } /** - * repeated .SceneGroupState group_state_list = 347; + * repeated .SceneGroupState group_state_list = 1244; * @param value the groupStateList to add * @return this */ public SceneInfo addGroupStateList(final SceneGroupStateOuterClass.SceneGroupState value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; groupStateList.add(value); return this; } /** - * repeated .SceneGroupState group_state_list = 347; + * repeated .SceneGroupState group_state_list = 1244; * @param values the groupStateList to add * @return this */ public SceneInfo addAllGroupStateList( final SceneGroupStateOuterClass.SceneGroupState... values) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; groupStateList.addAll(values); return this; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1538; + * repeated .SceneEntityGroupInfo entity_group_list = 1649; * @return whether the entityGroupList field is set */ public boolean hasEntityGroupList() { - return (bitField0_ & 0x00000800) != 0; + return (bitField0_ & 0x00001000) != 0; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1538; + * repeated .SceneEntityGroupInfo entity_group_list = 1649; * @return this */ public SceneInfo clearEntityGroupList() { - bitField0_ &= ~0x00000800; + bitField0_ &= ~0x00001000; entityGroupList.clear(); return this; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1538; + * repeated .SceneEntityGroupInfo entity_group_list = 1649; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -656,7 +770,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1538; + * repeated .SceneEntityGroupInfo entity_group_list = 1649; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -666,30 +780,30 @@ public final class SceneInfoOuterClass { */ public RepeatedMessage getMutableEntityGroupList( ) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; return entityGroupList; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1538; + * repeated .SceneEntityGroupInfo entity_group_list = 1649; * @param value the entityGroupList to add * @return this */ public SceneInfo addEntityGroupList( final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; entityGroupList.add(value); return this; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1538; + * repeated .SceneEntityGroupInfo entity_group_list = 1649; * @param values the entityGroupList to add * @return this */ public SceneInfo addAllEntityGroupList( final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo... values) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; entityGroupList.addAll(values); return this; } @@ -699,16 +813,17 @@ public final class SceneInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - leaderEntityId = other.leaderEntityId; + gameModeType = other.gameModeType; + entryId = other.entryId; + clientPosVersion = other.clientPosVersion; + planeId = other.planeId; floorId = other.floorId; worldId = other.worldId; - clientPosVersion = other.clientPosVersion; - entryId = other.entryId; - planeId = other.planeId; - gameModeType = other.gameModeType; - groupIdList.copyFrom(other.groupIdList); + leaderEntityId = other.leaderEntityId; lightenSectionList.copyFrom(other.lightenSectionList); + groupIdList.copyFrom(other.groupIdList); entityList.copyFrom(other.entityList); + extraData.copyFrom(other.extraData); groupStateList.copyFrom(other.groupStateList); entityGroupList.copyFrom(other.entityGroupList); } @@ -721,8 +836,17 @@ public final class SceneInfoOuterClass { return this; } cachedSize = -1; - if (other.hasLeaderEntityId()) { - setLeaderEntityId(other.leaderEntityId); + if (other.hasGameModeType()) { + setGameModeType(other.gameModeType); + } + if (other.hasEntryId()) { + setEntryId(other.entryId); + } + if (other.hasClientPosVersion()) { + setClientPosVersion(other.clientPosVersion); + } + if (other.hasPlaneId()) { + setPlaneId(other.planeId); } if (other.hasFloorId()) { setFloorId(other.floorId); @@ -730,27 +854,21 @@ public final class SceneInfoOuterClass { if (other.hasWorldId()) { setWorldId(other.worldId); } - if (other.hasClientPosVersion()) { - setClientPosVersion(other.clientPosVersion); - } - if (other.hasEntryId()) { - setEntryId(other.entryId); - } - if (other.hasPlaneId()) { - setPlaneId(other.planeId); - } - if (other.hasGameModeType()) { - setGameModeType(other.gameModeType); - } - if (other.hasGroupIdList()) { - getMutableGroupIdList().addAll(other.groupIdList); + if (other.hasLeaderEntityId()) { + setLeaderEntityId(other.leaderEntityId); } if (other.hasLightenSectionList()) { getMutableLightenSectionList().addAll(other.lightenSectionList); } + if (other.hasGroupIdList()) { + getMutableGroupIdList().addAll(other.groupIdList); + } if (other.hasEntityList()) { getMutableEntityList().addAll(other.entityList); } + if (other.hasExtraData()) { + getMutableExtraData().addAll(other.extraData); + } if (other.hasGroupStateList()) { getMutableGroupStateList().addAll(other.groupStateList); } @@ -767,16 +885,17 @@ public final class SceneInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - leaderEntityId = 0; + gameModeType = 0; + entryId = 0; + clientPosVersion = 0; + planeId = 0; floorId = 0; worldId = 0; - clientPosVersion = 0; - entryId = 0; - planeId = 0; - gameModeType = 0; - groupIdList.clear(); + leaderEntityId = 0; lightenSectionList.clear(); + groupIdList.clear(); entityList.clear(); + extraData.clear(); groupStateList.clear(); entityGroupList.clear(); return this; @@ -789,9 +908,10 @@ public final class SceneInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - groupIdList.clear(); lightenSectionList.clear(); + groupIdList.clear(); entityList.clearQuick(); + extraData.clearQuick(); groupStateList.clearQuick(); entityGroupList.clearQuick(); return this; @@ -807,16 +927,17 @@ public final class SceneInfoOuterClass { } SceneInfo other = (SceneInfo) o; return bitField0_ == other.bitField0_ - && (!hasLeaderEntityId() || leaderEntityId == other.leaderEntityId) + && (!hasGameModeType() || gameModeType == other.gameModeType) + && (!hasEntryId() || entryId == other.entryId) + && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) + && (!hasPlaneId() || planeId == other.planeId) && (!hasFloorId() || floorId == other.floorId) && (!hasWorldId() || worldId == other.worldId) - && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) - && (!hasEntryId() || entryId == other.entryId) - && (!hasPlaneId() || planeId == other.planeId) - && (!hasGameModeType() || gameModeType == other.gameModeType) - && (!hasGroupIdList() || groupIdList.equals(other.groupIdList)) + && (!hasLeaderEntityId() || leaderEntityId == other.leaderEntityId) && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) + && (!hasGroupIdList() || groupIdList.equals(other.groupIdList)) && (!hasEntityList() || entityList.equals(other.entityList)) + && (!hasExtraData() || extraData.equals(other.extraData)) && (!hasGroupStateList() || groupStateList.equals(other.groupStateList)) && (!hasEntityGroupList() || entityGroupList.equals(other.entityGroupList)); } @@ -825,59 +946,65 @@ public final class SceneInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(leaderEntityId); + output.writeUInt32NoTag(gameModeType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(floorId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(worldId); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 56); output.writeUInt32NoTag(clientPosVersion); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(entryId); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 64); output.writeUInt32NoTag(planeId); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(floorId); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(worldId); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(gameModeType); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(leaderEntityId); } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < groupIdList.length(); i++) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(groupIdList.array()[i]); + for (int i = 0; i < lightenSectionList.length(); i++) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(lightenSectionList.array()[i]); } } if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < lightenSectionList.length(); i++) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(lightenSectionList.array()[i]); + for (int i = 0; i < groupIdList.length(); i++) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(groupIdList.array()[i]); } } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < entityList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 50); output.writeMessageNoTag(entityList.get(i)); } } if ((bitField0_ & 0x00000400) != 0) { - for (int i = 0; i < groupStateList.length(); i++) { - output.writeRawLittleEndian16((short) 5594); - output.writeMessageNoTag(groupStateList.get(i)); + for (int i = 0; i < extraData.length(); i++) { + output.writeRawLittleEndian16((short) 1418); + output.writeMessageNoTag(extraData.get(i)); } } if ((bitField0_ & 0x00000800) != 0) { + for (int i = 0; i < groupStateList.length(); i++) { + output.writeRawLittleEndian16((short) 19938); + output.writeMessageNoTag(groupStateList.get(i)); + } + } + if ((bitField0_ & 0x00001000) != 0) { for (int i = 0; i < entityGroupList.length(); i++) { - output.writeRawLittleEndian16((short) 24722); + output.writeRawLittleEndian16((short) 26506); output.writeMessageNoTag(entityGroupList.get(i)); } } @@ -887,39 +1014,42 @@ public final class SceneInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderEntityId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldId); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); - } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); - } - if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); - } - if ((bitField0_ & 0x00000040) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gameModeType); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); + } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldId); + } + if ((bitField0_ & 0x00000040) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderEntityId); + } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * groupIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(groupIdList); + size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); } if ((bitField0_ & 0x00000100) != 0) { - size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); + size += (1 * groupIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(groupIdList); } if ((bitField0_ & 0x00000200) != 0) { size += (1 * entityList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityList); } if ((bitField0_ & 0x00000400) != 0) { - size += (2 * groupStateList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(groupStateList); + size += (2 * extraData.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(extraData); } if ((bitField0_ & 0x00000800) != 0) { + size += (2 * groupStateList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(groupStateList); + } + if ((bitField0_ & 0x00001000) != 0) { size += (2 * entityGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityGroupList); } return size; @@ -933,27 +1063,18 @@ public final class SceneInfoOuterClass { while (true) { switch (tag) { case 16: { - // leaderEntityId - leaderEntityId = input.readUInt32(); + // gameModeType + gameModeType = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // floorId - floorId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 40) { break; } } case 40: { - // worldId - worldId = input.readUInt32(); - bitField0_ |= 0x00000004; + // entryId + entryId = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 56) { break; @@ -962,77 +1083,94 @@ public final class SceneInfoOuterClass { case 56: { // clientPosVersion clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // floorId + floorId = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); if (tag != 88) { break; } } case 88: { - // entryId - entryId = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // planeId - planeId = input.readUInt32(); + // worldId + worldId = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { - // gameModeType - gameModeType = input.readUInt32(); + case 112: { + // leaderEntityId + leaderEntityId = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 34) { + if (tag != 26) { break; } } - case 34: { - // groupIdList [packed=true] - input.readPackedUInt32(groupIdList, tag); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 74) { - break; - } - } - case 74: { + case 26: { // lightenSectionList [packed=true] input.readPackedUInt32(lightenSectionList, tag); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 10) { + if (tag != 106) { break; } } - case 10: { + case 106: { + // groupIdList [packed=true] + input.readPackedUInt32(groupIdList, tag); + bitField0_ |= 0x00000100; + tag = input.readTag(); + if (tag != 50) { + break; + } + } + case 50: { // entityList tag = input.readRepeatedMessage(entityList, tag); bitField0_ |= 0x00000200; - if (tag != 2778) { + if (tag != 650) { break; } } - case 2778: { + case 650: { + // extraData + tag = input.readRepeatedMessage(extraData, tag); + bitField0_ |= 0x00000400; + if (tag != 9954) { + break; + } + } + case 9954: { // groupStateList tag = input.readRepeatedMessage(groupStateList, tag); - bitField0_ |= 0x00000400; - if (tag != 12306) { + bitField0_ |= 0x00000800; + if (tag != 13194) { break; } } - case 12306: { + case 13194: { // entityGroupList tag = input.readRepeatedMessage(entityGroupList, tag); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; if (tag != 0) { break; } @@ -1047,15 +1185,15 @@ public final class SceneInfoOuterClass { tag = input.readTag(); break; } - case 32: { - // groupIdList [packed=false] - tag = input.readRepeatedUInt32(groupIdList, tag); + case 24: { + // lightenSectionList [packed=false] + tag = input.readRepeatedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000080; break; } - case 72: { - // lightenSectionList [packed=false] - tag = input.readRepeatedUInt32(lightenSectionList, tag); + case 104: { + // groupIdList [packed=false] + tag = input.readRepeatedUInt32(groupIdList, tag); bitField0_ |= 0x00000100; break; } @@ -1067,39 +1205,42 @@ public final class SceneInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.leaderEntityId, leaderEntityId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.floorId, floorId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.worldId, worldId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); - } - if ((bitField0_ & 0x00000040) != 0) { output.writeUInt32(FieldNames.gameModeType, gameModeType); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.entryId, entryId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.planeId, planeId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.floorId, floorId); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.worldId, worldId); + } + if ((bitField0_ & 0x00000040) != 0) { + output.writeUInt32(FieldNames.leaderEntityId, leaderEntityId); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedUInt32(FieldNames.groupIdList, groupIdList); + output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); + output.writeRepeatedUInt32(FieldNames.groupIdList, groupIdList); } if ((bitField0_ & 0x00000200) != 0) { output.writeRepeatedMessage(FieldNames.entityList, entityList); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRepeatedMessage(FieldNames.groupStateList, groupStateList); + output.writeRepeatedMessage(FieldNames.extraData, extraData); } if ((bitField0_ & 0x00000800) != 0) { + output.writeRepeatedMessage(FieldNames.groupStateList, groupStateList); + } + if ((bitField0_ & 0x00001000) != 0) { output.writeRepeatedMessage(FieldNames.entityGroupList, entityGroupList); } output.endObject(); @@ -1112,11 +1253,11 @@ public final class SceneInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1693061255: - case 794634049: { - if (input.isAtField(FieldNames.leaderEntityId)) { + case -464498289: + case 1937775689: { + if (input.isAtField(FieldNames.gameModeType)) { if (!input.trySkipNullValue()) { - leaderEntityId = input.readUInt32(); + gameModeType = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -1124,48 +1265,24 @@ public final class SceneInfoOuterClass { } break; } - case -766027193: - case 2022982190: { - if (input.isAtField(FieldNames.floorId)) { - if (!input.trySkipNullValue()) { - floorId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1525188685: - case 36230376: { - if (input.isAtField(FieldNames.worldId)) { - if (!input.trySkipNullValue()) { - worldId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1787644431: - case 1278860153: { - if (input.isAtField(FieldNames.clientPosVersion)) { - if (!input.trySkipNullValue()) { - clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case -1591558867: case -2093663224: { if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { entryId = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { + if (!input.trySkipNullValue()) { + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -1177,6 +1294,30 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { planeId = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -766027193: + case 2022982190: { + if (input.isAtField(FieldNames.floorId)) { + if (!input.trySkipNullValue()) { + floorId = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1525188685: + case 36230376: { + if (input.isAtField(FieldNames.worldId)) { + if (!input.trySkipNullValue()) { + worldId = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -1184,11 +1325,11 @@ public final class SceneInfoOuterClass { } break; } - case -464498289: - case 1937775689: { - if (input.isAtField(FieldNames.gameModeType)) { + case 1693061255: + case 794634049: { + if (input.isAtField(FieldNames.leaderEntityId)) { if (!input.trySkipNullValue()) { - gameModeType = input.readUInt32(); + leaderEntityId = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -1196,23 +1337,23 @@ public final class SceneInfoOuterClass { } break; } - case 457110456: - case 1703805826: { - if (input.isAtField(FieldNames.groupIdList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(groupIdList); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } case -1942343836: case 1328850360: { if (input.isAtField(FieldNames.lightenSectionList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(lightenSectionList); + bitField0_ |= 0x00000080; + } + } else { + input.skipUnknownField(); + } + break; + } + case 457110456: + case 1703805826: { + if (input.isAtField(FieldNames.groupIdList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(groupIdList); bitField0_ |= 0x00000100; } } else { @@ -1232,12 +1373,24 @@ public final class SceneInfoOuterClass { } break; } + case -253792294: + case 747380345: { + if (input.isAtField(FieldNames.extraData)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(extraData); + bitField0_ |= 0x00000400; + } + } else { + input.skipUnknownField(); + } + break; + } case 1415397648: case 1198817612: { if (input.isAtField(FieldNames.groupStateList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(groupStateList); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; } } else { input.skipUnknownField(); @@ -1249,7 +1402,7 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.entityGroupList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(entityGroupList); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; } } else { input.skipUnknownField(); @@ -1295,6 +1448,360 @@ public final class SceneInfoOuterClass { return SceneInfoFactory.INSTANCE; } + /** + * Protobuf type {@code ExtraDataEntry} + */ + public static final class ExtraDataEntry extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional int32 value = 2; + */ + private int value_; + + /** + * optional string key = 1; + */ + private final Utf8String key = Utf8String.newEmptyInstance(); + + private ExtraDataEntry() { + } + + /** + * @return a new empty instance of {@code ExtraDataEntry} + */ + public static ExtraDataEntry newInstance() { + return new ExtraDataEntry(); + } + + /** + * optional int32 value = 2; + * @return whether the value_ field is set + */ + public boolean hasValue() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional int32 value = 2; + * @return this + */ + public ExtraDataEntry clearValue() { + bitField0_ &= ~0x00000001; + value_ = 0; + return this; + } + + /** + * optional int32 value = 2; + * @return the value_ + */ + public int getValue() { + return value_; + } + + /** + * optional int32 value = 2; + * @param value the value_ to set + * @return this + */ + public ExtraDataEntry setValue(final int value) { + bitField0_ |= 0x00000001; + value_ = value; + return this; + } + + /** + * optional string key = 1; + * @return whether the key field is set + */ + public boolean hasKey() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional string key = 1; + * @return this + */ + public ExtraDataEntry clearKey() { + bitField0_ &= ~0x00000002; + key.clear(); + return this; + } + + /** + * optional string key = 1; + * @return the key + */ + public String getKey() { + return key.getString(); + } + + /** + * optional string key = 1; + * @return internal {@code Utf8String} representation of key for reading + */ + public Utf8String getKeyBytes() { + return this.key; + } + + /** + * optional string key = 1; + * @return internal {@code Utf8String} representation of key for modifications + */ + public Utf8String getMutableKeyBytes() { + bitField0_ |= 0x00000002; + return this.key; + } + + /** + * optional string key = 1; + * @param value the key to set + * @return this + */ + public ExtraDataEntry setKey(final CharSequence value) { + bitField0_ |= 0x00000002; + key.copyFrom(value); + return this; + } + + /** + * optional string key = 1; + * @param value the key to set + * @return this + */ + public ExtraDataEntry setKey(final Utf8String value) { + bitField0_ |= 0x00000002; + key.copyFrom(value); + return this; + } + + @Override + public ExtraDataEntry copyFrom(final ExtraDataEntry other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + value_ = other.value_; + key.copyFrom(other.key); + } + return this; + } + + @Override + public ExtraDataEntry mergeFrom(final ExtraDataEntry other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasValue()) { + setValue(other.value_); + } + if (other.hasKey()) { + getMutableKeyBytes().copyFrom(other.key); + } + return this; + } + + @Override + public ExtraDataEntry clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + value_ = 0; + key.clear(); + return this; + } + + @Override + public ExtraDataEntry clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + key.clear(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ExtraDataEntry)) { + return false; + } + ExtraDataEntry other = (ExtraDataEntry) o; + return bitField0_ == other.bitField0_ + && (!hasValue() || value_ == other.value_) + && (!hasKey() || key.equals(other.key)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 16); + output.writeInt32NoTag(value_); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 10); + output.writeStringNoTag(key); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeInt32SizeNoTag(value_); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeStringSizeNoTag(key); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public ExtraDataEntry mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 16: { + // value_ + value_ = input.readInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { + // key + input.readString(key); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeInt32(FieldNames.value_, value_); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeString(FieldNames.key, key); + } + output.endObject(); + } + + @Override + public ExtraDataEntry mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 111972721: { + if (input.isAtField(FieldNames.value_)) { + if (!input.trySkipNullValue()) { + value_ = input.readInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 106079: { + if (input.isAtField(FieldNames.key)) { + if (!input.trySkipNullValue()) { + input.readString(key); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ExtraDataEntry clone() { + return new ExtraDataEntry().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ExtraDataEntry parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ExtraDataEntry(), data).checkInitialized(); + } + + public static ExtraDataEntry parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new ExtraDataEntry(), input).checkInitialized(); + } + + public static ExtraDataEntry parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new ExtraDataEntry(), input).checkInitialized(); + } + + /** + * @return factory for creating ExtraDataEntry messages + */ + public static MessageFactory getFactory() { + return ExtraDataEntryFactory.INSTANCE; + } + + private enum ExtraDataEntryFactory implements MessageFactory { + INSTANCE; + + @Override + public ExtraDataEntry create() { + return ExtraDataEntry.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName value_ = FieldName.forField("value"); + + static final FieldName key = FieldName.forField("key"); + } + } + private enum SceneInfoFactory implements MessageFactory { INSTANCE; @@ -1308,26 +1815,28 @@ public final class SceneInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName leaderEntityId = FieldName.forField("leaderEntityId", "leader_entity_id"); + static final FieldName gameModeType = FieldName.forField("gameModeType", "game_mode_type"); + + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + + static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); static final FieldName floorId = FieldName.forField("floorId", "floor_id"); static final FieldName worldId = FieldName.forField("worldId", "world_id"); - static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); - - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - - static final FieldName gameModeType = FieldName.forField("gameModeType", "game_mode_type"); - - static final FieldName groupIdList = FieldName.forField("groupIdList", "group_id_list"); + static final FieldName leaderEntityId = FieldName.forField("leaderEntityId", "leader_entity_id"); static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); + static final FieldName groupIdList = FieldName.forField("groupIdList", "group_id_list"); + static final FieldName entityList = FieldName.forField("entityList", "entity_list"); + static final FieldName 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 fd8b348..e5e95e0 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java @@ -19,20 +19,20 @@ public final class SceneMonsterOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_hp = 2; + * optional uint32 monster_id = 5; + */ + private int monsterId; + + /** + * optional uint32 cur_hp = 6; */ private int curHp; /** - * optional uint32 max_hp = 14; + * optional uint32 max_hp = 10; */ private int maxHp; - /** - * optional uint32 monster_id = 15; - */ - private int monsterId; - private SceneMonster() { } @@ -44,99 +44,25 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 cur_hp = 2; - * @return whether the curHp field is set + * optional uint32 monster_id = 5; + * @return whether the monsterId field is set */ - public boolean hasCurHp() { + public boolean hasMonsterId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cur_hp = 2; - * @return this - */ - public SceneMonster clearCurHp() { - bitField0_ &= ~0x00000001; - curHp = 0; - return this; - } - - /** - * optional uint32 cur_hp = 2; - * @return the curHp - */ - public int getCurHp() { - return curHp; - } - - /** - * optional uint32 cur_hp = 2; - * @param value the curHp to set - * @return this - */ - public SceneMonster setCurHp(final int value) { - bitField0_ |= 0x00000001; - curHp = value; - return this; - } - - /** - * optional uint32 max_hp = 14; - * @return whether the maxHp field is set - */ - public boolean hasMaxHp() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 max_hp = 14; - * @return this - */ - public SceneMonster clearMaxHp() { - bitField0_ &= ~0x00000002; - maxHp = 0; - return this; - } - - /** - * optional uint32 max_hp = 14; - * @return the maxHp - */ - public int getMaxHp() { - return maxHp; - } - - /** - * optional uint32 max_hp = 14; - * @param value the maxHp to set - * @return this - */ - public SceneMonster setMaxHp(final int value) { - bitField0_ |= 0x00000002; - maxHp = value; - return this; - } - - /** - * optional uint32 monster_id = 15; - * @return whether the monsterId field is set - */ - public boolean hasMonsterId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 monster_id = 15; + * optional uint32 monster_id = 5; * @return this */ public SceneMonster clearMonsterId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; monsterId = 0; return this; } /** - * optional uint32 monster_id = 15; + * optional uint32 monster_id = 5; * @return the monsterId */ public int getMonsterId() { @@ -144,24 +70,98 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 monster_id = 15; + * optional uint32 monster_id = 5; * @param value the monsterId to set * @return this */ public SceneMonster setMonsterId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; monsterId = value; return this; } + /** + * optional uint32 cur_hp = 6; + * @return whether the curHp field is set + */ + public boolean hasCurHp() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 cur_hp = 6; + * @return this + */ + public SceneMonster clearCurHp() { + bitField0_ &= ~0x00000002; + curHp = 0; + return this; + } + + /** + * optional uint32 cur_hp = 6; + * @return the curHp + */ + public int getCurHp() { + return curHp; + } + + /** + * optional uint32 cur_hp = 6; + * @param value the curHp to set + * @return this + */ + public SceneMonster setCurHp(final int value) { + bitField0_ |= 0x00000002; + curHp = value; + return this; + } + + /** + * optional uint32 max_hp = 10; + * @return whether the maxHp field is set + */ + public boolean hasMaxHp() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 max_hp = 10; + * @return this + */ + public SceneMonster clearMaxHp() { + bitField0_ &= ~0x00000004; + maxHp = 0; + return this; + } + + /** + * optional uint32 max_hp = 10; + * @return the maxHp + */ + public int getMaxHp() { + return maxHp; + } + + /** + * optional uint32 max_hp = 10; + * @param value the maxHp to set + * @return this + */ + public SceneMonster setMaxHp(final int value) { + bitField0_ |= 0x00000004; + maxHp = value; + return this; + } + @Override public SceneMonster copyFrom(final SceneMonster other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + monsterId = other.monsterId; curHp = other.curHp; maxHp = other.maxHp; - monsterId = other.monsterId; } return this; } @@ -172,15 +172,15 @@ 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.hasMonsterId()) { - setMonsterId(other.monsterId); - } return this; } @@ -191,9 +191,9 @@ public final class SceneMonsterOuterClass { } cachedSize = -1; bitField0_ = 0; + monsterId = 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) - && (!hasMonsterId() || monsterId == other.monsterId); + && (!hasMaxHp() || maxHp == other.maxHp); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(curHp); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(monsterId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(maxHp); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(curHp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(monsterId); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(maxHp); } } @@ -242,13 +242,13 @@ public final class SceneMonsterOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curHp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(maxHp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curHp); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(maxHp); } return size; } @@ -260,27 +260,27 @@ public final class SceneMonsterOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // curHp - curHp = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // maxHp - maxHp = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 40: { // monsterId monsterId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // curHp + curHp = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // maxHp + maxHp = 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.curHp, curHp); + output.writeUInt32(FieldNames.monsterId, monsterId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.maxHp, maxHp); + output.writeUInt32(FieldNames.curHp, curHp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.monsterId, monsterId); + output.writeUInt32(FieldNames.maxHp, maxHp); } output.endObject(); } @@ -323,12 +323,24 @@ public final class SceneMonsterOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -1316830571: + case 2127946656: { + if (input.isAtField(FieldNames.monsterId)) { + if (!input.trySkipNullValue()) { + monsterId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 95026024: case -1349138585: { if (input.isAtField(FieldNames.curHp)) { if (!input.trySkipNullValue()) { curHp = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -340,18 +352,6 @@ public final class SceneMonsterOuterClass { if (input.isAtField(FieldNames.maxHp)) { if (!input.trySkipNullValue()) { maxHp = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1316830571: - case 2127946656: { - if (input.isAtField(FieldNames.monsterId)) { - if (!input.trySkipNullValue()) { - 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 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 4cafe48..d84e953 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java @@ -20,30 +20,30 @@ public final class SceneMonsterWaveOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 wave_id = 4; - */ - private int waveId; - - /** - * optional uint32 stage_id = 15; + * optional uint32 stage_id = 9; */ private int stageId; /** - * optional .SceneMonsterWaveParam wave_param = 11; + * optional uint32 wave_id = 11; + */ + private int waveId; + + /** + * optional .SceneMonsterWaveParam wave_param = 5; */ private final SceneMonsterWaveParamOuterClass.SceneMonsterWaveParam waveParam = SceneMonsterWaveParamOuterClass.SceneMonsterWaveParam.newInstance(); /** - * repeated .SceneMonster monster_list = 6; - */ - private final RepeatedMessage monsterList = RepeatedMessage.newEmptyInstance(SceneMonsterOuterClass.SceneMonster.getFactory()); - - /** - * repeated .ItemList drop_list = 12; + * repeated .ItemList drop_list = 6; */ private final RepeatedMessage dropList = RepeatedMessage.newEmptyInstance(ItemListOuterClass.ItemList.getFactory()); + /** + * repeated .SceneMonster monster_list = 8; + */ + private final RepeatedMessage monsterList = RepeatedMessage.newEmptyInstance(SceneMonsterOuterClass.SceneMonster.getFactory()); + private SceneMonsterWave() { } @@ -55,62 +55,25 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 wave_id = 4; - * @return whether the waveId field is set + * optional uint32 stage_id = 9; + * @return whether the stageId field is set */ - public boolean hasWaveId() { + public boolean hasStageId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 wave_id = 4; - * @return this - */ - public SceneMonsterWave clearWaveId() { - bitField0_ &= ~0x00000001; - waveId = 0; - return this; - } - - /** - * optional uint32 wave_id = 4; - * @return the waveId - */ - public int getWaveId() { - return waveId; - } - - /** - * optional uint32 wave_id = 4; - * @param value the waveId to set - * @return this - */ - public SceneMonsterWave setWaveId(final int value) { - bitField0_ |= 0x00000001; - waveId = value; - return this; - } - - /** - * optional uint32 stage_id = 15; - * @return whether the stageId field is set - */ - public boolean hasStageId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 stage_id = 15; + * optional uint32 stage_id = 9; * @return this */ public SceneMonsterWave clearStageId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; stageId = 0; return this; } /** - * optional uint32 stage_id = 15; + * optional uint32 stage_id = 9; * @return the stageId */ public int getStageId() { @@ -118,18 +81,55 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 stage_id = 15; + * optional uint32 stage_id = 9; * @param value the stageId to set * @return this */ public SceneMonsterWave setStageId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; stageId = value; return this; } /** - * optional .SceneMonsterWaveParam wave_param = 11; + * optional uint32 wave_id = 11; + * @return whether the waveId field is set + */ + public boolean hasWaveId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 wave_id = 11; + * @return this + */ + public SceneMonsterWave clearWaveId() { + bitField0_ &= ~0x00000002; + waveId = 0; + return this; + } + + /** + * optional uint32 wave_id = 11; + * @return the waveId + */ + public int getWaveId() { + return waveId; + } + + /** + * optional uint32 wave_id = 11; + * @param value the waveId to set + * @return this + */ + public SceneMonsterWave setWaveId(final int value) { + bitField0_ |= 0x00000002; + waveId = value; + return this; + } + + /** + * optional .SceneMonsterWaveParam wave_param = 5; * @return whether the waveParam field is set */ public boolean hasWaveParam() { @@ -137,7 +137,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional .SceneMonsterWaveParam wave_param = 11; + * optional .SceneMonsterWaveParam wave_param = 5; * @return this */ public SceneMonsterWave clearWaveParam() { @@ -147,7 +147,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional .SceneMonsterWaveParam wave_param = 11; + * optional .SceneMonsterWaveParam wave_param = 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. @@ -161,7 +161,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional .SceneMonsterWaveParam wave_param = 11; + * optional .SceneMonsterWaveParam wave_param = 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 @@ -175,7 +175,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional .SceneMonsterWaveParam wave_param = 11; + * optional .SceneMonsterWaveParam wave_param = 5; * @param value the waveParam to set * @return this */ @@ -187,93 +187,25 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .SceneMonster monster_list = 6; - * @return whether the monsterList field is set + * repeated .ItemList drop_list = 6; + * @return whether the dropList field is set */ - public boolean hasMonsterList() { + public boolean hasDropList() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated .SceneMonster monster_list = 6; - * @return this - */ - public SceneMonsterWave clearMonsterList() { - bitField0_ &= ~0x00000008; - monsterList.clear(); - return this; - } - - /** - * repeated .SceneMonster monster_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 #getMutableMonsterList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMonsterList() { - return monsterList; - } - - /** - * repeated .SceneMonster monster_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 getMutableMonsterList() { - bitField0_ |= 0x00000008; - return monsterList; - } - - /** - * repeated .SceneMonster monster_list = 6; - * @param value the monsterList to add - * @return this - */ - public SceneMonsterWave addMonsterList(final SceneMonsterOuterClass.SceneMonster value) { - bitField0_ |= 0x00000008; - monsterList.add(value); - return this; - } - - /** - * repeated .SceneMonster monster_list = 6; - * @param values the monsterList to add - * @return this - */ - public SceneMonsterWave addAllMonsterList(final SceneMonsterOuterClass.SceneMonster... values) { - bitField0_ |= 0x00000008; - monsterList.addAll(values); - return this; - } - - /** - * repeated .ItemList drop_list = 12; - * @return whether the dropList field is set - */ - public boolean hasDropList() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated .ItemList drop_list = 12; + * repeated .ItemList drop_list = 6; * @return this */ public SceneMonsterWave clearDropList() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; dropList.clear(); return this; } /** - * repeated .ItemList drop_list = 12; + * repeated .ItemList drop_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. @@ -287,7 +219,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .ItemList drop_list = 12; + * repeated .ItemList drop_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 @@ -296,42 +228,110 @@ public final class SceneMonsterWaveOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableDropList() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return dropList; } /** - * repeated .ItemList drop_list = 12; + * repeated .ItemList drop_list = 6; * @param value the dropList to add * @return this */ public SceneMonsterWave addDropList(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; dropList.add(value); return this; } /** - * repeated .ItemList drop_list = 12; + * repeated .ItemList drop_list = 6; * @param values the dropList to add * @return this */ public SceneMonsterWave addAllDropList(final ItemListOuterClass.ItemList... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; dropList.addAll(values); return this; } + /** + * repeated .SceneMonster monster_list = 8; + * @return whether the monsterList field is set + */ + public boolean hasMonsterList() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * repeated .SceneMonster monster_list = 8; + * @return this + */ + public SceneMonsterWave clearMonsterList() { + bitField0_ &= ~0x00000010; + monsterList.clear(); + return this; + } + + /** + * repeated .SceneMonster monster_list = 8; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableMonsterList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMonsterList() { + return monsterList; + } + + /** + * repeated .SceneMonster monster_list = 8; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableMonsterList() { + bitField0_ |= 0x00000010; + return monsterList; + } + + /** + * repeated .SceneMonster monster_list = 8; + * @param value the monsterList to add + * @return this + */ + public SceneMonsterWave addMonsterList(final SceneMonsterOuterClass.SceneMonster value) { + bitField0_ |= 0x00000010; + monsterList.add(value); + return this; + } + + /** + * repeated .SceneMonster monster_list = 8; + * @param values the monsterList to add + * @return this + */ + public SceneMonsterWave addAllMonsterList(final SceneMonsterOuterClass.SceneMonster... values) { + bitField0_ |= 0x00000010; + monsterList.addAll(values); + return this; + } + @Override public SceneMonsterWave copyFrom(final SceneMonsterWave other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - waveId = other.waveId; stageId = other.stageId; + waveId = other.waveId; waveParam.copyFrom(other.waveParam); - monsterList.copyFrom(other.monsterList); dropList.copyFrom(other.dropList); + monsterList.copyFrom(other.monsterList); } return this; } @@ -342,21 +342,21 @@ public final class SceneMonsterWaveOuterClass { return this; } cachedSize = -1; - if (other.hasWaveId()) { - setWaveId(other.waveId); - } if (other.hasStageId()) { setStageId(other.stageId); } + if (other.hasWaveId()) { + setWaveId(other.waveId); + } if (other.hasWaveParam()) { getMutableWaveParam().mergeFrom(other.waveParam); } - if (other.hasMonsterList()) { - getMutableMonsterList().addAll(other.monsterList); - } if (other.hasDropList()) { getMutableDropList().addAll(other.dropList); } + if (other.hasMonsterList()) { + getMutableMonsterList().addAll(other.monsterList); + } return this; } @@ -367,11 +367,11 @@ public final class SceneMonsterWaveOuterClass { } cachedSize = -1; bitField0_ = 0; - waveId = 0; stageId = 0; + waveId = 0; waveParam.clear(); - monsterList.clear(); dropList.clear(); + monsterList.clear(); return this; } @@ -383,8 +383,8 @@ public final class SceneMonsterWaveOuterClass { cachedSize = -1; bitField0_ = 0; waveParam.clearQuick(); - monsterList.clearQuick(); dropList.clearQuick(); + monsterList.clearQuick(); return this; } @@ -398,37 +398,37 @@ public final class SceneMonsterWaveOuterClass { } SceneMonsterWave other = (SceneMonsterWave) o; return bitField0_ == other.bitField0_ - && (!hasWaveId() || waveId == other.waveId) && (!hasStageId() || stageId == other.stageId) + && (!hasWaveId() || waveId == other.waveId) && (!hasWaveParam() || waveParam.equals(other.waveParam)) - && (!hasMonsterList() || monsterList.equals(other.monsterList)) - && (!hasDropList() || dropList.equals(other.dropList)); + && (!hasDropList() || dropList.equals(other.dropList)) + && (!hasMonsterList() || monsterList.equals(other.monsterList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(waveId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(stageId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(waveId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 42); output.writeMessageNoTag(waveParam); } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < monsterList.length(); i++) { + for (int i = 0; i < dropList.length(); i++) { output.writeRawByte((byte) 50); - output.writeMessageNoTag(monsterList.get(i)); + output.writeMessageNoTag(dropList.get(i)); } } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < dropList.length(); i++) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(dropList.get(i)); + for (int i = 0; i < monsterList.length(); i++) { + output.writeRawByte((byte) 66); + output.writeMessageNoTag(monsterList.get(i)); } } } @@ -437,19 +437,19 @@ public final class SceneMonsterWaveOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(waveId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(waveId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(waveParam); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * monsterList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterList); + size += (1 * dropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dropList); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * dropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dropList); + size += (1 * monsterList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterList); } return size; } @@ -461,25 +461,25 @@ public final class SceneMonsterWaveOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // waveId - waveId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 72: { // stageId stageId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 88) { break; } } - case 90: { + case 88: { + // waveId + waveId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { // waveParam input.readMessage(waveParam); bitField0_ |= 0x00000004; @@ -489,16 +489,16 @@ public final class SceneMonsterWaveOuterClass { } } case 50: { - // monsterList - tag = input.readRepeatedMessage(monsterList, tag); + // dropList + tag = input.readRepeatedMessage(dropList, tag); bitField0_ |= 0x00000008; - if (tag != 98) { + if (tag != 66) { break; } } - case 98: { - // dropList - tag = input.readRepeatedMessage(dropList, tag); + case 66: { + // monsterList + tag = input.readRepeatedMessage(monsterList, tag); bitField0_ |= 0x00000010; if (tag != 0) { break; @@ -522,19 +522,19 @@ public final class SceneMonsterWaveOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.waveId, waveId); + output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.stageId, stageId); + output.writeUInt32(FieldNames.waveId, waveId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.waveParam, waveParam); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedMessage(FieldNames.monsterList, monsterList); + output.writeRepeatedMessage(FieldNames.dropList, dropList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedMessage(FieldNames.dropList, dropList); + output.writeRepeatedMessage(FieldNames.monsterList, monsterList); } output.endObject(); } @@ -546,11 +546,11 @@ public final class SceneMonsterWaveOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -794902028: - case 1127862305: { - if (input.isAtField(FieldNames.waveId)) { + case -1897528135: + case 1306191356: { + if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { - waveId = input.readUInt32(); + stageId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -558,11 +558,11 @@ public final class SceneMonsterWaveOuterClass { } break; } - case -1897528135: - case 1306191356: { - if (input.isAtField(FieldNames.stageId)) { + case -794902028: + case 1127862305: { + if (input.isAtField(FieldNames.waveId)) { if (!input.trySkipNullValue()) { - stageId = input.readUInt32(); + waveId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -582,11 +582,11 @@ public final class SceneMonsterWaveOuterClass { } break; } - case 1541271448: - case 552401379: { - if (input.isAtField(FieldNames.monsterList)) { + case -432782291: + case -513722386: { + if (input.isAtField(FieldNames.dropList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(monsterList); + input.readRepeatedMessage(dropList); bitField0_ |= 0x00000008; } } else { @@ -594,11 +594,11 @@ public final class SceneMonsterWaveOuterClass { } break; } - case -432782291: - case -513722386: { - if (input.isAtField(FieldNames.dropList)) { + case 1541271448: + case 552401379: { + if (input.isAtField(FieldNames.monsterList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(dropList); + input.readRepeatedMessage(monsterList); bitField0_ |= 0x00000010; } } else { @@ -659,15 +659,15 @@ public final class SceneMonsterWaveOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName waveId = FieldName.forField("waveId", "wave_id"); - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + static final FieldName waveId = FieldName.forField("waveId", "wave_id"); + static final FieldName waveParam = FieldName.forField("waveParam", "wave_param"); - static final FieldName monsterList = FieldName.forField("monsterList", "monster_list"); - static final FieldName dropList = FieldName.forField("dropList", "drop_list"); + + static final FieldName monsterList = FieldName.forField("monsterList", "monster_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java index d93f439..e85c40f 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java @@ -19,12 +19,12 @@ public final class SceneMonsterWaveParamOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 hard_level_group = 3; + * optional uint32 hard_level_group = 4; */ private int hardLevelGroup; /** - * optional uint32 level = 8; + * optional uint32 level = 6; */ private int level; @@ -44,7 +44,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 hard_level_group = 3; + * optional uint32 hard_level_group = 4; * @return whether the hardLevelGroup field is set */ public boolean hasHardLevelGroup() { @@ -52,7 +52,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 hard_level_group = 3; + * optional uint32 hard_level_group = 4; * @return this */ public SceneMonsterWaveParam clearHardLevelGroup() { @@ -62,7 +62,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 hard_level_group = 3; + * optional uint32 hard_level_group = 4; * @return the hardLevelGroup */ public int getHardLevelGroup() { @@ -70,7 +70,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 hard_level_group = 3; + * optional uint32 hard_level_group = 4; * @param value the hardLevelGroup to set * @return this */ @@ -81,7 +81,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 6; * @return whether the level field is set */ public boolean hasLevel() { @@ -89,7 +89,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 6; * @return this */ public SceneMonsterWaveParam clearLevel() { @@ -99,7 +99,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 6; * @return the level */ public int getLevel() { @@ -107,7 +107,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 6; * @param value the level to set * @return this */ @@ -225,11 +225,11 @@ public final class SceneMonsterWaveParamOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(hardLevelGroup); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000004) != 0) { @@ -260,16 +260,16 @@ public final class SceneMonsterWaveParamOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 32: { // hardLevelGroup hardLevelGroup = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 48) { break; } } - case 64: { + case 48: { // level level = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java index a0298c3..9c5175c 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 = 8; + * optional uint32 npc_id = 6; */ private int npcId; /** - * optional .NpcExtraInfo extra_info = 4; + * optional .NpcExtraInfo extra_info = 1; */ private final NpcExtraInfoOuterClass.NpcExtraInfo extraInfo = NpcExtraInfoOuterClass.NpcExtraInfo.newInstance(); @@ -39,7 +39,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 8; + * optional uint32 npc_id = 6; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -47,7 +47,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 8; + * optional uint32 npc_id = 6; * @return this */ public SceneNpcInfo clearNpcId() { @@ -57,7 +57,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 8; + * optional uint32 npc_id = 6; * @return the npcId */ public int getNpcId() { @@ -65,7 +65,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 8; + * optional uint32 npc_id = 6; * @param value the npcId to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 4; + * optional .NpcExtraInfo extra_info = 1; * @return whether the extraInfo field is set */ public boolean hasExtraInfo() { @@ -84,7 +84,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 4; + * optional .NpcExtraInfo extra_info = 1; * @return this */ public SceneNpcInfo clearExtraInfo() { @@ -94,7 +94,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 4; + * optional .NpcExtraInfo extra_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 SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 4; + * optional .NpcExtraInfo extra_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 SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 4; + * optional .NpcExtraInfo extra_info = 1; * @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) 64); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(npcId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 10); output.writeMessageNoTag(extraInfo); } } @@ -226,16 +226,16 @@ public final class SceneNpcInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 48: { // npcId npcId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 10) { break; } } - case 34: { + case 10: { // 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 06d5897..3bd3f09 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java @@ -19,19 +19,19 @@ public final class SceneNpcMonsterInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 event_id = 3; + * optional uint32 world_level = 3; */ - private int eventId; + private int worldLevel; /** - * optional uint32 monster_id = 6; + * optional uint32 monster_id = 11; */ private int monsterId; /** - * optional uint32 world_level = 10; + * optional uint32 event_id = 14; */ - private int worldLevel; + private int eventId; private SceneNpcMonsterInfo() { } @@ -44,44 +44,44 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 event_id = 3; - * @return whether the eventId field is set + * optional uint32 world_level = 3; + * @return whether the worldLevel field is set */ - public boolean hasEventId() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 event_id = 3; + * optional uint32 world_level = 3; * @return this */ - public SceneNpcMonsterInfo clearEventId() { + public SceneNpcMonsterInfo clearWorldLevel() { bitField0_ &= ~0x00000001; - eventId = 0; + worldLevel = 0; return this; } /** - * optional uint32 event_id = 3; - * @return the eventId + * optional uint32 world_level = 3; + * @return the worldLevel */ - public int getEventId() { - return eventId; + public int getWorldLevel() { + return worldLevel; } /** - * optional uint32 event_id = 3; - * @param value the eventId to set + * optional uint32 world_level = 3; + * @param value the worldLevel to set * @return this */ - public SceneNpcMonsterInfo setEventId(final int value) { + public SceneNpcMonsterInfo setWorldLevel(final int value) { bitField0_ |= 0x00000001; - eventId = value; + worldLevel = value; return this; } /** - * optional uint32 monster_id = 6; + * optional uint32 monster_id = 11; * @return whether the monsterId field is set */ public boolean hasMonsterId() { @@ -89,7 +89,7 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 monster_id = 6; + * optional uint32 monster_id = 11; * @return this */ public SceneNpcMonsterInfo clearMonsterId() { @@ -99,7 +99,7 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 monster_id = 6; + * optional uint32 monster_id = 11; * @return the monsterId */ public int getMonsterId() { @@ -107,7 +107,7 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 monster_id = 6; + * optional uint32 monster_id = 11; * @param value the monsterId to set * @return this */ @@ -118,39 +118,39 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 world_level = 10; - * @return whether the worldLevel field is set + * optional uint32 event_id = 14; + * @return whether the eventId field is set */ - public boolean hasWorldLevel() { + public boolean hasEventId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 world_level = 10; + * optional uint32 event_id = 14; * @return this */ - public SceneNpcMonsterInfo clearWorldLevel() { + public SceneNpcMonsterInfo clearEventId() { bitField0_ &= ~0x00000004; - worldLevel = 0; + eventId = 0; return this; } /** - * optional uint32 world_level = 10; - * @return the worldLevel + * optional uint32 event_id = 14; + * @return the eventId */ - public int getWorldLevel() { - return worldLevel; + public int getEventId() { + return eventId; } /** - * optional uint32 world_level = 10; - * @param value the worldLevel to set + * optional uint32 event_id = 14; + * @param value the eventId to set * @return this */ - public SceneNpcMonsterInfo setWorldLevel(final int value) { + public SceneNpcMonsterInfo setEventId(final int value) { bitField0_ |= 0x00000004; - worldLevel = value; + eventId = value; return this; } @@ -159,9 +159,9 @@ public final class SceneNpcMonsterInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - eventId = other.eventId; - monsterId = other.monsterId; worldLevel = other.worldLevel; + monsterId = other.monsterId; + eventId = other.eventId; } return this; } @@ -172,14 +172,14 @@ 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.hasWorldLevel()) { - setWorldLevel(other.worldLevel); + if (other.hasEventId()) { + setEventId(other.eventId); } return this; } @@ -191,9 +191,9 @@ public final class SceneNpcMonsterInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - eventId = 0; - monsterId = 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) - && (!hasWorldLevel() || worldLevel == other.worldLevel); + && (!hasEventId() || eventId == other.eventId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 24); - output.writeUInt32NoTag(eventId); + output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(monsterId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(worldLevel); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(eventId); } } @@ -242,13 +242,13 @@ public final class SceneNpcMonsterInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); } return size; } @@ -261,26 +261,26 @@ public final class SceneNpcMonsterInfoOuterClass { while (true) { switch (tag) { case 24: { - // eventId - eventId = input.readUInt32(); + // worldLevel + worldLevel = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 88) { break; } } - case 48: { + case 88: { // monsterId monsterId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 112) { break; } } - case 80: { - // worldLevel - worldLevel = input.readUInt32(); + case 112: { + // eventId + eventId = 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.eventId, eventId); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.monsterId, monsterId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); + output.writeUInt32(FieldNames.eventId, eventId); } output.endObject(); } @@ -323,11 +323,11 @@ public final class SceneNpcMonsterInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1376502443: - case 278118624: { - if (input.isAtField(FieldNames.eventId)) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { - eventId = input.readUInt32(); + worldLevel = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -347,11 +347,11 @@ public final class SceneNpcMonsterInfoOuterClass { } break; } - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { + case -1376502443: + case 278118624: { + if (input.isAtField(FieldNames.eventId)) { if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); + 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 worldLevel = FieldName.forField("worldLevel", "world_level"); + 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 bf90150..280b221 100644 --- a/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java @@ -19,7 +19,7 @@ public final class ScenePlaneEventScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .ItemList get_item_list = 1; + * optional .ItemList get_item_list = 3; */ private final ItemListOuterClass.ItemList getItemList = ItemListOuterClass.ItemList.newInstance(); @@ -34,7 +34,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 1; + * optional .ItemList get_item_list = 3; * @return whether the getItemList field is set */ public boolean hasGetItemList() { @@ -42,7 +42,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 1; + * optional .ItemList get_item_list = 3; * @return this */ public ScenePlaneEventScNotify clearGetItemList() { @@ -52,7 +52,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 1; + * optional .ItemList get_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. @@ -66,7 +66,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 1; + * optional .ItemList get_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 @@ -80,7 +80,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 1; + * optional .ItemList get_item_list = 3; * @param value the getItemList to set * @return this */ @@ -150,7 +150,7 @@ public final class ScenePlaneEventScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 26); output.writeMessageNoTag(getItemList); } } @@ -171,7 +171,7 @@ public final class ScenePlaneEventScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 26: { // 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 db1d7ee..c450bf0 100644 --- a/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java @@ -19,27 +19,27 @@ public final class ScenePropInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 create_time_ms = 7; + * optional uint64 create_time_ms = 5; */ private long createTimeMs; /** - * optional uint32 prop_state = 1; - */ - private int propState; - - /** - * optional uint32 life_time_ms = 11; + * optional uint32 life_time_ms = 2; */ private int lifeTimeMs; /** - * optional uint32 prop_id = 12; + * optional uint32 prop_state = 3; + */ + private int propState; + + /** + * optional uint32 prop_id = 10; */ private int propId; /** - * optional .PropExtraInfo extra_info = 9; + * optional .PropExtraInfo extra_info = 13; */ private final PropExtraInfoOuterClass.PropExtraInfo extraInfo = PropExtraInfoOuterClass.PropExtraInfo.newInstance(); @@ -54,7 +54,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 7; + * optional uint64 create_time_ms = 5; * @return whether the createTimeMs field is set */ public boolean hasCreateTimeMs() { @@ -62,7 +62,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 7; + * optional uint64 create_time_ms = 5; * @return this */ public ScenePropInfo clearCreateTimeMs() { @@ -72,7 +72,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 7; + * optional uint64 create_time_ms = 5; * @return the createTimeMs */ public long getCreateTimeMs() { @@ -80,7 +80,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 7; + * optional uint64 create_time_ms = 5; * @param value the createTimeMs to set * @return this */ @@ -91,62 +91,25 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_state = 1; - * @return whether the propState field is set + * optional uint32 life_time_ms = 2; + * @return whether the lifeTimeMs field is set */ - public boolean hasPropState() { + public boolean hasLifeTimeMs() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 prop_state = 1; - * @return this - */ - public ScenePropInfo clearPropState() { - bitField0_ &= ~0x00000002; - propState = 0; - return this; - } - - /** - * optional uint32 prop_state = 1; - * @return the propState - */ - public int getPropState() { - return propState; - } - - /** - * optional uint32 prop_state = 1; - * @param value the propState to set - * @return this - */ - public ScenePropInfo setPropState(final int value) { - bitField0_ |= 0x00000002; - propState = value; - return this; - } - - /** - * 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; + * optional uint32 life_time_ms = 2; * @return this */ public ScenePropInfo clearLifeTimeMs() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; lifeTimeMs = 0; return this; } /** - * optional uint32 life_time_ms = 11; + * optional uint32 life_time_ms = 2; * @return the lifeTimeMs */ public int getLifeTimeMs() { @@ -154,18 +117,55 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 life_time_ms = 11; + * optional uint32 life_time_ms = 2; * @param value the lifeTimeMs to set * @return this */ public ScenePropInfo setLifeTimeMs(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; lifeTimeMs = value; return this; } /** - * optional uint32 prop_id = 12; + * optional uint32 prop_state = 3; + * @return whether the propState field is set + */ + public boolean hasPropState() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 prop_state = 3; + * @return this + */ + public ScenePropInfo clearPropState() { + bitField0_ &= ~0x00000004; + propState = 0; + return this; + } + + /** + * optional uint32 prop_state = 3; + * @return the propState + */ + public int getPropState() { + return propState; + } + + /** + * optional uint32 prop_state = 3; + * @param value the propState to set + * @return this + */ + public ScenePropInfo setPropState(final int value) { + bitField0_ |= 0x00000004; + propState = value; + return this; + } + + /** + * optional uint32 prop_id = 10; * @return whether the propId field is set */ public boolean hasPropId() { @@ -173,7 +173,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_id = 12; + * optional uint32 prop_id = 10; * @return this */ public ScenePropInfo clearPropId() { @@ -183,7 +183,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_id = 12; + * optional uint32 prop_id = 10; * @return the propId */ public int getPropId() { @@ -191,7 +191,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_id = 12; + * optional uint32 prop_id = 10; * @param value the propId to set * @return this */ @@ -202,7 +202,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 9; + * optional .PropExtraInfo extra_info = 13; * @return whether the extraInfo field is set */ public boolean hasExtraInfo() { @@ -210,7 +210,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 9; + * optional .PropExtraInfo extra_info = 13; * @return this */ public ScenePropInfo clearExtraInfo() { @@ -220,7 +220,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 9; + * optional .PropExtraInfo extra_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. @@ -234,7 +234,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 9; + * optional .PropExtraInfo extra_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 @@ -248,7 +248,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 9; + * optional .PropExtraInfo extra_info = 13; * @param value the extraInfo to set * @return this */ @@ -264,8 +264,8 @@ public final class ScenePropInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; createTimeMs = other.createTimeMs; - propState = other.propState; lifeTimeMs = other.lifeTimeMs; + propState = other.propState; propId = other.propId; extraInfo.copyFrom(other.extraInfo); } @@ -281,12 +281,12 @@ public final class ScenePropInfoOuterClass { if (other.hasCreateTimeMs()) { setCreateTimeMs(other.createTimeMs); } - if (other.hasPropState()) { - setPropState(other.propState); - } if (other.hasLifeTimeMs()) { setLifeTimeMs(other.lifeTimeMs); } + if (other.hasPropState()) { + setPropState(other.propState); + } if (other.hasPropId()) { setPropId(other.propId); } @@ -304,8 +304,8 @@ public final class ScenePropInfoOuterClass { cachedSize = -1; bitField0_ = 0; createTimeMs = 0L; - propState = 0; lifeTimeMs = 0; + propState = 0; propId = 0; extraInfo.clear(); return this; @@ -333,8 +333,8 @@ public final class ScenePropInfoOuterClass { ScenePropInfo other = (ScenePropInfo) o; return bitField0_ == other.bitField0_ && (!hasCreateTimeMs() || createTimeMs == other.createTimeMs) - && (!hasPropState() || propState == other.propState) && (!hasLifeTimeMs() || lifeTimeMs == other.lifeTimeMs) + && (!hasPropState() || propState == other.propState) && (!hasPropId() || propId == other.propId) && (!hasExtraInfo() || extraInfo.equals(other.extraInfo)); } @@ -342,23 +342,23 @@ public final class ScenePropInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 40); output.writeUInt64NoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(propState); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(lifeTimeMs); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(propState); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(propId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 106); output.writeMessageNoTag(extraInfo); } } @@ -370,10 +370,10 @@ public final class ScenePropInfoOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); + size += 1 + ProtoSink.computeUInt32SizeNoTag(lifeTimeMs); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lifeTimeMs); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(propId); @@ -391,43 +391,43 @@ public final class ScenePropInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 40: { // createTimeMs createTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 16) { break; } } - case 8: { - // propState - propState = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 16: { // lifeTimeMs lifeTimeMs = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 24) { break; } } - case 96: { + case 24: { + // propState + propState = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { // propId propId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 74) { + if (tag != 106) { break; } } - case 74: { + case 106: { // extraInfo input.readMessage(extraInfo); bitField0_ |= 0x00000010; @@ -457,10 +457,10 @@ public final class ScenePropInfoOuterClass { output.writeUInt64(FieldNames.createTimeMs, createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.propState, propState); + output.writeUInt32(FieldNames.lifeTimeMs, lifeTimeMs); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.lifeTimeMs, lifeTimeMs); + output.writeUInt32(FieldNames.propState, propState); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.propId, propId); @@ -490,11 +490,11 @@ public final class ScenePropInfoOuterClass { } break; } - case -739191058: - case -1096911691: { - if (input.isAtField(FieldNames.propState)) { + case -1226028177: + case 1665182229: { + if (input.isAtField(FieldNames.lifeTimeMs)) { if (!input.trySkipNullValue()) { - propState = input.readUInt32(); + lifeTimeMs = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -502,11 +502,11 @@ public final class ScenePropInfoOuterClass { } break; } - case -1226028177: - case 1665182229: { - if (input.isAtField(FieldNames.lifeTimeMs)) { + case -739191058: + case -1096911691: { + if (input.isAtField(FieldNames.propState)) { if (!input.trySkipNullValue()) { - lifeTimeMs = input.readUInt32(); + propState = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -592,10 +592,10 @@ public final class ScenePropInfoOuterClass { static class FieldNames { static final FieldName createTimeMs = FieldName.forField("createTimeMs", "create_time_ms"); - static final FieldName propState = FieldName.forField("propState", "prop_state"); - static final FieldName lifeTimeMs = FieldName.forField("lifeTimeMs", "life_time_ms"); + static final FieldName propState = FieldName.forField("propState", "prop_state"); + static final FieldName propId = FieldName.forField("propId", "prop_id"); 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 8edabbd..9cdd4d6 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java @@ -20,32 +20,32 @@ public final class SceneSummonUnitInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 create_time_ms = 7; + * optional uint64 create_time_ms = 13; */ private long createTimeMs; /** - * optional uint32 summon_unit_id = 3; - */ - private int summonUnitId; - - /** - * optional uint32 attach_entity_id = 4; + * optional uint32 attach_entity_id = 2; */ private int attachEntityId; /** - * optional uint32 caster_entity_id = 14; + * optional uint32 caster_entity_id = 6; */ private int casterEntityId; /** - * optional sint32 life_time_ms = 6; + * optional uint32 summon_unit_id = 9; + */ + private int summonUnitId; + + /** + * optional sint32 life_time_ms = 3; */ private int lifeTimeMs; /** - * repeated string trigger_name_list = 12; + * repeated string trigger_name_list = 4; */ private final RepeatedString triggerNameList = RepeatedString.newEmptyInstance(); @@ -60,7 +60,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 7; + * optional uint64 create_time_ms = 13; * @return whether the createTimeMs field is set */ public boolean hasCreateTimeMs() { @@ -68,7 +68,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 7; + * optional uint64 create_time_ms = 13; * @return this */ public SceneSummonUnitInfo clearCreateTimeMs() { @@ -78,7 +78,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 7; + * optional uint64 create_time_ms = 13; * @return the createTimeMs */ public long getCreateTimeMs() { @@ -86,7 +86,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 7; + * optional uint64 create_time_ms = 13; * @param value the createTimeMs to set * @return this */ @@ -97,62 +97,25 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint32 summon_unit_id = 3; - * @return whether the summonUnitId field is set + * optional uint32 attach_entity_id = 2; + * @return whether the attachEntityId field is set */ - public boolean hasSummonUnitId() { + public boolean hasAttachEntityId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 summon_unit_id = 3; - * @return this - */ - public SceneSummonUnitInfo clearSummonUnitId() { - bitField0_ &= ~0x00000002; - summonUnitId = 0; - return this; - } - - /** - * optional uint32 summon_unit_id = 3; - * @return the summonUnitId - */ - public int getSummonUnitId() { - return summonUnitId; - } - - /** - * optional uint32 summon_unit_id = 3; - * @param value the summonUnitId to set - * @return this - */ - public SceneSummonUnitInfo setSummonUnitId(final int value) { - bitField0_ |= 0x00000002; - summonUnitId = value; - return this; - } - - /** - * optional uint32 attach_entity_id = 4; - * @return whether the attachEntityId field is set - */ - public boolean hasAttachEntityId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 attach_entity_id = 4; + * optional uint32 attach_entity_id = 2; * @return this */ public SceneSummonUnitInfo clearAttachEntityId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; attachEntityId = 0; return this; } /** - * optional uint32 attach_entity_id = 4; + * optional uint32 attach_entity_id = 2; * @return the attachEntityId */ public int getAttachEntityId() { @@ -160,36 +123,36 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint32 attach_entity_id = 4; + * optional uint32 attach_entity_id = 2; * @param value the attachEntityId to set * @return this */ public SceneSummonUnitInfo setAttachEntityId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; attachEntityId = value; return this; } /** - * optional uint32 caster_entity_id = 14; + * optional uint32 caster_entity_id = 6; * @return whether the casterEntityId field is set */ public boolean hasCasterEntityId() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 caster_entity_id = 14; + * optional uint32 caster_entity_id = 6; * @return this */ public SceneSummonUnitInfo clearCasterEntityId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; casterEntityId = 0; return this; } /** - * optional uint32 caster_entity_id = 14; + * optional uint32 caster_entity_id = 6; * @return the casterEntityId */ public int getCasterEntityId() { @@ -197,18 +160,55 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint32 caster_entity_id = 14; + * optional uint32 caster_entity_id = 6; * @param value the casterEntityId to set * @return this */ public SceneSummonUnitInfo setCasterEntityId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; casterEntityId = value; return this; } /** - * optional sint32 life_time_ms = 6; + * optional uint32 summon_unit_id = 9; + * @return whether the summonUnitId field is set + */ + public boolean hasSummonUnitId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 summon_unit_id = 9; + * @return this + */ + public SceneSummonUnitInfo clearSummonUnitId() { + bitField0_ &= ~0x00000008; + summonUnitId = 0; + return this; + } + + /** + * optional uint32 summon_unit_id = 9; + * @return the summonUnitId + */ + public int getSummonUnitId() { + return summonUnitId; + } + + /** + * optional uint32 summon_unit_id = 9; + * @param value the summonUnitId to set + * @return this + */ + public SceneSummonUnitInfo setSummonUnitId(final int value) { + bitField0_ |= 0x00000008; + summonUnitId = value; + return this; + } + + /** + * optional sint32 life_time_ms = 3; * @return whether the lifeTimeMs field is set */ public boolean hasLifeTimeMs() { @@ -216,7 +216,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional sint32 life_time_ms = 6; + * optional sint32 life_time_ms = 3; * @return this */ public SceneSummonUnitInfo clearLifeTimeMs() { @@ -226,7 +226,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional sint32 life_time_ms = 6; + * optional sint32 life_time_ms = 3; * @return the lifeTimeMs */ public int getLifeTimeMs() { @@ -234,7 +234,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional sint32 life_time_ms = 6; + * optional sint32 life_time_ms = 3; * @param value the lifeTimeMs to set * @return this */ @@ -245,7 +245,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 12; + * repeated string trigger_name_list = 4; * @return whether the triggerNameList field is set */ public boolean hasTriggerNameList() { @@ -253,7 +253,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 12; + * repeated string trigger_name_list = 4; * @return this */ public SceneSummonUnitInfo clearTriggerNameList() { @@ -263,7 +263,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 12; + * repeated string trigger_name_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. @@ -277,7 +277,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 12; + * repeated string trigger_name_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 @@ -291,7 +291,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 12; + * repeated string trigger_name_list = 4; * @param value the triggerNameList to add * @return this */ @@ -302,7 +302,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 12; + * repeated string trigger_name_list = 4; * @param values the triggerNameList to add * @return this */ @@ -318,9 +318,9 @@ public final class SceneSummonUnitInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; createTimeMs = other.createTimeMs; - summonUnitId = other.summonUnitId; attachEntityId = other.attachEntityId; casterEntityId = other.casterEntityId; + summonUnitId = other.summonUnitId; lifeTimeMs = other.lifeTimeMs; triggerNameList.copyFrom(other.triggerNameList); } @@ -336,15 +336,15 @@ public final class SceneSummonUnitInfoOuterClass { if (other.hasCreateTimeMs()) { setCreateTimeMs(other.createTimeMs); } - if (other.hasSummonUnitId()) { - setSummonUnitId(other.summonUnitId); - } if (other.hasAttachEntityId()) { setAttachEntityId(other.attachEntityId); } if (other.hasCasterEntityId()) { setCasterEntityId(other.casterEntityId); } + if (other.hasSummonUnitId()) { + setSummonUnitId(other.summonUnitId); + } if (other.hasLifeTimeMs()) { setLifeTimeMs(other.lifeTimeMs); } @@ -362,9 +362,9 @@ public final class SceneSummonUnitInfoOuterClass { cachedSize = -1; bitField0_ = 0; createTimeMs = 0L; - summonUnitId = 0; attachEntityId = 0; casterEntityId = 0; + summonUnitId = 0; lifeTimeMs = 0; triggerNameList.clear(); return this; @@ -392,9 +392,9 @@ public final class SceneSummonUnitInfoOuterClass { SceneSummonUnitInfo other = (SceneSummonUnitInfo) o; return bitField0_ == other.bitField0_ && (!hasCreateTimeMs() || createTimeMs == other.createTimeMs) - && (!hasSummonUnitId() || summonUnitId == other.summonUnitId) && (!hasAttachEntityId() || attachEntityId == other.attachEntityId) && (!hasCasterEntityId() || casterEntityId == other.casterEntityId) + && (!hasSummonUnitId() || summonUnitId == other.summonUnitId) && (!hasLifeTimeMs() || lifeTimeMs == other.lifeTimeMs) && (!hasTriggerNameList() || triggerNameList.equals(other.triggerNameList)); } @@ -402,28 +402,28 @@ public final class SceneSummonUnitInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 104); output.writeUInt64NoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(summonUnitId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(attachEntityId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 48); output.writeUInt32NoTag(casterEntityId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(summonUnitId); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 24); output.writeSInt32NoTag(lifeTimeMs); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < triggerNameList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 34); output.writeStringNoTag(triggerNameList.get(i)); } } @@ -436,14 +436,14 @@ public final class SceneSummonUnitInfoOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(summonUnitId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(attachEntityId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(casterEntityId); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(summonUnitId); + } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeSInt32SizeNoTag(lifeTimeMs); } @@ -460,52 +460,52 @@ public final class SceneSummonUnitInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 104: { // createTimeMs createTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 16) { break; } } - case 24: { - // summonUnitId - summonUnitId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { + case 16: { // attachEntityId attachEntityId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // casterEntityId - casterEntityId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 48) { break; } } case 48: { + // 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 != 24) { + break; + } + } + case 24: { // lifeTimeMs lifeTimeMs = input.readSInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 98) { + if (tag != 34) { break; } } - case 98: { + case 34: { // triggerNameList tag = input.readRepeatedString(triggerNameList, tag); bitField0_ |= 0x00000020; @@ -534,14 +534,14 @@ public final class SceneSummonUnitInfoOuterClass { output.writeUInt64(FieldNames.createTimeMs, createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.summonUnitId, summonUnitId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.attachEntityId, attachEntityId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.casterEntityId, casterEntityId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.summonUnitId, summonUnitId); + } if ((bitField0_ & 0x00000010) != 0) { output.writeSInt32(FieldNames.lifeTimeMs, lifeTimeMs); } @@ -570,24 +570,12 @@ public final class SceneSummonUnitInfoOuterClass { } break; } - case 43438592: - case 1094873176: { - if (input.isAtField(FieldNames.summonUnitId)) { - if (!input.trySkipNullValue()) { - summonUnitId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -900612669: case -644975235: { if (input.isAtField(FieldNames.attachEntityId)) { if (!input.trySkipNullValue()) { attachEntityId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -599,6 +587,18 @@ public final class SceneSummonUnitInfoOuterClass { if (input.isAtField(FieldNames.casterEntityId)) { if (!input.trySkipNullValue()) { casterEntityId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 43438592: + case 1094873176: { + if (input.isAtField(FieldNames.summonUnitId)) { + if (!input.trySkipNullValue()) { + summonUnitId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -685,12 +685,12 @@ public final class SceneSummonUnitInfoOuterClass { static class FieldNames { static final FieldName createTimeMs = FieldName.forField("createTimeMs", "create_time_ms"); - static final FieldName summonUnitId = FieldName.forField("summonUnitId", "summon_unit_id"); - static final FieldName 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"); static final FieldName triggerNameList = FieldName.forField("triggerNameList", "trigger_name_list"); diff --git a/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java index 73de33f..76187ed 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 = 5; + * repeated uint32 search_uid_list = 13; */ private final RepeatedInt searchUidList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 5; + * repeated uint32 search_uid_list = 13; * @return whether the searchUidList field is set */ public boolean hasSearchUidList() { @@ -43,7 +43,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 5; + * repeated uint32 search_uid_list = 13; * @return this */ public SearchPlayerCsReq clearSearchUidList() { @@ -53,7 +53,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 5; + * repeated uint32 search_uid_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 5; + * repeated uint32 search_uid_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 5; + * repeated uint32 search_uid_list = 13; * @param value the searchUidList to add * @return this */ @@ -92,7 +92,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 5; + * repeated uint32 search_uid_list = 13; * @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) 40); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(searchUidList.array()[i]); } } @@ -185,7 +185,7 @@ public final class SearchPlayerCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 42: { + case 106: { // searchUidList [packed=true] input.readPackedUInt32(searchUidList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class SearchPlayerCsReqOuterClass { tag = input.readTag(); break; } - case 40: { + case 104: { // 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 0f231e3..d912a49 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 = 1; + * optional uint32 retcode = 11; */ private int retcode; /** - * repeated .SimpleInfo search_result_list = 15; + * repeated .SimpleInfo search_result_list = 2; */ private final RepeatedMessage searchResultList = RepeatedMessage.newEmptyInstance(SimpleInfoOuterClass.SimpleInfo.getFactory()); @@ -40,7 +40,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 11; * @return this */ public SearchPlayerScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 11; * @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 = 2; * @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 = 2; * @return this */ public SearchPlayerScRsp clearSearchResultList() { @@ -95,7 +95,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 15; + * repeated .SimpleInfo search_result_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 15; + * repeated .SimpleInfo search_result_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 15; + * repeated .SimpleInfo search_result_list = 2; * @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 = 2; * @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) 8); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < searchResultList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 18); output.writeMessageNoTag(searchResultList.get(i)); } } @@ -241,16 +241,16 @@ public final class SearchPlayerScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 18) { break; } } - case 122: { + case 18: { // 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 6884462..8da037e 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 = 2; + * optional uint32 bubble_id = 5; */ private int bubbleId; @@ -34,7 +34,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 2; + * optional uint32 bubble_id = 5; * @return whether the bubbleId field is set */ public boolean hasBubbleId() { @@ -42,7 +42,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 2; + * optional uint32 bubble_id = 5; * @return this */ public SelectChatBubbleCsReq clearBubbleId() { @@ -52,7 +52,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 2; + * optional uint32 bubble_id = 5; * @return the bubbleId */ public int getBubbleId() { @@ -60,7 +60,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 2; + * optional uint32 bubble_id = 5; * @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) 16); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(bubbleId); } } @@ -150,7 +150,7 @@ public final class SelectChatBubbleCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 40: { // bubbleId bubbleId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SelectChatBubbleScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectChatBubbleScRspOuterClass.java index fbd33f1..fb4d63c 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectChatBubbleScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectChatBubbleScRspOuterClass.java @@ -19,7 +19,7 @@ public final class SelectChatBubbleScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 5; */ private int retcode; @@ -39,7 +39,7 @@ public final class SelectChatBubbleScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SelectChatBubbleScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 5; * @return this */ public SelectChatBubbleScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SelectChatBubbleScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SelectChatBubbleScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -177,7 +177,7 @@ public final class SelectChatBubbleScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { @@ -205,7 +205,7 @@ public final class SelectChatBubbleScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 40: { // retcode retcode = 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 ed0335b..91286d8 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 = 12; + * optional uint32 theme_id = 5; */ private int themeId; @@ -34,7 +34,7 @@ public final class SelectPhoneThemeCsReqOuterClass { } /** - * optional uint32 theme_id = 12; + * optional uint32 theme_id = 5; * @return whether the themeId field is set */ public boolean hasThemeId() { @@ -42,7 +42,7 @@ public final class SelectPhoneThemeCsReqOuterClass { } /** - * optional uint32 theme_id = 12; + * optional uint32 theme_id = 5; * @return this */ public SelectPhoneThemeCsReq clearThemeId() { @@ -52,7 +52,7 @@ public final class SelectPhoneThemeCsReqOuterClass { } /** - * optional uint32 theme_id = 12; + * optional uint32 theme_id = 5; * @return the themeId */ public int getThemeId() { @@ -60,7 +60,7 @@ public final class SelectPhoneThemeCsReqOuterClass { } /** - * optional uint32 theme_id = 12; + * optional uint32 theme_id = 5; * @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) 96); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(themeId); } } @@ -150,7 +150,7 @@ public final class SelectPhoneThemeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 40: { // 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 88b52ed..f6f0c3b 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java @@ -19,12 +19,12 @@ public final class SelectPhoneThemeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_phone_theme = 2; + * optional uint32 cur_phone_theme = 1; */ private int curPhoneTheme; /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; */ private int retcode; @@ -39,7 +39,7 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 2; + * optional uint32 cur_phone_theme = 1; * @return whether the curPhoneTheme field is set */ public boolean hasCurPhoneTheme() { @@ -47,7 +47,7 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 2; + * optional uint32 cur_phone_theme = 1; * @return this */ public SelectPhoneThemeScRsp clearCurPhoneTheme() { @@ -57,7 +57,7 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 2; + * optional uint32 cur_phone_theme = 1; * @return the curPhoneTheme */ public int getCurPhoneTheme() { @@ -65,7 +65,7 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 2; + * optional uint32 cur_phone_theme = 1; * @param value the curPhoneTheme to set * @return this */ @@ -76,7 +76,7 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -84,7 +84,7 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @return this */ public SelectPhoneThemeScRsp clearRetcode() { @@ -94,7 +94,7 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -102,7 +102,7 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -177,11 +177,11 @@ public final class SelectPhoneThemeScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(curPhoneTheme); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } } @@ -205,16 +205,16 @@ public final class SelectPhoneThemeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 8: { // curPhoneTheme curPhoneTheme = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 120) { break; } } - case 112: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventCsReqOuterClass.java index c507090..0e1e2f8 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class SelectRogueDialogueEventCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 dialogue_event_id = 3; + * optional uint32 dialogue_event_id = 6; */ private int dialogueEventId; /** - * optional uint32 entity_id = 6; + * optional uint32 entity_id = 14; */ private int entityId; @@ -39,7 +39,7 @@ public final class SelectRogueDialogueEventCsReqOuterClass { } /** - * optional uint32 dialogue_event_id = 3; + * optional uint32 dialogue_event_id = 6; * @return whether the dialogueEventId field is set */ public boolean hasDialogueEventId() { @@ -47,7 +47,7 @@ public final class SelectRogueDialogueEventCsReqOuterClass { } /** - * optional uint32 dialogue_event_id = 3; + * optional uint32 dialogue_event_id = 6; * @return this */ public SelectRogueDialogueEventCsReq clearDialogueEventId() { @@ -57,7 +57,7 @@ public final class SelectRogueDialogueEventCsReqOuterClass { } /** - * optional uint32 dialogue_event_id = 3; + * optional uint32 dialogue_event_id = 6; * @return the dialogueEventId */ public int getDialogueEventId() { @@ -65,7 +65,7 @@ public final class SelectRogueDialogueEventCsReqOuterClass { } /** - * optional uint32 dialogue_event_id = 3; + * optional uint32 dialogue_event_id = 6; * @param value the dialogueEventId to set * @return this */ @@ -76,7 +76,7 @@ public final class SelectRogueDialogueEventCsReqOuterClass { } /** - * optional uint32 entity_id = 6; + * optional uint32 entity_id = 14; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -84,7 +84,7 @@ public final class SelectRogueDialogueEventCsReqOuterClass { } /** - * optional uint32 entity_id = 6; + * optional uint32 entity_id = 14; * @return this */ public SelectRogueDialogueEventCsReq clearEntityId() { @@ -94,7 +94,7 @@ public final class SelectRogueDialogueEventCsReqOuterClass { } /** - * optional uint32 entity_id = 6; + * optional uint32 entity_id = 14; * @return the entityId */ public int getEntityId() { @@ -102,7 +102,7 @@ public final class SelectRogueDialogueEventCsReqOuterClass { } /** - * optional uint32 entity_id = 6; + * optional uint32 entity_id = 14; * @param value the entityId to set * @return this */ @@ -177,11 +177,11 @@ public final class SelectRogueDialogueEventCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(dialogueEventId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(entityId); } } @@ -205,16 +205,16 @@ public final class SelectRogueDialogueEventCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 48: { // dialogueEventId dialogueEventId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 112) { break; } } - case 48: { + case 112: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventScRspOuterClass.java index 9f435b9..c9e099f 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventScRspOuterClass.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.RepeatedMessage; public final class SelectRogueDialogueEventScRspOuterClass { /** @@ -20,24 +19,24 @@ public final class SelectRogueDialogueEventScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 dialogue_event_id = 9; - */ - private int dialogueEventId; - - /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional .RogueDialogueEvent event_data = 14; + * optional uint32 dialogue_event_id = 4; */ - private final RogueDialogueEventOuterClass.RogueDialogueEvent eventData = RogueDialogueEventOuterClass.RogueDialogueEvent.newInstance(); + private int dialogueEventId; /** - * repeated .DialogueResult dialogue_result = 6; + * optional .DialogueResult dialogue_result = 8; */ - private final RepeatedMessage dialogueResult = RepeatedMessage.newEmptyInstance(DialogueResultOuterClass.DialogueResult.getFactory()); + private final DialogueResultOuterClass.DialogueResult dialogueResult = DialogueResultOuterClass.DialogueResult.newInstance(); + + /** + * optional .RogueDialogueEvent event_data = 10; + */ + private final RogueDialogueEventOuterClass.RogueDialogueEvent eventData = RogueDialogueEventOuterClass.RogueDialogueEvent.newInstance(); private SelectRogueDialogueEventScRsp() { } @@ -50,62 +49,25 @@ public final class SelectRogueDialogueEventScRspOuterClass { } /** - * optional uint32 dialogue_event_id = 9; - * @return whether the dialogueEventId field is set + * optional uint32 retcode = 1; + * @return whether the retcode field is set */ - public boolean hasDialogueEventId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 dialogue_event_id = 9; - * @return this - */ - public SelectRogueDialogueEventScRsp clearDialogueEventId() { - bitField0_ &= ~0x00000001; - dialogueEventId = 0; - return this; - } - - /** - * optional uint32 dialogue_event_id = 9; - * @return the dialogueEventId - */ - public int getDialogueEventId() { - return dialogueEventId; - } - - /** - * optional uint32 dialogue_event_id = 9; - * @param value the dialogueEventId to set - * @return this - */ - public SelectRogueDialogueEventScRsp setDialogueEventId(final int value) { - bitField0_ |= 0x00000001; - dialogueEventId = 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 = 1; * @return this */ public SelectRogueDialogueEventScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -113,36 +75,131 @@ public final class SelectRogueDialogueEventScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ public SelectRogueDialogueEventScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional .RogueDialogueEvent event_data = 14; - * @return whether the eventData field is set + * optional uint32 dialogue_event_id = 4; + * @return whether the dialogueEventId field is set */ - public boolean hasEventData() { + public boolean hasDialogueEventId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 dialogue_event_id = 4; + * @return this + */ + public SelectRogueDialogueEventScRsp clearDialogueEventId() { + bitField0_ &= ~0x00000002; + dialogueEventId = 0; + return this; + } + + /** + * optional uint32 dialogue_event_id = 4; + * @return the dialogueEventId + */ + public int getDialogueEventId() { + return dialogueEventId; + } + + /** + * optional uint32 dialogue_event_id = 4; + * @param value the dialogueEventId to set + * @return this + */ + public SelectRogueDialogueEventScRsp setDialogueEventId(final int value) { + bitField0_ |= 0x00000002; + dialogueEventId = value; + return this; + } + + /** + * optional .DialogueResult dialogue_result = 8; + * @return whether the dialogueResult field is set + */ + public boolean hasDialogueResult() { return (bitField0_ & 0x00000004) != 0; } /** - * optional .RogueDialogueEvent event_data = 14; + * optional .DialogueResult dialogue_result = 8; + * @return this + */ + public SelectRogueDialogueEventScRsp clearDialogueResult() { + bitField0_ &= ~0x00000004; + dialogueResult.clear(); + return this; + } + + /** + * optional .DialogueResult dialogue_result = 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 #getMutableDialogueResult()} if you want to modify it. + * + * @return internal storage object for reading + */ + public DialogueResultOuterClass.DialogueResult getDialogueResult() { + return dialogueResult; + } + + /** + * optional .DialogueResult dialogue_result = 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 DialogueResultOuterClass.DialogueResult getMutableDialogueResult() { + bitField0_ |= 0x00000004; + return dialogueResult; + } + + /** + * optional .DialogueResult dialogue_result = 8; + * @param value the dialogueResult to set + * @return this + */ + public SelectRogueDialogueEventScRsp setDialogueResult( + final DialogueResultOuterClass.DialogueResult value) { + bitField0_ |= 0x00000004; + dialogueResult.copyFrom(value); + return this; + } + + /** + * optional .RogueDialogueEvent event_data = 10; + * @return whether the eventData field is set + */ + public boolean hasEventData() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .RogueDialogueEvent event_data = 10; * @return this */ public SelectRogueDialogueEventScRsp clearEventData() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; eventData.clear(); return this; } /** - * optional .RogueDialogueEvent event_data = 14; + * optional .RogueDialogueEvent event_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. @@ -156,7 +213,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { } /** - * optional .RogueDialogueEvent event_data = 14; + * optional .RogueDialogueEvent event_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 @@ -165,101 +222,31 @@ public final class SelectRogueDialogueEventScRspOuterClass { * @return internal storage object for modifications */ public RogueDialogueEventOuterClass.RogueDialogueEvent getMutableEventData() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return eventData; } /** - * optional .RogueDialogueEvent event_data = 14; + * optional .RogueDialogueEvent event_data = 10; * @param value the eventData to set * @return this */ public SelectRogueDialogueEventScRsp setEventData( final RogueDialogueEventOuterClass.RogueDialogueEvent value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; eventData.copyFrom(value); return this; } - /** - * repeated .DialogueResult dialogue_result = 6; - * @return whether the dialogueResult field is set - */ - public boolean hasDialogueResult() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated .DialogueResult dialogue_result = 6; - * @return this - */ - public SelectRogueDialogueEventScRsp clearDialogueResult() { - bitField0_ &= ~0x00000008; - dialogueResult.clear(); - return this; - } - - /** - * repeated .DialogueResult dialogue_result = 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 #getMutableDialogueResult()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getDialogueResult() { - return dialogueResult; - } - - /** - * repeated .DialogueResult dialogue_result = 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 getMutableDialogueResult() { - bitField0_ |= 0x00000008; - return dialogueResult; - } - - /** - * repeated .DialogueResult dialogue_result = 6; - * @param value the dialogueResult to add - * @return this - */ - public SelectRogueDialogueEventScRsp addDialogueResult( - final DialogueResultOuterClass.DialogueResult value) { - bitField0_ |= 0x00000008; - dialogueResult.add(value); - return this; - } - - /** - * repeated .DialogueResult dialogue_result = 6; - * @param values the dialogueResult to add - * @return this - */ - public SelectRogueDialogueEventScRsp addAllDialogueResult( - final DialogueResultOuterClass.DialogueResult... values) { - bitField0_ |= 0x00000008; - dialogueResult.addAll(values); - return this; - } - @Override public SelectRogueDialogueEventScRsp copyFrom(final SelectRogueDialogueEventScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - dialogueEventId = other.dialogueEventId; retcode = other.retcode; - eventData.copyFrom(other.eventData); + dialogueEventId = other.dialogueEventId; dialogueResult.copyFrom(other.dialogueResult); + eventData.copyFrom(other.eventData); } return this; } @@ -270,17 +257,17 @@ public final class SelectRogueDialogueEventScRspOuterClass { return this; } cachedSize = -1; - if (other.hasDialogueEventId()) { - setDialogueEventId(other.dialogueEventId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasEventData()) { - getMutableEventData().mergeFrom(other.eventData); + if (other.hasDialogueEventId()) { + setDialogueEventId(other.dialogueEventId); } if (other.hasDialogueResult()) { - getMutableDialogueResult().addAll(other.dialogueResult); + getMutableDialogueResult().mergeFrom(other.dialogueResult); + } + if (other.hasEventData()) { + getMutableEventData().mergeFrom(other.eventData); } return this; } @@ -292,10 +279,10 @@ public final class SelectRogueDialogueEventScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - dialogueEventId = 0; retcode = 0; - eventData.clear(); + dialogueEventId = 0; dialogueResult.clear(); + eventData.clear(); return this; } @@ -306,8 +293,8 @@ public final class SelectRogueDialogueEventScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - eventData.clearQuick(); dialogueResult.clearQuick(); + eventData.clearQuick(); return this; } @@ -321,31 +308,29 @@ public final class SelectRogueDialogueEventScRspOuterClass { } SelectRogueDialogueEventScRsp other = (SelectRogueDialogueEventScRsp) o; return bitField0_ == other.bitField0_ - && (!hasDialogueEventId() || dialogueEventId == other.dialogueEventId) && (!hasRetcode() || retcode == other.retcode) - && (!hasEventData() || eventData.equals(other.eventData)) - && (!hasDialogueResult() || dialogueResult.equals(other.dialogueResult)); + && (!hasDialogueEventId() || dialogueEventId == other.dialogueEventId) + && (!hasDialogueResult() || dialogueResult.equals(other.dialogueResult)) + && (!hasEventData() || eventData.equals(other.eventData)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(dialogueEventId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(dialogueEventId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(eventData); + output.writeRawByte((byte) 66); + output.writeMessageNoTag(dialogueResult); } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < dialogueResult.length(); i++) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(dialogueResult.get(i)); - } + output.writeRawByte((byte) 82); + output.writeMessageNoTag(eventData); } } @@ -353,16 +338,16 @@ public final class SelectRogueDialogueEventScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueEventId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueEventId); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(eventData); + size += 1 + ProtoSink.computeMessageSizeNoTag(dialogueResult); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * dialogueResult.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dialogueResult); + size += 1 + ProtoSink.computeMessageSizeNoTag(eventData); } return size; } @@ -374,37 +359,38 @@ public final class SelectRogueDialogueEventScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // dialogueEventId - dialogueEventId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 8: { // retcode retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // dialogueEventId + dialogueEventId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 114) { + if (tag != 66) { break; } } - case 114: { - // eventData - input.readMessage(eventData); + case 66: { + // dialogueResult + input.readMessage(dialogueResult); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 50) { + if (tag != 82) { break; } } - case 50: { - // dialogueResult - tag = input.readRepeatedMessage(dialogueResult, tag); + case 82: { + // eventData + input.readMessage(eventData); bitField0_ |= 0x00000008; + tag = input.readTag(); if (tag != 0) { break; } @@ -427,16 +413,16 @@ public final class SelectRogueDialogueEventScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.dialogueEventId, dialogueEventId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.dialogueEventId, dialogueEventId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.eventData, eventData); + output.writeMessage(FieldNames.dialogueResult, dialogueResult); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedMessage(FieldNames.dialogueResult, dialogueResult); + output.writeMessage(FieldNames.eventData, eventData); } output.endObject(); } @@ -448,11 +434,10 @@ public final class SelectRogueDialogueEventScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 88389725: - case 1671736167: { - if (input.isAtField(FieldNames.dialogueEventId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - dialogueEventId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -460,10 +445,11 @@ public final class SelectRogueDialogueEventScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 88389725: + case 1671736167: { + if (input.isAtField(FieldNames.dialogueEventId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + dialogueEventId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -471,23 +457,23 @@ public final class SelectRogueDialogueEventScRspOuterClass { } break; } + case 1191037973: + case 1574283364: { + if (input.isAtField(FieldNames.dialogueResult)) { + if (!input.trySkipNullValue()) { + input.readMessage(dialogueResult); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } case 30931300: case 983877167: { if (input.isAtField(FieldNames.eventData)) { if (!input.trySkipNullValue()) { input.readMessage(eventData); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1191037973: - case 1574283364: { - if (input.isAtField(FieldNames.dialogueResult)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(dialogueResult); bitField0_ |= 0x00000008; } } else { @@ -550,13 +536,13 @@ public final class SelectRogueDialogueEventScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName dialogueEventId = FieldName.forField("dialogueEventId", "dialogue_event_id"); - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName eventData = FieldName.forField("eventData", "event_data"); + static final FieldName dialogueEventId = FieldName.forField("dialogueEventId", "dialogue_event_id"); static final FieldName dialogueResult = FieldName.forField("dialogueResult", "dialogue_result"); + + static final FieldName eventData = FieldName.forField("eventData", "event_data"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java index 04b8125..7444cc1 100644 --- a/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SellItemCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool to_material = 1; + * optional bool to_material = 7; */ private boolean toMaterial; @@ -39,7 +39,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 1; + * optional bool to_material = 7; * @return whether the toMaterial field is set */ public boolean hasToMaterial() { @@ -47,7 +47,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 1; + * optional bool to_material = 7; * @return this */ public SellItemCsReq clearToMaterial() { @@ -57,7 +57,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 1; + * optional bool to_material = 7; * @return the toMaterial */ public boolean getToMaterial() { @@ -65,7 +65,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 1; + * optional bool to_material = 7; * @param value the toMaterial to set * @return this */ @@ -198,7 +198,7 @@ public final class SellItemCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 56); output.writeBoolNoTag(toMaterial); } if ((bitField0_ & 0x00000002) != 0) { @@ -226,7 +226,7 @@ public final class SellItemCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 56: { // toMaterial toMaterial = input.readBool(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SellItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SellItemScRspOuterClass.java index 1dbe2e5..26013f3 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 = 1; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional .ItemList return_item_list = 2; + * optional .ItemList return_item_list = 9; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 6; * @return this */ public SellItemScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 2; + * optional .ItemList return_item_list = 9; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -84,7 +84,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 2; + * optional .ItemList return_item_list = 9; * @return this */ public SellItemScRsp clearReturnItemList() { @@ -94,7 +94,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 2; + * optional .ItemList return_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. @@ -108,7 +108,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 2; + * optional .ItemList return_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 @@ -122,7 +122,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 2; + * optional .ItemList return_item_list = 9; * @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) 8); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 74); output.writeMessageNoTag(returnItemList); } } @@ -226,16 +226,16 @@ public final class SellItemScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 74) { break; } } - case 18: { + case 74: { // 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 60c59f0..9bb12b2 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 = 13; + * optional uint32 emote = 12; */ private int emote; /** - * optional .MsgType msg_type = 5; + * optional .MsgType msg_type = 11; */ private int msgType; /** - * optional .ChatType chat_type = 6; + * optional .ChatType chat_type = 15; */ private int chatType; /** - * optional string text = 12; + * optional string text = 2; */ private final Utf8String text = Utf8String.newEmptyInstance(); /** - * repeated uint32 to_uid_list = 4; + * repeated uint32 to_uid_list = 10; */ private final RepeatedInt toUidList = RepeatedInt.newEmptyInstance(); @@ -56,7 +56,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 13; + * optional uint32 emote = 12; * @return whether the emote field is set */ public boolean hasEmote() { @@ -64,7 +64,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 13; + * optional uint32 emote = 12; * @return this */ public SendMsgCsReq clearEmote() { @@ -74,7 +74,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 13; + * optional uint32 emote = 12; * @return the emote */ public int getEmote() { @@ -82,7 +82,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 13; + * optional uint32 emote = 12; * @param value the emote to set * @return this */ @@ -93,7 +93,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .MsgType msg_type = 5; + * optional .MsgType msg_type = 11; * @return whether the msgType field is set */ public boolean hasMsgType() { @@ -101,7 +101,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .MsgType msg_type = 5; + * optional .MsgType msg_type = 11; * @return this */ public SendMsgCsReq clearMsgType() { @@ -111,7 +111,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .MsgType msg_type = 5; + * optional .MsgType msg_type = 11; * @return the msgType */ public MsgTypeOuterClass.MsgType getMsgType() { @@ -144,7 +144,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .MsgType msg_type = 5; + * optional .MsgType msg_type = 11; * @param value the msgType to set * @return this */ @@ -155,7 +155,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .ChatType chat_type = 6; + * optional .ChatType chat_type = 15; * @return whether the chatType field is set */ public boolean hasChatType() { @@ -163,7 +163,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .ChatType chat_type = 6; + * optional .ChatType chat_type = 15; * @return this */ public SendMsgCsReq clearChatType() { @@ -173,7 +173,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .ChatType chat_type = 6; + * optional .ChatType chat_type = 15; * @return the chatType */ public ChatTypeOuterClass.ChatType getChatType() { @@ -206,7 +206,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .ChatType chat_type = 6; + * optional .ChatType chat_type = 15; * @param value the chatType to set * @return this */ @@ -217,7 +217,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 12; + * optional string text = 2; * @return whether the text field is set */ public boolean hasText() { @@ -225,7 +225,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 12; + * optional string text = 2; * @return this */ public SendMsgCsReq clearText() { @@ -235,7 +235,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 12; + * optional string text = 2; * @return the text */ public String getText() { @@ -243,7 +243,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 12; + * optional string text = 2; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -251,7 +251,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 12; + * optional string text = 2; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -260,7 +260,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 12; + * optional string text = 2; * @param value the text to set * @return this */ @@ -271,7 +271,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 12; + * optional string text = 2; * @param value the text to set * @return this */ @@ -282,7 +282,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 4; + * repeated uint32 to_uid_list = 10; * @return whether the toUidList field is set */ public boolean hasToUidList() { @@ -290,7 +290,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 4; + * repeated uint32 to_uid_list = 10; * @return this */ public SendMsgCsReq clearToUidList() { @@ -300,7 +300,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 4; + * repeated uint32 to_uid_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. @@ -314,7 +314,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 4; + * repeated uint32 to_uid_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 @@ -328,7 +328,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 4; + * repeated uint32 to_uid_list = 10; * @param value the toUidList to add * @return this */ @@ -339,7 +339,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 4; + * repeated uint32 to_uid_list = 10; * @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) 104); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(emote); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 88); output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 120); output.writeEnumNoTag(chatType); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 18); output.writeStringNoTag(text); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < toUidList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(toUidList.array()[i]); } } @@ -485,16 +485,16 @@ public final class SendMsgCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 96: { // emote emote = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 88) { break; } } - case 40: { + case 88: { // msgType final int value = input.readInt32(); if (MsgTypeOuterClass.MsgType.forNumber(value) != null) { @@ -502,11 +502,11 @@ public final class SendMsgCsReqOuterClass { bitField0_ |= 0x00000002; } tag = input.readTag(); - if (tag != 48) { + if (tag != 120) { break; } } - case 48: { + case 120: { // chatType final int value = input.readInt32(); if (ChatTypeOuterClass.ChatType.forNumber(value) != null) { @@ -514,20 +514,20 @@ public final class SendMsgCsReqOuterClass { bitField0_ |= 0x00000004; } tag = input.readTag(); - if (tag != 98) { + if (tag != 18) { break; } } - case 98: { + case 18: { // text input.readString(text); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 34) { + if (tag != 82) { break; } } - case 34: { + case 82: { // toUidList [packed=true] input.readPackedUInt32(toUidList, tag); bitField0_ |= 0x00000010; @@ -546,7 +546,7 @@ public final class SendMsgCsReqOuterClass { tag = input.readTag(); break; } - case 32: { + case 80: { // toUidList [packed=false] tag = input.readRepeatedUInt32(toUidList, tag); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java index 8afb332..b754ec9 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 = 13; + * optional bool paused = 5; */ private boolean paused; @@ -34,7 +34,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 13; + * optional bool paused = 5; * @return whether the paused field is set */ public boolean hasPaused() { @@ -42,7 +42,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 13; + * optional bool paused = 5; * @return this */ public SetClientPausedCsReq clearPaused() { @@ -52,7 +52,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 13; + * optional bool paused = 5; * @return the paused */ public boolean getPaused() { @@ -60,7 +60,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 13; + * optional bool paused = 5; * @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) 104); + output.writeRawByte((byte) 40); output.writeBoolNoTag(paused); } } @@ -150,7 +150,7 @@ public final class SetClientPausedCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 40: { // 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 f1635fe..c0330e8 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 = 14; + * optional uint32 retcode = 10; */ private int retcode; /** - * optional bool paused = 1; + * optional bool paused = 13; */ private boolean paused; @@ -39,7 +39,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 10; * @return this */ public SetClientPausedScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 1; + * optional bool paused = 13; * @return whether the paused field is set */ public boolean hasPaused() { @@ -84,7 +84,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 1; + * optional bool paused = 13; * @return this */ public SetClientPausedScRsp clearPaused() { @@ -94,7 +94,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 1; + * optional bool paused = 13; * @return the paused */ public boolean getPaused() { @@ -102,7 +102,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 1; + * optional bool paused = 13; * @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) 112); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 104); output.writeBoolNoTag(paused); } } @@ -205,16 +205,16 @@ public final class SetClientPausedScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 104) { break; } } - case 8: { + case 104: { // paused paused = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetFriendMarkCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetFriendMarkCsReqOuterClass.java index 0d29848..70a3e88 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 = 4; + * optional bool is_set_mark = 7; */ 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 = 4; + * optional bool is_set_mark = 7; * @return whether the isSetMark field is set */ public boolean hasIsSetMark() { @@ -84,7 +84,7 @@ public final class SetFriendMarkCsReqOuterClass { } /** - * optional bool is_set_mark = 4; + * optional bool is_set_mark = 7; * @return this */ public SetFriendMarkCsReq clearIsSetMark() { @@ -94,7 +94,7 @@ public final class SetFriendMarkCsReqOuterClass { } /** - * optional bool is_set_mark = 4; + * optional bool is_set_mark = 7; * @return the isSetMark */ public boolean getIsSetMark() { @@ -102,7 +102,7 @@ public final class SetFriendMarkCsReqOuterClass { } /** - * optional bool is_set_mark = 4; + * optional bool is_set_mark = 7; * @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) 32); + output.writeRawByte((byte) 56); 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 != 32) { + if (tag != 56) { break; } } - case 32: { + case 56: { // 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 c745731..aa6bf6c 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 = 4; */ private int uid; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; */ private int retcode; /** - * optional bool is_set_mark = 4; + * optional bool is_set_mark = 2; */ private boolean isSetMark; @@ -44,7 +44,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 4; * @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 = 4; * @return this */ public SetFriendMarkScRsp clearUid() { @@ -62,7 +62,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 4; * @return the uid */ public int getUid() { @@ -70,7 +70,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 uid = 2; + * optional uint32 uid = 4; * @param value the uid to set * @return this */ @@ -81,7 +81,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -89,7 +89,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; * @return this */ public SetFriendMarkScRsp clearRetcode() { @@ -99,7 +99,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -107,7 +107,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; * @param value the retcode to set * @return this */ @@ -118,7 +118,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional bool is_set_mark = 4; + * optional bool is_set_mark = 2; * @return whether the isSetMark field is set */ public boolean hasIsSetMark() { @@ -126,7 +126,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional bool is_set_mark = 4; + * optional bool is_set_mark = 2; * @return this */ public SetFriendMarkScRsp clearIsSetMark() { @@ -136,7 +136,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional bool is_set_mark = 4; + * optional bool is_set_mark = 2; * @return the isSetMark */ public boolean getIsSetMark() { @@ -144,7 +144,7 @@ public final class SetFriendMarkScRspOuterClass { } /** - * optional bool is_set_mark = 4; + * optional bool is_set_mark = 2; * @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) 32); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 16); output.writeBoolNoTag(isSetMark); } } @@ -260,25 +260,25 @@ public final class SetFriendMarkScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 32: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 104) { break; } } - case 64: { + case 104: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 32) { + if (tag != 16) { break; } } - case 32: { + case 16: { // 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 5da5da3..c3f04c7 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 = 4; + * optional uint32 birthday = 5; */ private int birthday; @@ -34,7 +34,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 4; + * optional uint32 birthday = 5; * @return whether the birthday field is set */ public boolean hasBirthday() { @@ -42,7 +42,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 4; + * optional uint32 birthday = 5; * @return this */ public SetGameplayBirthdayCsReq clearBirthday() { @@ -52,7 +52,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 4; + * optional uint32 birthday = 5; * @return the birthday */ public int getBirthday() { @@ -60,7 +60,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 4; + * optional uint32 birthday = 5; * @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) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(birthday); } } @@ -150,7 +150,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 40: { // 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 87cbeee..ea29b0a 100644 --- a/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayScRspOuterClass.java @@ -19,15 +19,15 @@ public final class SetGameplayBirthdayScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; - */ - private int retcode; - - /** - * optional uint32 birthday = 11; + * optional uint32 birthday = 1; */ private int birthday; + /** + * optional uint32 retcode = 2; + */ + private int retcode; + private SetGameplayBirthdayScRsp() { } @@ -39,62 +39,25 @@ public final class SetGameplayBirthdayScRspOuterClass { } /** - * optional uint32 retcode = 1; - * @return whether the retcode field is set + * optional uint32 birthday = 1; + * @return whether the birthday field is set */ - public boolean hasRetcode() { + public boolean hasBirthday() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 1; - * @return this - */ - public SetGameplayBirthdayScRsp 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 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; - } - - /** - * optional uint32 birthday = 11; + * optional uint32 birthday = 1; * @return this */ public SetGameplayBirthdayScRsp clearBirthday() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; birthday = 0; return this; } /** - * optional uint32 birthday = 11; + * optional uint32 birthday = 1; * @return the birthday */ public int getBirthday() { @@ -102,23 +65,60 @@ public final class SetGameplayBirthdayScRspOuterClass { } /** - * optional uint32 birthday = 11; + * optional uint32 birthday = 1; * @param value the birthday to set * @return this */ public SetGameplayBirthdayScRsp setBirthday(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; birthday = value; return this; } + /** + * optional uint32 retcode = 2; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 2; + * @return this + */ + public SetGameplayBirthdayScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + 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 SetGameplayBirthdayScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + @Override public SetGameplayBirthdayScRsp copyFrom(final SetGameplayBirthdayScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; birthday = other.birthday; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public final class SetGameplayBirthdayScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasBirthday()) { setBirthday(other.birthday); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public final class SetGameplayBirthdayScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; birthday = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public final class SetGameplayBirthdayScRspOuterClass { } SetGameplayBirthdayScRsp other = (SetGameplayBirthdayScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasBirthday() || birthday == other.birthday); + && (!hasBirthday() || birthday == other.birthday) + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(retcode); + output.writeUInt32NoTag(birthday); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(birthday); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public final class SetGameplayBirthdayScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(birthday); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(birthday); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -206,17 +206,17 @@ public final class SetGameplayBirthdayScRspOuterClass { while (true) { switch (tag) { case 8: { - // retcode - retcode = input.readUInt32(); + // birthday + birthday = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 16) { break; } } - case 88: { - // birthday - birthday = input.readUInt32(); + case 16: { + // 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/SetHeadIconCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java index a149344..22cef88 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SetHeadIconCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 id = 1; + * optional uint32 id = 8; */ private int id; @@ -34,7 +34,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 8; * @return whether the id field is set */ public boolean hasId() { @@ -42,7 +42,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 8; * @return this */ public SetHeadIconCsReq clearId() { @@ -52,7 +52,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 8; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 8; * @param value the id to set * @return this */ @@ -129,7 +129,7 @@ public final class SetHeadIconCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public final class SetHeadIconCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 64: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java index c3b0faf..72f4ede 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java @@ -24,7 +24,7 @@ public final class SetHeadIconScRspOuterClass { private int retcode; /** - * optional uint32 current_head_icon_id = 13; + * optional uint32 current_head_icon_id = 6; */ private int currentHeadIconId; @@ -76,7 +76,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 13; + * optional uint32 current_head_icon_id = 6; * @return whether the currentHeadIconId field is set */ public boolean hasCurrentHeadIconId() { @@ -84,7 +84,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 13; + * optional uint32 current_head_icon_id = 6; * @return this */ public SetHeadIconScRsp clearCurrentHeadIconId() { @@ -94,7 +94,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 13; + * optional uint32 current_head_icon_id = 6; * @return the currentHeadIconId */ public int getCurrentHeadIconId() { @@ -102,7 +102,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 13; + * optional uint32 current_head_icon_id = 6; * @param value the currentHeadIconId to set * @return this */ @@ -181,7 +181,7 @@ public final class SetHeadIconScRspOuterClass { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(currentHeadIconId); } } @@ -210,11 +210,11 @@ public final class SetHeadIconScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 48) { break; } } - case 104: { + case 48: { // currentHeadIconId currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeCsReqOuterClass.java index 5ca71ef..27d2a87 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .HeroBasicType basic_type = 15; + * optional .HeroBasicType basic_type = 11; */ private int basicType; @@ -34,7 +34,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { } /** - * optional .HeroBasicType basic_type = 15; + * optional .HeroBasicType basic_type = 11; * @return whether the basicType field is set */ public boolean hasBasicType() { @@ -42,7 +42,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { } /** - * optional .HeroBasicType basic_type = 15; + * optional .HeroBasicType basic_type = 11; * @return this */ public SetHeroBasicTypeCsReq clearBasicType() { @@ -52,7 +52,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { } /** - * optional .HeroBasicType basic_type = 15; + * optional .HeroBasicType basic_type = 11; * @return the basicType */ public HeroBasicTypeOuterClass.HeroBasicType getBasicType() { @@ -85,7 +85,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { } /** - * optional .HeroBasicType basic_type = 15; + * optional .HeroBasicType basic_type = 11; * @param value the basicType to set * @return this */ @@ -154,7 +154,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 88); output.writeEnumNoTag(basicType); } } @@ -175,7 +175,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 88: { // basicType final int value = input.readInt32(); if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeScRspOuterClass.java index 04ec171..2eed921 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeScRspOuterClass.java @@ -19,12 +19,12 @@ public final class SetHeroBasicTypeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 12; */ private int retcode; /** - * optional .HeroBasicType basic_type = 10; + * optional .HeroBasicType basic_type = 6; */ private int basicType; @@ -39,7 +39,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 12; * @return this */ public SetHeroBasicTypeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional .HeroBasicType basic_type = 10; + * optional .HeroBasicType basic_type = 6; * @return whether the basicType field is set */ public boolean hasBasicType() { @@ -84,7 +84,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional .HeroBasicType basic_type = 10; + * optional .HeroBasicType basic_type = 6; * @return this */ public SetHeroBasicTypeScRsp clearBasicType() { @@ -94,7 +94,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional .HeroBasicType basic_type = 10; + * optional .HeroBasicType basic_type = 6; * @return the basicType */ public HeroBasicTypeOuterClass.HeroBasicType getBasicType() { @@ -127,7 +127,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional .HeroBasicType basic_type = 10; + * optional .HeroBasicType basic_type = 6; * @param value the basicType to set * @return this */ @@ -202,11 +202,11 @@ public final class SetHeroBasicTypeScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeEnumNoTag(basicType); } } @@ -230,16 +230,16 @@ public final class SetHeroBasicTypeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 48) { break; } } - case 80: { + case 48: { // basicType final int value = input.readInt32(); if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/SetLineupNameCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetLineupNameCsReqOuterClass.java index b332a73..e55734e 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 = 8; + * optional uint32 index = 7; */ private int index; /** - * optional string name = 7; + * optional string name = 2; */ private final Utf8String name = Utf8String.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 8; + * optional uint32 index = 7; * @return whether the index field is set */ public boolean hasIndex() { @@ -48,7 +48,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 8; + * optional uint32 index = 7; * @return this */ public SetLineupNameCsReq clearIndex() { @@ -58,7 +58,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 8; + * optional uint32 index = 7; * @return the index */ public int getIndex() { @@ -66,7 +66,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 8; + * optional uint32 index = 7; * @param value the index to set * @return this */ @@ -77,7 +77,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 7; + * optional string name = 2; * @return whether the name field is set */ public boolean hasName() { @@ -85,7 +85,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 7; + * optional string name = 2; * @return this */ public SetLineupNameCsReq clearName() { @@ -95,7 +95,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 7; + * optional string name = 2; * @return the name */ public String getName() { @@ -103,7 +103,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 7; + * optional string name = 2; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -111,7 +111,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 7; + * optional string name = 2; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -120,7 +120,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 7; + * optional string name = 2; * @param value the name to set * @return this */ @@ -131,7 +131,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 7; + * optional string name = 2; * @param value the name to set * @return this */ @@ -207,11 +207,11 @@ public final class SetLineupNameCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 18); output.writeStringNoTag(name); } } @@ -235,16 +235,16 @@ public final class SetLineupNameCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 56: { // index index = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 18) { break; } } - case 58: { + case 18: { // name input.readString(name); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetLineupNameScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetLineupNameScRspOuterClass.java index 76468e7..edaae0a 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 index = 6; + * optional uint32 index = 5; */ private int index; /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 13; */ private int retcode; /** - * optional string name = 15; + * optional string name = 9; */ private final Utf8String name = Utf8String.newEmptyInstance(); @@ -45,7 +45,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 index = 6; + * optional uint32 index = 5; * @return whether the index field is set */ public boolean hasIndex() { @@ -53,7 +53,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 index = 6; + * optional uint32 index = 5; * @return this */ public SetLineupNameScRsp clearIndex() { @@ -63,7 +63,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 index = 6; + * optional uint32 index = 5; * @return the index */ public int getIndex() { @@ -71,7 +71,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 index = 6; + * optional uint32 index = 5; * @param value the index to set * @return this */ @@ -82,7 +82,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -90,7 +90,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 13; * @return this */ public SetLineupNameScRsp clearRetcode() { @@ -100,7 +100,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -108,7 +108,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 13; * @param value the retcode to set * @return this */ @@ -119,7 +119,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 15; + * optional string name = 9; * @return whether the name field is set */ public boolean hasName() { @@ -127,7 +127,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 15; + * optional string name = 9; * @return this */ public SetLineupNameScRsp clearName() { @@ -137,7 +137,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 15; + * optional string name = 9; * @return the name */ public String getName() { @@ -145,7 +145,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 15; + * optional string name = 9; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -153,7 +153,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 15; + * optional string name = 9; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -162,7 +162,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 15; + * optional string name = 9; * @param value the name to set * @return this */ @@ -173,7 +173,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 15; + * optional string name = 9; * @param value the name to set * @return this */ @@ -255,15 +255,15 @@ public final class SetLineupNameScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 74); output.writeStringNoTag(name); } } @@ -290,25 +290,25 @@ public final class SetLineupNameScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 40: { // index index = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 104) { break; } } - case 72: { + case 104: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 74) { break; } } - case 122: { + case 74: { // name input.readString(name); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SetNicknameCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetNicknameCsReqOuterClass.java index 1394222..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 = 14; + * optional string nickname = 2; */ private final Utf8String nickname = Utf8String.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 14; + * 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 = 14; + * optional string nickname = 2; * @return this */ public SetNicknameCsReq clearNickname() { @@ -53,7 +53,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 14; + * optional string nickname = 2; * @return the nickname */ public String getNickname() { @@ -61,7 +61,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 14; + * 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 = 14; + * 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 = 14; + * optional string nickname = 2; * @param value the nickname to set * @return this */ @@ -89,7 +89,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 14; + * 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) 114); + output.writeRawByte((byte) 18); output.writeStringNoTag(nickname); } } @@ -180,7 +180,7 @@ public final class SetNicknameCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + 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 11d25a7..75c7a6c 100644 --- a/src/generated/main/emu/lunarcore/proto/SetSignatureCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetSignatureCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class SetSignatureCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional string signature = 8; + * optional string signature = 1; */ private final Utf8String signature = Utf8String.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 8; + * optional string signature = 1; * @return whether the signature field is set */ public boolean hasSignature() { @@ -43,7 +43,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 8; + * optional string signature = 1; * @return this */ public SetSignatureCsReq clearSignature() { @@ -53,7 +53,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 8; + * optional string signature = 1; * @return the signature */ public String getSignature() { @@ -61,7 +61,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 8; + * optional string signature = 1; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -69,7 +69,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 8; + * optional string signature = 1; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -78,7 +78,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 8; + * optional string signature = 1; * @param value the signature to set * @return this */ @@ -89,7 +89,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 8; + * optional string signature = 1; * @param value the signature to set * @return this */ @@ -159,7 +159,7 @@ public final class SetSignatureCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 10); output.writeStringNoTag(signature); } } @@ -180,7 +180,7 @@ public final class SetSignatureCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 10: { // 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 39ad9ed..8d0f44d 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 = 14; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional string signature = 8; + * optional string signature = 9; */ private final Utf8String signature = Utf8String.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 8; * @return this */ public SetSignatureScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 8; + * optional string signature = 9; * @return whether the signature field is set */ public boolean hasSignature() { @@ -85,7 +85,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 8; + * optional string signature = 9; * @return this */ public SetSignatureScRsp clearSignature() { @@ -95,7 +95,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 8; + * optional string signature = 9; * @return the signature */ public String getSignature() { @@ -103,7 +103,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 8; + * optional string signature = 9; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -111,7 +111,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 8; + * optional string signature = 9; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -120,7 +120,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 8; + * optional string signature = 9; * @param value the signature to set * @return this */ @@ -131,7 +131,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 8; + * optional string signature = 9; * @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) 112); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 74); output.writeStringNoTag(signature); } } @@ -235,16 +235,16 @@ public final class SetSignatureScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 74) { break; } } - case 66: { + case 74: { // 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 0ab7db2..f29cbc8 100644 --- a/src/generated/main/emu/lunarcore/proto/ShopOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ShopOuterClass.java @@ -19,38 +19,38 @@ public final class ShopOuterClass { public static final class Shop extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional int64 end_time = 2; + */ + private long endTime; + /** * optional int64 begin_time = 4; */ private long beginTime; /** - * optional int64 end_time = 10; - */ - private long endTime; - - /** - * optional uint64 city_taken_level_reward = 14; + * optional uint64 city_taken_level_reward = 11; */ private long cityTakenLevelReward; /** - * optional uint32 city_exp = 1; + * optional uint32 city_exp = 9; */ private int cityExp; /** - * optional uint32 shop_id = 7; - */ - private int shopId; - - /** - * optional uint32 city_level = 13; + * optional uint32 city_level = 12; */ private int cityLevel; /** - * repeated .Goods goods_list = 8; + * optional uint32 shop_id = 13; + */ + private int shopId; + + /** + * repeated .Goods goods_list = 7; */ private final RepeatedMessage goodsList = RepeatedMessage.newEmptyInstance(GoodsOuterClass.Goods.getFactory()); @@ -64,12 +64,49 @@ public final class ShopOuterClass { return new Shop(); } + /** + * optional int64 end_time = 2; + * @return whether the endTime field is set + */ + public boolean hasEndTime() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional int64 end_time = 2; + * @return this + */ + public Shop clearEndTime() { + bitField0_ &= ~0x00000001; + endTime = 0L; + return this; + } + + /** + * optional int64 end_time = 2; + * @return the endTime + */ + public long getEndTime() { + return endTime; + } + + /** + * optional int64 end_time = 2; + * @param value the endTime to set + * @return this + */ + public Shop setEndTime(final long value) { + bitField0_ |= 0x00000001; + endTime = value; + return this; + } + /** * optional int64 begin_time = 4; * @return whether the beginTime field is set */ public boolean hasBeginTime() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -77,7 +114,7 @@ public final class ShopOuterClass { * @return this */ public Shop clearBeginTime() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; beginTime = 0L; return this; } @@ -96,50 +133,13 @@ public final class ShopOuterClass { * @return this */ public Shop setBeginTime(final long value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; beginTime = value; return this; } /** - * optional int64 end_time = 10; - * @return whether the endTime field is set - */ - public boolean hasEndTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 end_time = 10; - * @return this - */ - public Shop 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 Shop setEndTime(final long value) { - bitField0_ |= 0x00000002; - endTime = value; - return this; - } - - /** - * optional uint64 city_taken_level_reward = 14; + * optional uint64 city_taken_level_reward = 11; * @return whether the cityTakenLevelReward field is set */ public boolean hasCityTakenLevelReward() { @@ -147,7 +147,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 14; + * optional uint64 city_taken_level_reward = 11; * @return this */ public Shop clearCityTakenLevelReward() { @@ -157,7 +157,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 14; + * optional uint64 city_taken_level_reward = 11; * @return the cityTakenLevelReward */ public long getCityTakenLevelReward() { @@ -165,7 +165,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 14; + * optional uint64 city_taken_level_reward = 11; * @param value the cityTakenLevelReward to set * @return this */ @@ -176,7 +176,7 @@ public final class ShopOuterClass { } /** - * optional uint32 city_exp = 1; + * optional uint32 city_exp = 9; * @return whether the cityExp field is set */ public boolean hasCityExp() { @@ -184,7 +184,7 @@ public final class ShopOuterClass { } /** - * optional uint32 city_exp = 1; + * optional uint32 city_exp = 9; * @return this */ public Shop clearCityExp() { @@ -194,7 +194,7 @@ public final class ShopOuterClass { } /** - * optional uint32 city_exp = 1; + * optional uint32 city_exp = 9; * @return the cityExp */ public int getCityExp() { @@ -202,7 +202,7 @@ public final class ShopOuterClass { } /** - * optional uint32 city_exp = 1; + * optional uint32 city_exp = 9; * @param value the cityExp to set * @return this */ @@ -213,62 +213,25 @@ public final class ShopOuterClass { } /** - * optional uint32 shop_id = 7; - * @return whether the shopId field is set + * optional uint32 city_level = 12; + * @return whether the cityLevel field is set */ - public boolean hasShopId() { + public boolean hasCityLevel() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 shop_id = 7; - * @return this - */ - public Shop clearShopId() { - bitField0_ &= ~0x00000010; - shopId = 0; - return this; - } - - /** - * optional uint32 shop_id = 7; - * @return the shopId - */ - public int getShopId() { - return shopId; - } - - /** - * optional uint32 shop_id = 7; - * @param value the shopId to set - * @return this - */ - public Shop setShopId(final int value) { - bitField0_ |= 0x00000010; - shopId = value; - return this; - } - - /** - * optional uint32 city_level = 13; - * @return whether the cityLevel field is set - */ - public boolean hasCityLevel() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 city_level = 13; + * optional uint32 city_level = 12; * @return this */ public Shop clearCityLevel() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; cityLevel = 0; return this; } /** - * optional uint32 city_level = 13; + * optional uint32 city_level = 12; * @return the cityLevel */ public int getCityLevel() { @@ -276,18 +239,55 @@ public final class ShopOuterClass { } /** - * optional uint32 city_level = 13; + * optional uint32 city_level = 12; * @param value the cityLevel to set * @return this */ public Shop setCityLevel(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; cityLevel = value; return this; } /** - * repeated .Goods goods_list = 8; + * optional uint32 shop_id = 13; + * @return whether the shopId field is set + */ + public boolean hasShopId() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 shop_id = 13; + * @return this + */ + public Shop clearShopId() { + bitField0_ &= ~0x00000020; + shopId = 0; + return this; + } + + /** + * optional uint32 shop_id = 13; + * @return the shopId + */ + public int getShopId() { + return shopId; + } + + /** + * optional uint32 shop_id = 13; + * @param value the shopId to set + * @return this + */ + public Shop setShopId(final int value) { + bitField0_ |= 0x00000020; + shopId = value; + return this; + } + + /** + * repeated .Goods goods_list = 7; * @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 = 7; * @return this */ public Shop clearGoodsList() { @@ -305,7 +305,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 8; + * repeated .Goods goods_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. @@ -319,7 +319,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 8; + * repeated .Goods goods_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 @@ -333,7 +333,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 8; + * repeated .Goods goods_list = 7; * @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 = 7; * @param values the goodsList to add * @return this */ @@ -359,12 +359,12 @@ public final class ShopOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - beginTime = other.beginTime; endTime = other.endTime; + beginTime = other.beginTime; cityTakenLevelReward = other.cityTakenLevelReward; cityExp = other.cityExp; - shopId = other.shopId; cityLevel = other.cityLevel; + shopId = other.shopId; goodsList.copyFrom(other.goodsList); } return this; @@ -376,24 +376,24 @@ public final class ShopOuterClass { return this; } cachedSize = -1; - if (other.hasBeginTime()) { - setBeginTime(other.beginTime); - } if (other.hasEndTime()) { setEndTime(other.endTime); } + if (other.hasBeginTime()) { + setBeginTime(other.beginTime); + } if (other.hasCityTakenLevelReward()) { setCityTakenLevelReward(other.cityTakenLevelReward); } if (other.hasCityExp()) { setCityExp(other.cityExp); } - if (other.hasShopId()) { - setShopId(other.shopId); - } if (other.hasCityLevel()) { setCityLevel(other.cityLevel); } + if (other.hasShopId()) { + setShopId(other.shopId); + } if (other.hasGoodsList()) { getMutableGoodsList().addAll(other.goodsList); } @@ -407,12 +407,12 @@ public final class ShopOuterClass { } cachedSize = -1; bitField0_ = 0; - beginTime = 0L; endTime = 0L; + beginTime = 0L; cityTakenLevelReward = 0L; cityExp = 0; - shopId = 0; cityLevel = 0; + shopId = 0; goodsList.clear(); return this; } @@ -438,44 +438,44 @@ public final class ShopOuterClass { } Shop other = (Shop) o; return bitField0_ == other.bitField0_ - && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) + && (!hasBeginTime() || beginTime == other.beginTime) && (!hasCityTakenLevelReward() || cityTakenLevelReward == other.cityTakenLevelReward) && (!hasCityExp() || cityExp == other.cityExp) - && (!hasShopId() || shopId == other.shopId) && (!hasCityLevel() || cityLevel == other.cityLevel) + && (!hasShopId() || shopId == other.shopId) && (!hasGoodsList() || goodsList.equals(other.goodsList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 16); + output.writeInt64NoTag(endTime); + } + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 32); output.writeInt64NoTag(beginTime); } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeInt64NoTag(endTime); - } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 88); output.writeUInt64NoTag(cityTakenLevelReward); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(cityExp); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(shopId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(cityLevel); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(cityLevel); + output.writeUInt32NoTag(shopId); } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < goodsList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 58); output.writeMessageNoTag(goodsList.get(i)); } } @@ -485,10 +485,10 @@ public final class ShopOuterClass { 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.computeUInt64SizeNoTag(cityTakenLevelReward); @@ -497,10 +497,10 @@ public final class ShopOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(cityExp); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cityLevel); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cityLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); } if ((bitField0_ & 0x00000040) != 0) { size += (1 * goodsList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(goodsList); @@ -515,45 +515,45 @@ public final class ShopOuterClass { int tag = input.readTag(); while (true) { switch (tag) { + case 16: { + // endTime + endTime = input.readInt64(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 32) { + break; + } + } case 32: { // beginTime beginTime = input.readInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // endTime - endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { + case 88: { // cityTakenLevelReward cityTakenLevelReward = input.readUInt64(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 8) { + if (tag != 72) { break; } } - case 8: { + case 72: { // cityExp cityExp = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 56) { + if (tag != 96) { break; } } - case 56: { - // shopId - shopId = input.readUInt32(); + case 96: { + // cityLevel + cityLevel = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 104) { @@ -561,15 +561,15 @@ public final class ShopOuterClass { } } case 104: { - // cityLevel - cityLevel = input.readUInt32(); + // shopId + shopId = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 66) { + if (tag != 58) { break; } } - case 66: { + case 58: { // goodsList tag = input.readRepeatedMessage(goodsList, tag); bitField0_ |= 0x00000040; @@ -595,10 +595,10 @@ public final class ShopOuterClass { 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.writeUInt64(FieldNames.cityTakenLevelReward, cityTakenLevelReward); @@ -607,10 +607,10 @@ public final class ShopOuterClass { output.writeUInt32(FieldNames.cityExp, cityExp); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.shopId, shopId); + output.writeUInt32(FieldNames.cityLevel, cityLevel); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.cityLevel, cityLevel); + output.writeUInt32(FieldNames.shopId, shopId); } if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.goodsList, goodsList); @@ -625,11 +625,11 @@ public final class ShopOuterClass { } 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 { @@ -637,11 +637,11 @@ public final class ShopOuterClass { } 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 { @@ -673,11 +673,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_ |= 0x00000010; } } else { @@ -685,11 +685,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_ |= 0x00000020; } } else { @@ -761,18 +761,18 @@ public final class ShopOuterClass { * 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 cityTakenLevelReward = FieldName.forField("cityTakenLevelReward", "city_taken_level_reward"); 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 shopId = FieldName.forField("shopId", "shop_id"); + static final FieldName goodsList = FieldName.forField("goodsList", "goods_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SimpleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SimpleInfoOuterClass.java index cacafe0..9302da6 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 = 9; + * optional int64 last_active_time = 13; */ private long lastActiveTime; /** - * optional uint32 uid = 1; - */ - private int uid; - - /** - * optional uint32 chat_bubble_id = 2; - */ - private int chatBubbleId; - - /** - * optional uint32 head_icon = 3; - */ - private int headIcon; - - /** - * optional uint32 level = 8; + * optional uint32 level = 1; */ private int level; /** - * optional .FriendOnlineStatus online_status = 4; + * optional uint32 uid = 4; + */ + private int uid; + + /** + * optional uint32 head_icon = 5; + */ + private int headIcon; + + /** + * optional uint32 chat_bubble_id = 11; + */ + private int chatBubbleId; + + /** + * optional .FriendOnlineStatus online_status = 9; */ private int onlineStatus; /** - * optional .PlatformType platform_type = 5; + * optional .PlatformType platform_type = 14; */ private int platformType; /** - * optional bool is_banned = 12; + * optional bool is_banned = 15; */ private boolean isBanned; @@ -66,12 +66,12 @@ public final class SimpleInfoOuterClass { private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * optional string nickname = 13; + * optional string nickname = 7; */ private final Utf8String nickname = Utf8String.newEmptyInstance(); /** - * repeated .AssistSimpleInfo assist_simple_info = 11; + * repeated .AssistSimpleInfo assist_simple_info = 8; */ private final RepeatedMessage assistSimpleInfo = RepeatedMessage.newEmptyInstance(AssistSimpleInfoOuterClass.AssistSimpleInfo.getFactory()); @@ -86,7 +86,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 9; + * optional int64 last_active_time = 13; * @return whether the lastActiveTime field is set */ public boolean hasLastActiveTime() { @@ -94,7 +94,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 9; + * optional int64 last_active_time = 13; * @return this */ public SimpleInfo clearLastActiveTime() { @@ -104,7 +104,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 9; + * optional int64 last_active_time = 13; * @return the lastActiveTime */ public long getLastActiveTime() { @@ -112,7 +112,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 9; + * optional int64 last_active_time = 13; * @param value the lastActiveTime to set * @return this */ @@ -123,25 +123,62 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 uid = 1; - * @return whether the uid field is set + * optional uint32 level = 1; + * @return whether the level field is set */ - public boolean hasUid() { + public boolean hasLevel() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 uid = 1; + * optional uint32 level = 1; + * @return this + */ + public SimpleInfo clearLevel() { + bitField0_ &= ~0x00000002; + 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 SimpleInfo setLevel(final int value) { + bitField0_ |= 0x00000002; + level = value; + return this; + } + + /** + * optional uint32 uid = 4; + * @return whether the uid field is set + */ + public boolean hasUid() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 uid = 4; * @return this */ public SimpleInfo clearUid() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; uid = 0; return this; } /** - * optional uint32 uid = 1; + * optional uint32 uid = 4; * @return the uid */ public int getUid() { @@ -149,55 +186,18 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 uid = 1; + * optional uint32 uid = 4; * @param value the uid to set * @return this */ public SimpleInfo setUid(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; uid = value; return this; } /** - * optional uint32 chat_bubble_id = 2; - * @return whether the chatBubbleId field is set - */ - public boolean hasChatBubbleId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 chat_bubble_id = 2; - * @return this - */ - public SimpleInfo clearChatBubbleId() { - bitField0_ &= ~0x00000004; - chatBubbleId = 0; - return this; - } - - /** - * optional uint32 chat_bubble_id = 2; - * @return the chatBubbleId - */ - public int getChatBubbleId() { - return chatBubbleId; - } - - /** - * optional uint32 chat_bubble_id = 2; - * @param value the chatBubbleId to set - * @return this - */ - public SimpleInfo setChatBubbleId(final int value) { - bitField0_ |= 0x00000004; - chatBubbleId = value; - return this; - } - - /** - * optional uint32 head_icon = 3; + * optional uint32 head_icon = 5; * @return whether the headIcon field is set */ public boolean hasHeadIcon() { @@ -205,7 +205,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 head_icon = 3; + * optional uint32 head_icon = 5; * @return this */ public SimpleInfo clearHeadIcon() { @@ -215,7 +215,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 head_icon = 3; + * optional uint32 head_icon = 5; * @return the headIcon */ public int getHeadIcon() { @@ -223,7 +223,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 head_icon = 3; + * optional uint32 head_icon = 5; * @param value the headIcon to set * @return this */ @@ -234,44 +234,44 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 level = 8; - * @return whether the level field is set + * optional uint32 chat_bubble_id = 11; + * @return whether the chatBubbleId field is set */ - public boolean hasLevel() { + public boolean hasChatBubbleId() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 level = 8; + * optional uint32 chat_bubble_id = 11; * @return this */ - public SimpleInfo clearLevel() { + public SimpleInfo clearChatBubbleId() { bitField0_ &= ~0x00000010; - level = 0; + chatBubbleId = 0; return this; } /** - * optional uint32 level = 8; - * @return the level + * optional uint32 chat_bubble_id = 11; + * @return the chatBubbleId */ - public int getLevel() { - return level; + public int getChatBubbleId() { + return chatBubbleId; } /** - * optional uint32 level = 8; - * @param value the level to set + * optional uint32 chat_bubble_id = 11; + * @param value the chatBubbleId to set * @return this */ - public SimpleInfo setLevel(final int value) { + public SimpleInfo setChatBubbleId(final int value) { bitField0_ |= 0x00000010; - level = value; + chatBubbleId = value; return this; } /** - * optional .FriendOnlineStatus online_status = 4; + * optional .FriendOnlineStatus online_status = 9; * @return whether the onlineStatus field is set */ public boolean hasOnlineStatus() { @@ -279,7 +279,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .FriendOnlineStatus online_status = 4; + * optional .FriendOnlineStatus online_status = 9; * @return this */ public SimpleInfo clearOnlineStatus() { @@ -289,7 +289,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .FriendOnlineStatus online_status = 4; + * optional .FriendOnlineStatus online_status = 9; * @return the onlineStatus */ public FriendOnlineStatusOuterClass.FriendOnlineStatus getOnlineStatus() { @@ -322,7 +322,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .FriendOnlineStatus online_status = 4; + * optional .FriendOnlineStatus online_status = 9; * @param value the onlineStatus to set * @return this */ @@ -333,7 +333,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .PlatformType platform_type = 5; + * optional .PlatformType platform_type = 14; * @return whether the platformType field is set */ public boolean hasPlatformType() { @@ -341,7 +341,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .PlatformType platform_type = 5; + * optional .PlatformType platform_type = 14; * @return this */ public SimpleInfo clearPlatformType() { @@ -351,7 +351,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .PlatformType platform_type = 5; + * optional .PlatformType platform_type = 14; * @return the platformType */ public PlatformTypeOuterClass.PlatformType getPlatformType() { @@ -384,7 +384,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .PlatformType platform_type = 5; + * optional .PlatformType platform_type = 14; * @param value the platformType to set * @return this */ @@ -395,7 +395,7 @@ public final class SimpleInfoOuterClass { } /** - * optional bool is_banned = 12; + * optional bool is_banned = 15; * @return whether the isBanned field is set */ public boolean hasIsBanned() { @@ -403,7 +403,7 @@ public final class SimpleInfoOuterClass { } /** - * optional bool is_banned = 12; + * optional bool is_banned = 15; * @return this */ public SimpleInfo clearIsBanned() { @@ -413,7 +413,7 @@ public final class SimpleInfoOuterClass { } /** - * optional bool is_banned = 12; + * optional bool is_banned = 15; * @return the isBanned */ public boolean getIsBanned() { @@ -421,7 +421,7 @@ public final class SimpleInfoOuterClass { } /** - * optional bool is_banned = 12; + * optional bool is_banned = 15; * @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 */ @@ -562,7 +562,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 11; + * repeated .AssistSimpleInfo assist_simple_info = 8; * @return whether the assistSimpleInfo field is set */ public boolean hasAssistSimpleInfo() { @@ -570,7 +570,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 11; + * repeated .AssistSimpleInfo assist_simple_info = 8; * @return this */ public SimpleInfo clearAssistSimpleInfo() { @@ -580,7 +580,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 11; + * repeated .AssistSimpleInfo assist_simple_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. @@ -594,7 +594,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 11; + * repeated .AssistSimpleInfo assist_simple_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 @@ -609,7 +609,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 11; + * repeated .AssistSimpleInfo assist_simple_info = 8; * @param value the assistSimpleInfo to add * @return this */ @@ -620,7 +620,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 11; + * repeated .AssistSimpleInfo assist_simple_info = 8; * @param values the assistSimpleInfo to add * @return this */ @@ -637,10 +637,10 @@ public final class SimpleInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; lastActiveTime = other.lastActiveTime; - uid = other.uid; - chatBubbleId = other.chatBubbleId; - headIcon = other.headIcon; level = other.level; + uid = other.uid; + headIcon = other.headIcon; + chatBubbleId = other.chatBubbleId; onlineStatus = other.onlineStatus; platformType = other.platformType; isBanned = other.isBanned; @@ -660,17 +660,17 @@ public final class SimpleInfoOuterClass { if (other.hasLastActiveTime()) { setLastActiveTime(other.lastActiveTime); } + if (other.hasLevel()) { + setLevel(other.level); + } if (other.hasUid()) { setUid(other.uid); } - if (other.hasChatBubbleId()) { - setChatBubbleId(other.chatBubbleId); - } if (other.hasHeadIcon()) { setHeadIcon(other.headIcon); } - if (other.hasLevel()) { - setLevel(other.level); + if (other.hasChatBubbleId()) { + setChatBubbleId(other.chatBubbleId); } if (other.hasOnlineStatus()) { setOnlineStatusValue(other.onlineStatus); @@ -701,10 +701,10 @@ public final class SimpleInfoOuterClass { cachedSize = -1; bitField0_ = 0; lastActiveTime = 0L; - uid = 0; - chatBubbleId = 0; - headIcon = 0; level = 0; + uid = 0; + headIcon = 0; + chatBubbleId = 0; onlineStatus = 0; platformType = 0; isBanned = false; @@ -738,10 +738,10 @@ public final class SimpleInfoOuterClass { SimpleInfo other = (SimpleInfo) o; return bitField0_ == other.bitField0_ && (!hasLastActiveTime() || lastActiveTime == other.lastActiveTime) - && (!hasUid() || uid == other.uid) - && (!hasChatBubbleId() || chatBubbleId == other.chatBubbleId) - && (!hasHeadIcon() || headIcon == other.headIcon) && (!hasLevel() || level == other.level) + && (!hasUid() || uid == other.uid) + && (!hasHeadIcon() || headIcon == other.headIcon) + && (!hasChatBubbleId() || chatBubbleId == other.chatBubbleId) && (!hasOnlineStatus() || onlineStatus == other.onlineStatus) && (!hasPlatformType() || platformType == other.platformType) && (!hasIsBanned() || isBanned == other.isBanned) @@ -753,35 +753,35 @@ public final class SimpleInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 104); output.writeInt64NoTag(lastActiveTime); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(uid); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(chatBubbleId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(headIcon); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(chatBubbleId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 72); output.writeEnumNoTag(onlineStatus); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 112); output.writeEnumNoTag(platformType); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeBoolNoTag(isBanned); } if ((bitField0_ & 0x00000100) != 0) { @@ -789,12 +789,12 @@ 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) { for (int i = 0; i < assistSimpleInfo.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 66); output.writeMessageNoTag(assistSimpleInfo.get(i)); } } @@ -807,16 +807,16 @@ public final class SimpleInfoOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(lastActiveTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(chatBubbleId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(headIcon); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(chatBubbleId); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(onlineStatus); @@ -846,7 +846,7 @@ public final class SimpleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 104: { // lastActiveTime lastActiveTime = input.readInt64(); bitField0_ |= 0x00000001; @@ -856,42 +856,42 @@ public final class SimpleInfoOuterClass { } } case 8: { - // uid - uid = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { - // chatBubbleId - chatBubbleId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // headIcon - headIcon = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { // level level = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 32) { break; } } case 32: { + // uid + uid = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // headIcon + headIcon = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // chatBubbleId + chatBubbleId = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { // onlineStatus final int value = input.readInt32(); if (FriendOnlineStatusOuterClass.FriendOnlineStatus.forNumber(value) != null) { @@ -899,11 +899,11 @@ public final class SimpleInfoOuterClass { bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 40) { + if (tag != 112) { break; } } - case 40: { + case 112: { // platformType final int value = input.readInt32(); if (PlatformTypeOuterClass.PlatformType.forNumber(value) != null) { @@ -911,11 +911,11 @@ public final class SimpleInfoOuterClass { bitField0_ |= 0x00000040; } tag = input.readTag(); - if (tag != 96) { + if (tag != 120) { break; } } - case 96: { + case 120: { // isBanned isBanned = input.readBool(); bitField0_ |= 0x00000080; @@ -929,20 +929,20 @@ 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; tag = input.readTag(); - if (tag != 90) { + if (tag != 66) { break; } } - case 90: { + case 66: { // assistSimpleInfo tag = input.readRepeatedMessage(assistSimpleInfo, tag); bitField0_ |= 0x00000400; @@ -971,16 +971,16 @@ public final class SimpleInfoOuterClass { output.writeInt64(FieldNames.lastActiveTime, lastActiveTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.uid, uid); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.chatBubbleId, chatBubbleId); + output.writeUInt32(FieldNames.uid, uid); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.headIcon, headIcon); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.chatBubbleId, chatBubbleId); } if ((bitField0_ & 0x00000020) != 0) { output.writeEnum(FieldNames.onlineStatus, onlineStatus, FriendOnlineStatusOuterClass.FriendOnlineStatus.converter()); @@ -1022,10 +1022,10 @@ public final class SimpleInfoOuterClass { } break; } - case 115792: { - if (input.isAtField(FieldNames.uid)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - uid = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1033,11 +1033,10 @@ public final class SimpleInfoOuterClass { } break; } - case -678761921: - case 1892426119: { - if (input.isAtField(FieldNames.chatBubbleId)) { + case 115792: { + if (input.isAtField(FieldNames.uid)) { if (!input.trySkipNullValue()) { - chatBubbleId = input.readUInt32(); + uid = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -1057,10 +1056,11 @@ public final class SimpleInfoOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case -678761921: + case 1892426119: { + if (input.isAtField(FieldNames.chatBubbleId)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + chatBubbleId = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1202,13 +1202,13 @@ public final class SimpleInfoOuterClass { static class FieldNames { static final FieldName lastActiveTime = FieldName.forField("lastActiveTime", "last_active_time"); - static final FieldName uid = FieldName.forField("uid"); + static final FieldName level = FieldName.forField("level"); - 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 chatBubbleId = FieldName.forField("chatBubbleId", "chat_bubble_id"); static final FieldName onlineStatus = FieldName.forField("onlineStatus", "online_status"); diff --git a/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java index c71a524..4bd1529 100644 --- a/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java @@ -19,20 +19,20 @@ public final class StaminaInfoScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 next_recover_time = 11; + * optional int64 next_recover_time = 15; */ private long nextRecoverTime; /** - * optional uint32 stamina = 3; - */ - private int stamina; - - /** - * optional uint32 reserve_stamina = 7; + * optional uint32 reserve_stamina = 11; */ private int reserveStamina; + /** + * optional uint32 stamina = 12; + */ + private int stamina; + private StaminaInfoScNotify() { } @@ -44,7 +44,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_recover_time = 11; + * optional int64 next_recover_time = 15; * @return whether the nextRecoverTime field is set */ public boolean hasNextRecoverTime() { @@ -52,7 +52,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_recover_time = 11; + * optional int64 next_recover_time = 15; * @return this */ public StaminaInfoScNotify clearNextRecoverTime() { @@ -62,7 +62,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_recover_time = 11; + * optional int64 next_recover_time = 15; * @return the nextRecoverTime */ public long getNextRecoverTime() { @@ -70,7 +70,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_recover_time = 11; + * optional int64 next_recover_time = 15; * @param value the nextRecoverTime to set * @return this */ @@ -81,62 +81,25 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 stamina = 3; - * @return whether the stamina field is set + * optional uint32 reserve_stamina = 11; + * @return whether the reserveStamina field is set */ - public boolean hasStamina() { + public boolean hasReserveStamina() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 stamina = 3; - * @return this - */ - public StaminaInfoScNotify clearStamina() { - bitField0_ &= ~0x00000002; - stamina = 0; - return this; - } - - /** - * optional uint32 stamina = 3; - * @return the stamina - */ - public int getStamina() { - return stamina; - } - - /** - * optional uint32 stamina = 3; - * @param value the stamina to set - * @return this - */ - public StaminaInfoScNotify setStamina(final int value) { - bitField0_ |= 0x00000002; - stamina = value; - return this; - } - - /** - * optional uint32 reserve_stamina = 7; - * @return whether the reserveStamina field is set - */ - public boolean hasReserveStamina() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 reserve_stamina = 7; + * optional uint32 reserve_stamina = 11; * @return this */ public StaminaInfoScNotify clearReserveStamina() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; reserveStamina = 0; return this; } /** - * optional uint32 reserve_stamina = 7; + * optional uint32 reserve_stamina = 11; * @return the reserveStamina */ public int getReserveStamina() { @@ -144,24 +107,61 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 reserve_stamina = 7; + * optional uint32 reserve_stamina = 11; * @param value the reserveStamina to set * @return this */ public StaminaInfoScNotify setReserveStamina(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; reserveStamina = value; return this; } + /** + * optional uint32 stamina = 12; + * @return whether the stamina field is set + */ + public boolean hasStamina() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 stamina = 12; + * @return this + */ + public StaminaInfoScNotify clearStamina() { + bitField0_ &= ~0x00000004; + stamina = 0; + return this; + } + + /** + * optional uint32 stamina = 12; + * @return the stamina + */ + public int getStamina() { + return stamina; + } + + /** + * optional uint32 stamina = 12; + * @param value the stamina to set + * @return this + */ + public StaminaInfoScNotify setStamina(final int value) { + bitField0_ |= 0x00000004; + stamina = value; + return this; + } + @Override public StaminaInfoScNotify copyFrom(final StaminaInfoScNotify other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; nextRecoverTime = other.nextRecoverTime; - stamina = other.stamina; reserveStamina = other.reserveStamina; + stamina = other.stamina; } return this; } @@ -175,12 +175,12 @@ public final class StaminaInfoScNotifyOuterClass { if (other.hasNextRecoverTime()) { setNextRecoverTime(other.nextRecoverTime); } - if (other.hasStamina()) { - setStamina(other.stamina); - } if (other.hasReserveStamina()) { setReserveStamina(other.reserveStamina); } + if (other.hasStamina()) { + setStamina(other.stamina); + } return this; } @@ -192,8 +192,8 @@ public final class StaminaInfoScNotifyOuterClass { cachedSize = -1; bitField0_ = 0; nextRecoverTime = 0L; - stamina = 0; reserveStamina = 0; + stamina = 0; return this; } @@ -218,23 +218,23 @@ public final class StaminaInfoScNotifyOuterClass { StaminaInfoScNotify other = (StaminaInfoScNotify) o; return bitField0_ == other.bitField0_ && (!hasNextRecoverTime() || nextRecoverTime == other.nextRecoverTime) - && (!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) 120); output.writeInt64NoTag(nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(stamina); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(reserveStamina); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(reserveStamina); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(stamina); } } @@ -245,10 +245,10 @@ public final class StaminaInfoScNotifyOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stamina); + size += 1 + ProtoSink.computeUInt32SizeNoTag(reserveStamina); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(reserveStamina); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stamina); } return size; } @@ -260,27 +260,27 @@ public final class StaminaInfoScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 120: { // nextRecoverTime nextRecoverTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 88) { break; } } - case 24: { - // stamina - stamina = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 88: { // reserveStamina reserveStamina = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // stamina + stamina = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -308,10 +308,10 @@ public final class StaminaInfoScNotifyOuterClass { output.writeInt64(FieldNames.nextRecoverTime, nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.stamina, stamina); + output.writeUInt32(FieldNames.reserveStamina, reserveStamina); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.reserveStamina, reserveStamina); + output.writeUInt32(FieldNames.stamina, stamina); } output.endObject(); } @@ -335,10 +335,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_ |= 0x00000002; } } else { @@ -346,11 +347,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_ |= 0x00000004; } } else { @@ -413,9 +413,9 @@ public final class StaminaInfoScNotifyOuterClass { static class FieldNames { static final FieldName nextRecoverTime = FieldName.forField("nextRecoverTime", "next_recover_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 6a40886..b4585ca 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class StartChallengeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 challenge_id = 4; + * optional uint32 challenge_id = 8; */ private int challengeId; /** - * optional .StartChallengeStoryInfo story_info = 10; + * optional .StartChallengeStoryInfo story_info = 14; */ private final StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo storyInfo = StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo.newInstance(); @@ -39,7 +39,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 4; + * optional uint32 challenge_id = 8; * @return whether the challengeId field is set */ public boolean hasChallengeId() { @@ -47,7 +47,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 4; + * optional uint32 challenge_id = 8; * @return this */ public StartChallengeCsReq clearChallengeId() { @@ -57,7 +57,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 4; + * optional uint32 challenge_id = 8; * @return the challengeId */ public int getChallengeId() { @@ -65,7 +65,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 4; + * optional uint32 challenge_id = 8; * @param value the challengeId to set * @return this */ @@ -76,7 +76,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional .StartChallengeStoryInfo story_info = 10; + * optional .StartChallengeStoryInfo story_info = 14; * @return whether the storyInfo field is set */ public boolean hasStoryInfo() { @@ -84,7 +84,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional .StartChallengeStoryInfo story_info = 10; + * optional .StartChallengeStoryInfo story_info = 14; * @return this */ public StartChallengeCsReq clearStoryInfo() { @@ -94,7 +94,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional .StartChallengeStoryInfo story_info = 10; + * optional .StartChallengeStoryInfo story_info = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional .StartChallengeStoryInfo story_info = 10; + * optional .StartChallengeStoryInfo story_info = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional .StartChallengeStoryInfo story_info = 10; + * optional .StartChallengeStoryInfo story_info = 14; * @param value the storyInfo to set * @return this */ @@ -199,11 +199,11 @@ public final class StartChallengeCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 114); output.writeMessageNoTag(storyInfo); } } @@ -227,16 +227,16 @@ public final class StartChallengeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 64: { // challengeId challengeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 114) { break; } } - case 82: { + case 114: { // storyInfo input.readMessage(storyInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java index 31f5c7f..9dc5a55 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java @@ -19,25 +19,25 @@ public final class StartChallengeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional .ChallengeInfo challenge_info = 6; - */ - private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); - - /** - * optional .LineupInfo lineup = 13; + * optional .LineupInfo lineup = 2; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 3; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); + /** + * optional .ChallengeInfo challenge_info = 10; + */ + private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); + private StartChallengeScRsp() { } @@ -49,7 +49,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -57,7 +57,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; * @return this */ public StartChallengeScRsp clearRetcode() { @@ -67,7 +67,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -75,7 +75,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -86,82 +86,25 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 6; - * @return whether the challengeInfo field is set + * optional .LineupInfo lineup = 2; + * @return whether the lineup field is set */ - public boolean hasChallengeInfo() { + public boolean hasLineup() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .ChallengeInfo challenge_info = 6; - * @return this - */ - public StartChallengeScRsp clearChallengeInfo() { - bitField0_ &= ~0x00000002; - challengeInfo.clear(); - return this; - } - - /** - * optional .ChallengeInfo challenge_info = 6; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableChallengeInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ChallengeInfoOuterClass.ChallengeInfo getChallengeInfo() { - return challengeInfo; - } - - /** - * optional .ChallengeInfo challenge_info = 6; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public ChallengeInfoOuterClass.ChallengeInfo getMutableChallengeInfo() { - bitField0_ |= 0x00000002; - return challengeInfo; - } - - /** - * optional .ChallengeInfo challenge_info = 6; - * @param value the challengeInfo to set - * @return this - */ - public StartChallengeScRsp setChallengeInfo(final ChallengeInfoOuterClass.ChallengeInfo value) { - bitField0_ |= 0x00000002; - challengeInfo.copyFrom(value); - return this; - } - - /** - * optional .LineupInfo lineup = 13; - * @return whether the lineup field is set - */ - public boolean hasLineup() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .LineupInfo lineup = 13; + * optional .LineupInfo lineup = 2; * @return this */ public StartChallengeScRsp clearLineup() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; lineup.clear(); return this; } /** - * optional .LineupInfo lineup = 13; + * optional .LineupInfo lineup = 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. @@ -175,7 +118,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .LineupInfo lineup = 13; + * optional .LineupInfo lineup = 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 @@ -184,41 +127,41 @@ public final class StartChallengeScRspOuterClass { * @return internal storage object for modifications */ public LineupInfoOuterClass.LineupInfo getMutableLineup() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return lineup; } /** - * optional .LineupInfo lineup = 13; + * optional .LineupInfo lineup = 2; * @param value the lineup to set * @return this */ public StartChallengeScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; lineup.copyFrom(value); return this; } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 3; * @return whether the scene field is set */ public boolean hasScene() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 3; * @return this */ public StartChallengeScRsp clearScene() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; scene.clear(); return this; } /** - * optional .SceneInfo scene = 15; + * 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. @@ -232,7 +175,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 15; + * 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 @@ -241,30 +184,87 @@ public final class StartChallengeScRspOuterClass { * @return internal storage object for modifications */ public SceneInfoOuterClass.SceneInfo getMutableScene() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return scene; } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 3; * @param value the scene to set * @return this */ public StartChallengeScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; scene.copyFrom(value); return this; } + /** + * optional .ChallengeInfo challenge_info = 10; + * @return whether the challengeInfo field is set + */ + public boolean hasChallengeInfo() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .ChallengeInfo challenge_info = 10; + * @return this + */ + public StartChallengeScRsp clearChallengeInfo() { + bitField0_ &= ~0x00000008; + challengeInfo.clear(); + return this; + } + + /** + * optional .ChallengeInfo challenge_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 #getMutableChallengeInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ChallengeInfoOuterClass.ChallengeInfo getChallengeInfo() { + return challengeInfo; + } + + /** + * optional .ChallengeInfo challenge_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 ChallengeInfoOuterClass.ChallengeInfo getMutableChallengeInfo() { + bitField0_ |= 0x00000008; + return challengeInfo; + } + + /** + * optional .ChallengeInfo challenge_info = 10; + * @param value the challengeInfo to set + * @return this + */ + public StartChallengeScRsp setChallengeInfo(final ChallengeInfoOuterClass.ChallengeInfo value) { + bitField0_ |= 0x00000008; + challengeInfo.copyFrom(value); + return this; + } + @Override public StartChallengeScRsp copyFrom(final StartChallengeScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - challengeInfo.copyFrom(other.challengeInfo); lineup.copyFrom(other.lineup); scene.copyFrom(other.scene); + challengeInfo.copyFrom(other.challengeInfo); } return this; } @@ -278,15 +278,15 @@ public final class StartChallengeScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasChallengeInfo()) { - getMutableChallengeInfo().mergeFrom(other.challengeInfo); - } if (other.hasLineup()) { getMutableLineup().mergeFrom(other.lineup); } if (other.hasScene()) { getMutableScene().mergeFrom(other.scene); } + if (other.hasChallengeInfo()) { + getMutableChallengeInfo().mergeFrom(other.challengeInfo); + } return this; } @@ -298,9 +298,9 @@ public final class StartChallengeScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - challengeInfo.clear(); lineup.clear(); scene.clear(); + challengeInfo.clear(); return this; } @@ -311,9 +311,9 @@ public final class StartChallengeScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - challengeInfo.clearQuick(); lineup.clearQuick(); scene.clearQuick(); + challengeInfo.clearQuick(); return this; } @@ -328,29 +328,29 @@ public final class StartChallengeScRspOuterClass { StartChallengeScRsp other = (StartChallengeScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasChallengeInfo() || challengeInfo.equals(other.challengeInfo)) && (!hasLineup() || lineup.equals(other.lineup)) - && (!hasScene() || scene.equals(other.scene)); + && (!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) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(challengeInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 18); output.writeMessageNoTag(lineup); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 122); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 26); output.writeMessageNoTag(scene); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 82); + output.writeMessageNoTag(challengeInfo); + } } @Override @@ -360,14 +360,14 @@ public final class StartChallengeScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(challengeInfo); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(scene); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(challengeInfo); + } return size; } @@ -378,36 +378,36 @@ public final class StartChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 18) { break; } } - case 50: { - // challengeInfo - input.readMessage(challengeInfo); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { + case 18: { // lineup input.readMessage(lineup); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 26) { break; } } - case 122: { + case 26: { // scene input.readMessage(scene); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { + // challengeInfo + input.readMessage(challengeInfo); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -435,14 +435,14 @@ public final class StartChallengeScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.challengeInfo, challengeInfo); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.lineup, lineup); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.scene, scene); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeMessage(FieldNames.challengeInfo, challengeInfo); + } output.endObject(); } @@ -464,23 +464,11 @@ public final class StartChallengeScRspOuterClass { } break; } - case -812487759: - case 602859274: { - if (input.isAtField(FieldNames.challengeInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(challengeInfo); - 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 +479,18 @@ public final class StartChallengeScRspOuterClass { if (input.isAtField(FieldNames.scene)) { if (!input.trySkipNullValue()) { input.readMessage(scene); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -812487759: + case 602859274: { + if (input.isAtField(FieldNames.challengeInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(challengeInfo); bitField0_ |= 0x00000008; } } else { @@ -553,11 +553,11 @@ public final class StartChallengeScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName challengeInfo = FieldName.forField("challengeInfo", "challenge_info"); - static final FieldName 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/StartChallengeStoryBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryBuffInfoOuterClass.java index 8793083..9829ccd 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeStoryBuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryBuffInfoOuterClass.java @@ -18,16 +18,16 @@ public final class StartChallengeStoryBuffInfoOuterClass { public static final class StartChallengeStoryBuffInfo extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 story_buff_two = 7; + */ + private int storyBuffTwo; + /** * optional uint32 story_buff_one = 8; */ private int storyBuffOne; - /** - * optional uint32 story_buff_two = 9; - */ - private int storyBuffTwo; - private StartChallengeStoryBuffInfo() { } @@ -38,12 +38,49 @@ public final class StartChallengeStoryBuffInfoOuterClass { return new StartChallengeStoryBuffInfo(); } + /** + * optional uint32 story_buff_two = 7; + * @return whether the storyBuffTwo field is set + */ + public boolean hasStoryBuffTwo() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 story_buff_two = 7; + * @return this + */ + public StartChallengeStoryBuffInfo clearStoryBuffTwo() { + bitField0_ &= ~0x00000001; + storyBuffTwo = 0; + return this; + } + + /** + * optional uint32 story_buff_two = 7; + * @return the storyBuffTwo + */ + public int getStoryBuffTwo() { + return storyBuffTwo; + } + + /** + * optional uint32 story_buff_two = 7; + * @param value the storyBuffTwo to set + * @return this + */ + public StartChallengeStoryBuffInfo setStoryBuffTwo(final int value) { + bitField0_ |= 0x00000001; + storyBuffTwo = value; + return this; + } + /** * optional uint32 story_buff_one = 8; * @return whether the storyBuffOne field is set */ public boolean hasStoryBuffOne() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -51,7 +88,7 @@ public final class StartChallengeStoryBuffInfoOuterClass { * @return this */ public StartChallengeStoryBuffInfo clearStoryBuffOne() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; storyBuffOne = 0; return this; } @@ -70,45 +107,8 @@ public final class StartChallengeStoryBuffInfoOuterClass { * @return this */ public StartChallengeStoryBuffInfo setStoryBuffOne(final int value) { - bitField0_ |= 0x00000001; - storyBuffOne = value; - return this; - } - - /** - * optional uint32 story_buff_two = 9; - * @return whether the storyBuffTwo field is set - */ - public boolean hasStoryBuffTwo() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 story_buff_two = 9; - * @return this - */ - public StartChallengeStoryBuffInfo clearStoryBuffTwo() { - bitField0_ &= ~0x00000002; - storyBuffTwo = 0; - return this; - } - - /** - * optional uint32 story_buff_two = 9; - * @return the storyBuffTwo - */ - public int getStoryBuffTwo() { - return storyBuffTwo; - } - - /** - * optional uint32 story_buff_two = 9; - * @param value the storyBuffTwo to set - * @return this - */ - public StartChallengeStoryBuffInfo setStoryBuffTwo(final int value) { bitField0_ |= 0x00000002; - storyBuffTwo = value; + storyBuffOne = value; return this; } @@ -117,8 +117,8 @@ public final class StartChallengeStoryBuffInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - storyBuffOne = other.storyBuffOne; storyBuffTwo = other.storyBuffTwo; + storyBuffOne = other.storyBuffOne; } return this; } @@ -129,12 +129,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; } @@ -145,8 +145,8 @@ public final class StartChallengeStoryBuffInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - storyBuffOne = 0; storyBuffTwo = 0; + storyBuffOne = 0; return this; } @@ -170,19 +170,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) 64); - output.writeUInt32NoTag(storyBuffOne); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(storyBuffTwo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(storyBuffTwo); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(storyBuffOne); } } @@ -190,10 +190,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; } @@ -205,18 +205,18 @@ public final class StartChallengeStoryBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // storyBuffOne - storyBuffOne = input.readUInt32(); + case 56: { + // storyBuffTwo + storyBuffTwo = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 64) { break; } } - case 72: { - // storyBuffTwo - storyBuffTwo = input.readUInt32(); + case 64: { + // storyBuffOne + storyBuffOne = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,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(); } @@ -256,11 +256,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 { @@ -268,11 +268,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 { @@ -334,9 +334,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 690876d..a9d9d20 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java @@ -19,7 +19,7 @@ public final class StartChallengeStoryInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 2; + * optional .StartChallengeStoryBuffInfo story_buff_info = 7; */ private final StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo storyBuffInfo = StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo.newInstance(); @@ -33,8 +33,19 @@ public final class StartChallengeStoryInfoOuterClass { return new StartChallengeStoryInfo(); } + public boolean hasBuffInfo() { + return (((bitField0_ & 0x00000001)) != 0); + } + + public StartChallengeStoryInfo clearBuffInfo() { + if (hasBuffInfo()) { + clearStoryBuffInfo(); + } + return this; + } + /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 2; + * optional .StartChallengeStoryBuffInfo story_buff_info = 7; * @return whether the storyBuffInfo field is set */ public boolean hasStoryBuffInfo() { @@ -42,7 +53,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 2; + * optional .StartChallengeStoryBuffInfo story_buff_info = 7; * @return this */ public StartChallengeStoryInfo clearStoryBuffInfo() { @@ -52,7 +63,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 2; + * 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. @@ -66,7 +77,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 2; + * 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 @@ -81,7 +92,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 2; + * optional .StartChallengeStoryBuffInfo story_buff_info = 7; * @param value the storyBuffInfo to set * @return this */ @@ -152,7 +163,7 @@ public final class StartChallengeStoryInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 58); output.writeMessageNoTag(storyBuffInfo); } } @@ -173,7 +184,7 @@ public final class StartChallengeStoryInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 58: { // storyBuffInfo input.readMessage(storyBuffInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java index ea29037..0b1bd69 100644 --- a/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java @@ -19,25 +19,25 @@ public final class StartCocoonStageCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cocoon_id = 5; + * optional uint32 cocoon_id = 2; */ private int cocoonId; /** - * optional uint32 prop_entity_id = 6; + * optional uint32 prop_entity_id = 3; */ private int propEntityId; /** - * optional uint32 world_level = 7; - */ - private int worldLevel; - - /** - * optional uint32 wave = 14; + * optional uint32 wave = 10; */ private int wave; + /** + * optional uint32 world_level = 12; + */ + private int worldLevel; + private StartCocoonStageCsReq() { } @@ -49,7 +49,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 cocoon_id = 5; + * optional uint32 cocoon_id = 2; * @return whether the cocoonId field is set */ public boolean hasCocoonId() { @@ -57,7 +57,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 cocoon_id = 5; + * optional uint32 cocoon_id = 2; * @return this */ public StartCocoonStageCsReq clearCocoonId() { @@ -67,7 +67,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 cocoon_id = 5; + * optional uint32 cocoon_id = 2; * @return the cocoonId */ public int getCocoonId() { @@ -75,7 +75,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 cocoon_id = 5; + * optional uint32 cocoon_id = 2; * @param value the cocoonId to set * @return this */ @@ -86,7 +86,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 prop_entity_id = 6; + * optional uint32 prop_entity_id = 3; * @return whether the propEntityId field is set */ public boolean hasPropEntityId() { @@ -94,7 +94,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 prop_entity_id = 6; + * optional uint32 prop_entity_id = 3; * @return this */ public StartCocoonStageCsReq clearPropEntityId() { @@ -104,7 +104,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 prop_entity_id = 6; + * optional uint32 prop_entity_id = 3; * @return the propEntityId */ public int getPropEntityId() { @@ -112,7 +112,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 prop_entity_id = 6; + * optional uint32 prop_entity_id = 3; * @param value the propEntityId to set * @return this */ @@ -123,62 +123,25 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 world_level = 7; - * @return whether the worldLevel field is set + * optional uint32 wave = 10; + * @return whether the wave field is set */ - public boolean hasWorldLevel() { + public boolean hasWave() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 world_level = 7; - * @return this - */ - public StartCocoonStageCsReq clearWorldLevel() { - bitField0_ &= ~0x00000004; - worldLevel = 0; - return this; - } - - /** - * optional uint32 world_level = 7; - * @return the worldLevel - */ - public int getWorldLevel() { - return worldLevel; - } - - /** - * optional uint32 world_level = 7; - * @param value the worldLevel to set - * @return this - */ - public StartCocoonStageCsReq setWorldLevel(final int value) { - bitField0_ |= 0x00000004; - worldLevel = value; - return this; - } - - /** - * optional uint32 wave = 14; - * @return whether the wave field is set - */ - public boolean hasWave() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 wave = 14; + * optional uint32 wave = 10; * @return this */ public StartCocoonStageCsReq clearWave() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; wave = 0; return this; } /** - * optional uint32 wave = 14; + * optional uint32 wave = 10; * @return the wave */ public int getWave() { @@ -186,16 +149,53 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 wave = 14; + * optional uint32 wave = 10; * @param value the wave to set * @return this */ public StartCocoonStageCsReq setWave(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; wave = value; return this; } + /** + * optional uint32 world_level = 12; + * @return whether the worldLevel field is set + */ + public boolean hasWorldLevel() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 world_level = 12; + * @return this + */ + public StartCocoonStageCsReq clearWorldLevel() { + bitField0_ &= ~0x00000008; + worldLevel = 0; + return this; + } + + /** + * optional uint32 world_level = 12; + * @return the worldLevel + */ + public int getWorldLevel() { + return worldLevel; + } + + /** + * optional uint32 world_level = 12; + * @param value the worldLevel to set + * @return this + */ + public StartCocoonStageCsReq setWorldLevel(final int value) { + bitField0_ |= 0x00000008; + worldLevel = value; + return this; + } + @Override public StartCocoonStageCsReq copyFrom(final StartCocoonStageCsReq other) { cachedSize = other.cachedSize; @@ -203,8 +203,8 @@ public final class StartCocoonStageCsReqOuterClass { bitField0_ = other.bitField0_; cocoonId = other.cocoonId; propEntityId = other.propEntityId; - worldLevel = other.worldLevel; wave = other.wave; + worldLevel = other.worldLevel; } return this; } @@ -221,12 +221,12 @@ public final class StartCocoonStageCsReqOuterClass { if (other.hasPropEntityId()) { setPropEntityId(other.propEntityId); } - if (other.hasWorldLevel()) { - setWorldLevel(other.worldLevel); - } if (other.hasWave()) { setWave(other.wave); } + if (other.hasWorldLevel()) { + setWorldLevel(other.worldLevel); + } return this; } @@ -239,8 +239,8 @@ public final class StartCocoonStageCsReqOuterClass { bitField0_ = 0; cocoonId = 0; propEntityId = 0; - worldLevel = 0; wave = 0; + worldLevel = 0; return this; } @@ -266,27 +266,27 @@ public final class StartCocoonStageCsReqOuterClass { return bitField0_ == other.bitField0_ && (!hasCocoonId() || cocoonId == other.cocoonId) && (!hasPropEntityId() || propEntityId == other.propEntityId) - && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasWave() || wave == other.wave); + && (!hasWave() || wave == other.wave) + && (!hasWorldLevel() || worldLevel == other.worldLevel); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(cocoonId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(worldLevel); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(wave); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(wave); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(worldLevel); } } @@ -300,10 +300,10 @@ public final class StartCocoonStageCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } return size; } @@ -315,36 +315,36 @@ public final class StartCocoonStageCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 16: { // cocoonId cocoonId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 24) { break; } } - case 48: { + case 24: { // propEntityId propEntityId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 56) { + if (tag != 80) { break; } } - case 56: { - // worldLevel - worldLevel = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 80: { // wave wave = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // worldLevel + worldLevel = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -375,10 +375,10 @@ public final class StartCocoonStageCsReqOuterClass { output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); + output.writeUInt32(FieldNames.wave, wave); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.wave, wave); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } output.endObject(); } @@ -414,11 +414,10 @@ public final class StartCocoonStageCsReqOuterClass { } break; } - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { + case 3642105: { + if (input.isAtField(FieldNames.wave)) { if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); + wave = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -426,10 +425,11 @@ public final class StartCocoonStageCsReqOuterClass { } break; } - case 3642105: { - if (input.isAtField(FieldNames.wave)) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { - wave = input.readUInt32(); + worldLevel = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -494,9 +494,9 @@ public final class StartCocoonStageCsReqOuterClass { static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - static final FieldName wave = FieldName.forField("wave"); + + static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java index 89add2c..929e892 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 cocoon_id = 1; - */ - private int cocoonId; - - /** - * optional uint32 wave = 4; - */ - private int wave; - - /** - * optional uint32 prop_entity_id = 8; + * optional uint32 prop_entity_id = 1; */ private int propEntityId; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional .SceneBattleInfo battle_info = 6; + * optional uint32 cocoon_id = 8; + */ + private int cocoonId; + + /** + * optional uint32 wave = 13; + */ + private int wave; + + /** + * optional .SceneBattleInfo battle_info = 12; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -54,99 +54,25 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 cocoon_id = 1; - * @return whether the cocoonId field is set + * optional uint32 prop_entity_id = 1; + * @return whether the propEntityId field is set */ - public boolean hasCocoonId() { + public boolean hasPropEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cocoon_id = 1; - * @return this - */ - public StartCocoonStageScRsp clearCocoonId() { - bitField0_ &= ~0x00000001; - cocoonId = 0; - return this; - } - - /** - * optional uint32 cocoon_id = 1; - * @return the cocoonId - */ - public int getCocoonId() { - return cocoonId; - } - - /** - * optional uint32 cocoon_id = 1; - * @param value the cocoonId to set - * @return this - */ - public StartCocoonStageScRsp setCocoonId(final int value) { - bitField0_ |= 0x00000001; - cocoonId = value; - return this; - } - - /** - * optional uint32 wave = 4; - * @return whether the wave field is set - */ - public boolean hasWave() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 wave = 4; - * @return this - */ - public StartCocoonStageScRsp clearWave() { - bitField0_ &= ~0x00000002; - wave = 0; - return this; - } - - /** - * optional uint32 wave = 4; - * @return the wave - */ - public int getWave() { - return wave; - } - - /** - * optional uint32 wave = 4; - * @param value the wave to set - * @return this - */ - public StartCocoonStageScRsp setWave(final int value) { - bitField0_ |= 0x00000002; - wave = value; - return this; - } - - /** - * optional uint32 prop_entity_id = 8; - * @return whether the propEntityId field is set - */ - public boolean hasPropEntityId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 prop_entity_id = 8; + * optional uint32 prop_entity_id = 1; * @return this */ public StartCocoonStageScRsp clearPropEntityId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; propEntityId = 0; return this; } /** - * optional uint32 prop_entity_id = 8; + * optional uint32 prop_entity_id = 1; * @return the propEntityId */ public int getPropEntityId() { @@ -154,36 +80,36 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 prop_entity_id = 8; + * optional uint32 prop_entity_id = 1; * @param value the propEntityId to set * @return this */ public StartCocoonStageScRsp setPropEntityId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; propEntityId = value; return this; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @return this */ public StartCocoonStageScRsp clearRetcode() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; retcode = 0; return this; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -191,18 +117,92 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ public StartCocoonStageScRsp setRetcode(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; retcode = value; return this; } /** - * optional .SceneBattleInfo battle_info = 6; + * optional uint32 cocoon_id = 8; + * @return whether the cocoonId field is set + */ + public boolean hasCocoonId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 cocoon_id = 8; + * @return this + */ + public StartCocoonStageScRsp clearCocoonId() { + bitField0_ &= ~0x00000004; + cocoonId = 0; + return this; + } + + /** + * optional uint32 cocoon_id = 8; + * @return the cocoonId + */ + public int getCocoonId() { + return cocoonId; + } + + /** + * optional uint32 cocoon_id = 8; + * @param value the cocoonId to set + * @return this + */ + public StartCocoonStageScRsp setCocoonId(final int value) { + bitField0_ |= 0x00000004; + cocoonId = value; + return this; + } + + /** + * optional uint32 wave = 13; + * @return whether the wave field is set + */ + public boolean hasWave() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 wave = 13; + * @return this + */ + public StartCocoonStageScRsp clearWave() { + bitField0_ &= ~0x00000008; + wave = 0; + return this; + } + + /** + * optional uint32 wave = 13; + * @return the wave + */ + public int getWave() { + return wave; + } + + /** + * optional uint32 wave = 13; + * @param value the wave to set + * @return this + */ + public StartCocoonStageScRsp setWave(final int value) { + bitField0_ |= 0x00000008; + wave = value; + return this; + } + + /** + * optional .SceneBattleInfo battle_info = 12; * @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 = 12; * @return this */ public StartCocoonStageScRsp clearBattleInfo() { @@ -220,7 +220,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 6; + * 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. @@ -234,7 +234,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 6; + * 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 @@ -248,7 +248,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 6; + * optional .SceneBattleInfo battle_info = 12; * @param value the battleInfo to set * @return this */ @@ -264,10 +264,10 @@ public final class StartCocoonStageScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - cocoonId = other.cocoonId; - wave = other.wave; propEntityId = other.propEntityId; retcode = other.retcode; + cocoonId = other.cocoonId; + wave = other.wave; battleInfo.copyFrom(other.battleInfo); } return this; @@ -279,18 +279,18 @@ public final class StartCocoonStageScRspOuterClass { return this; } cachedSize = -1; - if (other.hasCocoonId()) { - setCocoonId(other.cocoonId); - } - if (other.hasWave()) { - setWave(other.wave); - } if (other.hasPropEntityId()) { setPropEntityId(other.propEntityId); } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasCocoonId()) { + setCocoonId(other.cocoonId); + } + if (other.hasWave()) { + setWave(other.wave); + } if (other.hasBattleInfo()) { getMutableBattleInfo().mergeFrom(other.battleInfo); } @@ -304,10 +304,10 @@ public final class StartCocoonStageScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - cocoonId = 0; - wave = 0; propEntityId = 0; retcode = 0; + cocoonId = 0; + wave = 0; battleInfo.clear(); return this; } @@ -333,10 +333,10 @@ public final class StartCocoonStageScRspOuterClass { } StartCocoonStageScRsp other = (StartCocoonStageScRsp) o; return bitField0_ == other.bitField0_ - && (!hasCocoonId() || cocoonId == other.cocoonId) - && (!hasWave() || wave == other.wave) && (!hasPropEntityId() || propEntityId == other.propEntityId) && (!hasRetcode() || retcode == other.retcode) + && (!hasCocoonId() || cocoonId == other.cocoonId) + && (!hasWave() || wave == other.wave) && (!hasBattleInfo() || battleInfo.equals(other.battleInfo)); } @@ -344,22 +344,22 @@ public final class StartCocoonStageScRspOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(cocoonId); + output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(wave); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 64); - output.writeUInt32NoTag(propEntityId); + output.writeUInt32NoTag(cocoonId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(wave); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 98); output.writeMessageNoTag(battleInfo); } } @@ -368,17 +368,17 @@ public final class StartCocoonStageScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); + } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(battleInfo); } @@ -393,17 +393,17 @@ public final class StartCocoonStageScRspOuterClass { while (true) { switch (tag) { case 8: { - // cocoonId - cocoonId = input.readUInt32(); + // propEntityId + propEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 48) { break; } } - case 32: { - // wave - wave = input.readUInt32(); + case 48: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 64) { @@ -411,24 +411,24 @@ public final class StartCocoonStageScRspOuterClass { } } case 64: { - // propEntityId - propEntityId = input.readUInt32(); + // cocoonId + cocoonId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 120) { + if (tag != 104) { break; } } - case 120: { - // retcode - retcode = input.readUInt32(); + case 104: { + // wave + wave = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 50) { + if (tag != 98) { break; } } - case 50: { + case 98: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000010; @@ -455,17 +455,17 @@ public final class StartCocoonStageScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.cocoonId, cocoonId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.wave, wave); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.propEntityId, propEntityId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.cocoonId, cocoonId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.wave, wave); + } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.battleInfo, battleInfo); } @@ -479,35 +479,12 @@ public final class StartCocoonStageScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -886563534: - case -1713644381: { - if (input.isAtField(FieldNames.cocoonId)) { - if (!input.trySkipNullValue()) { - cocoonId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 3642105: { - if (input.isAtField(FieldNames.wave)) { - if (!input.trySkipNullValue()) { - wave = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -68717343: case -57484005: { if (input.isAtField(FieldNames.propEntityId)) { if (!input.trySkipNullValue()) { propEntityId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -518,6 +495,29 @@ public final class StartCocoonStageScRspOuterClass { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -886563534: + case -1713644381: { + if (input.isAtField(FieldNames.cocoonId)) { + if (!input.trySkipNullValue()) { + cocoonId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 3642105: { + if (input.isAtField(FieldNames.wave)) { + if (!input.trySkipNullValue()) { + wave = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -590,14 +590,14 @@ public final class StartCocoonStageScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName 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 retcode = FieldName.forField("retcode"); + static final FieldName cocoonId = FieldName.forField("cocoonId", "cocoon_id"); + + static final FieldName wave = FieldName.forField("wave"); + static final FieldName battleInfo = FieldName.forField("battleInfo", "battle_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/StartRogueCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartRogueCsReqOuterClass.java index 3227b31..a12596c 100644 --- a/src/generated/main/emu/lunarcore/proto/StartRogueCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartRogueCsReqOuterClass.java @@ -20,22 +20,17 @@ public final class StartRogueCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 area_id = 1; - */ - private int areaId; - - /** - * optional uint32 buff_aeon_id = 3; + * optional uint32 buff_aeon_id = 2; */ private int buffAeonId; /** - * optional uint32 ECJEFHHACMI = 12; + * optional uint32 area_id = 7; */ - private int eCJEFHHACMI; + private int areaId; /** - * repeated uint32 base_avatar_id_list = 11; + * repeated uint32 base_avatar_id_list = 14; */ private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance(); @@ -50,62 +45,25 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 area_id = 1; - * @return whether the areaId field is set + * optional uint32 buff_aeon_id = 2; + * @return whether the buffAeonId field is set */ - public boolean hasAreaId() { + public boolean hasBuffAeonId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 area_id = 1; - * @return this - */ - public StartRogueCsReq clearAreaId() { - bitField0_ &= ~0x00000001; - areaId = 0; - return this; - } - - /** - * optional uint32 area_id = 1; - * @return the areaId - */ - public int getAreaId() { - return areaId; - } - - /** - * optional uint32 area_id = 1; - * @param value the areaId to set - * @return this - */ - public StartRogueCsReq setAreaId(final int value) { - bitField0_ |= 0x00000001; - areaId = value; - return this; - } - - /** - * optional uint32 buff_aeon_id = 3; - * @return whether the buffAeonId field is set - */ - public boolean hasBuffAeonId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 buff_aeon_id = 3; + * optional uint32 buff_aeon_id = 2; * @return this */ public StartRogueCsReq clearBuffAeonId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; buffAeonId = 0; return this; } /** - * optional uint32 buff_aeon_id = 3; + * optional uint32 buff_aeon_id = 2; * @return the buffAeonId */ public int getBuffAeonId() { @@ -113,73 +71,73 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 buff_aeon_id = 3; + * optional uint32 buff_aeon_id = 2; * @param value the buffAeonId to set * @return this */ public StartRogueCsReq setBuffAeonId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; buffAeonId = value; return this; } /** - * optional uint32 ECJEFHHACMI = 12; - * @return whether the eCJEFHHACMI field is set + * optional uint32 area_id = 7; + * @return whether the areaId field is set */ - public boolean hasECJEFHHACMI() { + public boolean hasAreaId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 area_id = 7; + * @return this + */ + public StartRogueCsReq clearAreaId() { + bitField0_ &= ~0x00000002; + areaId = 0; + return this; + } + + /** + * optional uint32 area_id = 7; + * @return the areaId + */ + public int getAreaId() { + return areaId; + } + + /** + * optional uint32 area_id = 7; + * @param value the areaId to set + * @return this + */ + public StartRogueCsReq setAreaId(final int value) { + bitField0_ |= 0x00000002; + areaId = value; + return this; + } + + /** + * repeated uint32 base_avatar_id_list = 14; + * @return whether the baseAvatarIdList field is set + */ + public boolean hasBaseAvatarIdList() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 ECJEFHHACMI = 12; - * @return this - */ - public StartRogueCsReq clearECJEFHHACMI() { - bitField0_ &= ~0x00000004; - eCJEFHHACMI = 0; - return this; - } - - /** - * optional uint32 ECJEFHHACMI = 12; - * @return the eCJEFHHACMI - */ - public int getECJEFHHACMI() { - return eCJEFHHACMI; - } - - /** - * optional uint32 ECJEFHHACMI = 12; - * @param value the eCJEFHHACMI to set - * @return this - */ - public StartRogueCsReq setECJEFHHACMI(final int value) { - bitField0_ |= 0x00000004; - eCJEFHHACMI = value; - return this; - } - - /** - * repeated uint32 base_avatar_id_list = 11; - * @return whether the baseAvatarIdList field is set - */ - public boolean hasBaseAvatarIdList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated uint32 base_avatar_id_list = 11; + * repeated uint32 base_avatar_id_list = 14; * @return this */ public StartRogueCsReq clearBaseAvatarIdList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; baseAvatarIdList.clear(); return this; } /** - * repeated uint32 base_avatar_id_list = 11; + * repeated uint32 base_avatar_id_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -193,7 +151,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 11; + * repeated uint32 base_avatar_id_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -202,28 +160,28 @@ public final class StartRogueCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableBaseAvatarIdList() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return baseAvatarIdList; } /** - * repeated uint32 base_avatar_id_list = 11; + * repeated uint32 base_avatar_id_list = 14; * @param value the baseAvatarIdList to add * @return this */ public StartRogueCsReq addBaseAvatarIdList(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; baseAvatarIdList.add(value); return this; } /** - * repeated uint32 base_avatar_id_list = 11; + * repeated uint32 base_avatar_id_list = 14; * @param values the baseAvatarIdList to add * @return this */ public StartRogueCsReq addAllBaseAvatarIdList(final int... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; baseAvatarIdList.addAll(values); return this; } @@ -233,9 +191,8 @@ public final class StartRogueCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - areaId = other.areaId; buffAeonId = other.buffAeonId; - eCJEFHHACMI = other.eCJEFHHACMI; + areaId = other.areaId; baseAvatarIdList.copyFrom(other.baseAvatarIdList); } return this; @@ -247,14 +204,11 @@ public final class StartRogueCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasAreaId()) { - setAreaId(other.areaId); - } if (other.hasBuffAeonId()) { setBuffAeonId(other.buffAeonId); } - if (other.hasECJEFHHACMI()) { - setECJEFHHACMI(other.eCJEFHHACMI); + if (other.hasAreaId()) { + setAreaId(other.areaId); } if (other.hasBaseAvatarIdList()) { getMutableBaseAvatarIdList().addAll(other.baseAvatarIdList); @@ -269,9 +223,8 @@ public final class StartRogueCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - areaId = 0; buffAeonId = 0; - eCJEFHHACMI = 0; + areaId = 0; baseAvatarIdList.clear(); return this; } @@ -297,29 +250,24 @@ public final class StartRogueCsReqOuterClass { } StartRogueCsReq other = (StartRogueCsReq) o; return bitField0_ == other.bitField0_ - && (!hasAreaId() || areaId == other.areaId) && (!hasBuffAeonId() || buffAeonId == other.buffAeonId) - && (!hasECJEFHHACMI() || eCJEFHHACMI == other.eCJEFHHACMI) + && (!hasAreaId() || areaId == other.areaId) && (!hasBaseAvatarIdList() || baseAvatarIdList.equals(other.baseAvatarIdList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(areaId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(buffAeonId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(eCJEFHHACMI); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(areaId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < baseAvatarIdList.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(baseAvatarIdList.array()[i]); } } @@ -329,15 +277,12 @@ public final class StartRogueCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(buffAeonId); } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eCJEFHHACMI); + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += (1 * baseAvatarIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(baseAvatarIdList); } return size; @@ -350,37 +295,28 @@ public final class StartRogueCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // areaId - areaId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { + case 16: { // buffAeonId buffAeonId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // areaId + areaId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 114) { break; } } - case 96: { - // eCJEFHHACMI - eCJEFHHACMI = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { + case 114: { // baseAvatarIdList [packed=true] input.readPackedUInt32(baseAvatarIdList, tag); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { break; @@ -396,10 +332,10 @@ public final class StartRogueCsReqOuterClass { tag = input.readTag(); break; } - case 88: { + case 112: { // baseAvatarIdList [packed=false] tag = input.readRepeatedUInt32(baseAvatarIdList, tag); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; break; } } @@ -410,15 +346,12 @@ public final class StartRogueCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.areaId, areaId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.buffAeonId, buffAeonId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.eCJEFHHACMI, eCJEFHHACMI); + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.areaId, areaId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedUInt32(FieldNames.baseAvatarIdList, baseAvatarIdList); } output.endObject(); @@ -431,11 +364,11 @@ public final class StartRogueCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1409553784: - case -746472947: { - if (input.isAtField(FieldNames.areaId)) { + case 864413617: + case -1316781589: { + if (input.isAtField(FieldNames.buffAeonId)) { if (!input.trySkipNullValue()) { - areaId = input.readUInt32(); + buffAeonId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -443,11 +376,11 @@ public final class StartRogueCsReqOuterClass { } break; } - case 864413617: - case -1316781589: { - if (input.isAtField(FieldNames.buffAeonId)) { + case -1409553784: + case -746472947: { + if (input.isAtField(FieldNames.areaId)) { if (!input.trySkipNullValue()) { - buffAeonId = input.readUInt32(); + areaId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -455,23 +388,12 @@ public final class StartRogueCsReqOuterClass { } break; } - case -499366517: { - if (input.isAtField(FieldNames.eCJEFHHACMI)) { - if (!input.trySkipNullValue()) { - eCJEFHHACMI = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -1212654461: case 914628490: { if (input.isAtField(FieldNames.baseAvatarIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(baseAvatarIdList); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -531,11 +453,9 @@ public final class StartRogueCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName areaId = FieldName.forField("areaId", "area_id"); - static final FieldName buffAeonId = FieldName.forField("buffAeonId", "buff_aeon_id"); - static final FieldName eCJEFHHACMI = FieldName.forField("ECJEFHHACMI"); + static final FieldName areaId = FieldName.forField("areaId", "area_id"); static final FieldName baseAvatarIdList = FieldName.forField("baseAvatarIdList", "base_avatar_id_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/StartRogueScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartRogueScRspOuterClass.java index ecd64f3..6e93421 100644 --- a/src/generated/main/emu/lunarcore/proto/StartRogueScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartRogueScRspOuterClass.java @@ -19,22 +19,22 @@ public final class StartRogueScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 10; */ private int retcode; + /** + * optional .SceneInfo scene = 6; + */ + private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); + /** * optional .LineupInfo lineup = 7; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * optional .SceneInfo scene = 8; - */ - private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); - - /** - * optional .RogueInfo rogue_info = 12; + * optional .RogueInfo rogue_info = 11; */ private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance(); @@ -49,7 +49,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -57,7 +57,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 10; * @return this */ public StartRogueScRsp clearRetcode() { @@ -67,7 +67,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -75,7 +75,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -85,12 +85,69 @@ public final class StartRogueScRspOuterClass { return this; } + /** + * optional .SceneInfo scene = 6; + * @return whether the scene field is set + */ + public boolean hasScene() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .SceneInfo scene = 6; + * @return this + */ + public StartRogueScRsp clearScene() { + bitField0_ &= ~0x00000002; + scene.clear(); + return this; + } + + /** + * optional .SceneInfo scene = 6; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableScene()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneInfoOuterClass.SceneInfo getScene() { + return scene; + } + + /** + * optional .SceneInfo scene = 6; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public SceneInfoOuterClass.SceneInfo getMutableScene() { + bitField0_ |= 0x00000002; + return scene; + } + + /** + * optional .SceneInfo scene = 6; + * @param value the scene to set + * @return this + */ + public 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_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -98,7 +155,7 @@ public final class StartRogueScRspOuterClass { * @return this */ public StartRogueScRsp clearLineup() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; lineup.clear(); return this; } @@ -127,7 +184,7 @@ public final class StartRogueScRspOuterClass { * @return internal storage object for modifications */ public LineupInfoOuterClass.LineupInfo getMutableLineup() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return lineup; } @@ -137,70 +194,13 @@ public final class StartRogueScRspOuterClass { * @return this */ public StartRogueScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; lineup.copyFrom(value); return this; } /** - * optional .SceneInfo scene = 8; - * @return whether the scene field is set - */ - public boolean hasScene() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .SceneInfo scene = 8; - * @return this - */ - public StartRogueScRsp clearScene() { - bitField0_ &= ~0x00000004; - scene.clear(); - return this; - } - - /** - * optional .SceneInfo scene = 8; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableScene()} if you want to modify it. - * - * @return internal storage object for reading - */ - public SceneInfoOuterClass.SceneInfo getScene() { - return scene; - } - - /** - * optional .SceneInfo scene = 8; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * 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 = 8; - * @param value the scene to set - * @return this - */ - public StartRogueScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { - bitField0_ |= 0x00000004; - scene.copyFrom(value); - return this; - } - - /** - * optional .RogueInfo rogue_info = 12; + * optional .RogueInfo rogue_info = 11; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { @@ -208,7 +208,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 12; + * optional .RogueInfo rogue_info = 11; * @return this */ public StartRogueScRsp clearRogueInfo() { @@ -218,7 +218,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 12; + * optional .RogueInfo rogue_info = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -232,7 +232,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 12; + * optional .RogueInfo rogue_info = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -246,7 +246,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 12; + * optional .RogueInfo rogue_info = 11; * @param value the rogueInfo to set * @return this */ @@ -262,8 +262,8 @@ public final class StartRogueScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - lineup.copyFrom(other.lineup); scene.copyFrom(other.scene); + lineup.copyFrom(other.lineup); rogueInfo.copyFrom(other.rogueInfo); } return this; @@ -278,12 +278,12 @@ public final class StartRogueScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasLineup()) { - getMutableLineup().mergeFrom(other.lineup); - } if (other.hasScene()) { getMutableScene().mergeFrom(other.scene); } + if (other.hasLineup()) { + getMutableLineup().mergeFrom(other.lineup); + } if (other.hasRogueInfo()) { getMutableRogueInfo().mergeFrom(other.rogueInfo); } @@ -298,8 +298,8 @@ public final class StartRogueScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - lineup.clear(); scene.clear(); + lineup.clear(); rogueInfo.clear(); return this; } @@ -311,8 +311,8 @@ public final class StartRogueScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - lineup.clearQuick(); scene.clearQuick(); + lineup.clearQuick(); rogueInfo.clearQuick(); return this; } @@ -328,27 +328,27 @@ public final class StartRogueScRspOuterClass { StartRogueScRsp other = (StartRogueScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasLineup() || lineup.equals(other.lineup)) && (!hasScene() || scene.equals(other.scene)) + && (!hasLineup() || lineup.equals(other.lineup)) && (!hasRogueInfo() || rogueInfo.equals(other.rogueInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 50); + output.writeMessageNoTag(scene); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 58); output.writeMessageNoTag(lineup); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 66); - output.writeMessageNoTag(scene); - } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 90); output.writeMessageNoTag(rogueInfo); } } @@ -360,10 +360,10 @@ public final class StartRogueScRspOuterClass { 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(scene); + size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo); @@ -378,11 +378,20 @@ public final class StartRogueScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 50) { + break; + } + } + case 50: { + // scene + input.readMessage(scene); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 58) { break; } @@ -390,22 +399,13 @@ public final class StartRogueScRspOuterClass { case 58: { // lineup input.readMessage(lineup); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { - // scene - input.readMessage(scene); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 98) { + if (tag != 90) { break; } } - case 98: { + case 90: { // rogueInfo input.readMessage(rogueInfo); bitField0_ |= 0x00000008; @@ -435,10 +435,10 @@ public final class StartRogueScRspOuterClass { 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.scene, scene); + output.writeMessage(FieldNames.lineup, lineup); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.rogueInfo, rogueInfo); @@ -464,10 +464,10 @@ public final class StartRogueScRspOuterClass { } 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 { @@ -475,10 +475,10 @@ public final class StartRogueScRspOuterClass { } 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 { @@ -553,10 +553,10 @@ public final class StartRogueScRspOuterClass { 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 lineup = FieldName.forField("lineup"); + static final FieldName rogueInfo = FieldName.forField("rogueInfo", "rogue_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java index 5615efc..b7e60ea 100644 --- a/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java @@ -19,32 +19,32 @@ public final class SwapLineupCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 src_slot = 1; - */ - private int srcSlot; - - /** - * optional uint32 dst_slot = 3; + * optional uint32 dst_slot = 2; */ private int dstSlot; /** - * optional uint32 index = 7; - */ - private int index; - - /** - * optional uint32 plane_id = 8; + * optional uint32 plane_id = 4; */ private int planeId; /** - * optional .ExtraLineupType extra_lineup_type = 11; + * optional uint32 index = 5; + */ + private int index; + + /** + * optional uint32 src_slot = 12; + */ + private int srcSlot; + + /** + * optional .ExtraLineupType extra_lineup_type = 1; */ private int extraLineupType; /** - * optional bool is_virtual = 6; + * optional bool is_virtual = 14; */ private boolean isVirtual; @@ -59,62 +59,25 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 src_slot = 1; - * @return whether the srcSlot field is set + * optional uint32 dst_slot = 2; + * @return whether the dstSlot field is set */ - public boolean hasSrcSlot() { + public boolean hasDstSlot() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 src_slot = 1; - * @return this - */ - public SwapLineupCsReq clearSrcSlot() { - bitField0_ &= ~0x00000001; - srcSlot = 0; - return this; - } - - /** - * optional uint32 src_slot = 1; - * @return the srcSlot - */ - public int getSrcSlot() { - return srcSlot; - } - - /** - * optional uint32 src_slot = 1; - * @param value the srcSlot to set - * @return this - */ - public SwapLineupCsReq setSrcSlot(final int value) { - bitField0_ |= 0x00000001; - srcSlot = value; - return this; - } - - /** - * optional uint32 dst_slot = 3; - * @return whether the dstSlot field is set - */ - public boolean hasDstSlot() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 dst_slot = 3; + * optional uint32 dst_slot = 2; * @return this */ public SwapLineupCsReq clearDstSlot() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; dstSlot = 0; return this; } /** - * optional uint32 dst_slot = 3; + * optional uint32 dst_slot = 2; * @return the dstSlot */ public int getDstSlot() { @@ -122,18 +85,55 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 dst_slot = 3; + * optional uint32 dst_slot = 2; * @param value the dstSlot to set * @return this */ public SwapLineupCsReq setDstSlot(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; dstSlot = value; return this; } /** - * optional uint32 index = 7; + * optional uint32 plane_id = 4; + * @return whether the planeId field is set + */ + public boolean hasPlaneId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 plane_id = 4; + * @return this + */ + public SwapLineupCsReq clearPlaneId() { + bitField0_ &= ~0x00000002; + planeId = 0; + return this; + } + + /** + * optional uint32 plane_id = 4; + * @return the planeId + */ + public int getPlaneId() { + return planeId; + } + + /** + * optional uint32 plane_id = 4; + * @param value the planeId to set + * @return this + */ + public SwapLineupCsReq setPlaneId(final int value) { + bitField0_ |= 0x00000002; + planeId = value; + return this; + } + + /** + * optional uint32 index = 5; * @return whether the index field is set */ public boolean hasIndex() { @@ -141,7 +141,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 index = 7; + * optional uint32 index = 5; * @return this */ public SwapLineupCsReq clearIndex() { @@ -151,7 +151,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 index = 7; + * optional uint32 index = 5; * @return the index */ public int getIndex() { @@ -159,7 +159,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 index = 7; + * optional uint32 index = 5; * @param value the index to set * @return this */ @@ -170,44 +170,44 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 8; - * @return whether the planeId field is set + * optional uint32 src_slot = 12; + * @return whether the srcSlot field is set */ - public boolean hasPlaneId() { + public boolean hasSrcSlot() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 plane_id = 8; + * optional uint32 src_slot = 12; * @return this */ - public SwapLineupCsReq clearPlaneId() { + public SwapLineupCsReq clearSrcSlot() { bitField0_ &= ~0x00000008; - planeId = 0; + srcSlot = 0; return this; } /** - * optional uint32 plane_id = 8; - * @return the planeId + * optional uint32 src_slot = 12; + * @return the srcSlot */ - public int getPlaneId() { - return planeId; + public int getSrcSlot() { + return srcSlot; } /** - * optional uint32 plane_id = 8; - * @param value the planeId to set + * optional uint32 src_slot = 12; + * @param value the srcSlot to set * @return this */ - public SwapLineupCsReq setPlaneId(final int value) { + public SwapLineupCsReq setSrcSlot(final int value) { bitField0_ |= 0x00000008; - planeId = value; + srcSlot = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 11; + * optional .ExtraLineupType extra_lineup_type = 1; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -215,7 +215,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 11; + * optional .ExtraLineupType extra_lineup_type = 1; * @return this */ public SwapLineupCsReq clearExtraLineupType() { @@ -225,7 +225,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 11; + * optional .ExtraLineupType extra_lineup_type = 1; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -258,7 +258,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 11; + * optional .ExtraLineupType extra_lineup_type = 1; * @param value the extraLineupType to set * @return this */ @@ -270,7 +270,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 6; + * optional bool is_virtual = 14; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -278,7 +278,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 6; + * optional bool is_virtual = 14; * @return this */ public SwapLineupCsReq clearIsVirtual() { @@ -288,7 +288,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 6; + * optional bool is_virtual = 14; * @return the isVirtual */ public boolean getIsVirtual() { @@ -296,7 +296,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 6; + * optional bool is_virtual = 14; * @param value the isVirtual to set * @return this */ @@ -311,10 +311,10 @@ public final class SwapLineupCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - srcSlot = other.srcSlot; dstSlot = other.dstSlot; - index = other.index; planeId = other.planeId; + index = other.index; + srcSlot = other.srcSlot; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; } @@ -327,17 +327,17 @@ public final class SwapLineupCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasSrcSlot()) { - setSrcSlot(other.srcSlot); - } if (other.hasDstSlot()) { setDstSlot(other.dstSlot); } + if (other.hasPlaneId()) { + setPlaneId(other.planeId); + } if (other.hasIndex()) { setIndex(other.index); } - if (other.hasPlaneId()) { - setPlaneId(other.planeId); + if (other.hasSrcSlot()) { + setSrcSlot(other.srcSlot); } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); @@ -355,10 +355,10 @@ public final class SwapLineupCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - srcSlot = 0; dstSlot = 0; - index = 0; planeId = 0; + index = 0; + srcSlot = 0; extraLineupType = 0; isVirtual = false; return this; @@ -384,10 +384,10 @@ public final class SwapLineupCsReqOuterClass { } SwapLineupCsReq other = (SwapLineupCsReq) o; return bitField0_ == other.bitField0_ - && (!hasSrcSlot() || srcSlot == other.srcSlot) && (!hasDstSlot() || dstSlot == other.dstSlot) - && (!hasIndex() || index == other.index) && (!hasPlaneId() || planeId == other.planeId) + && (!hasIndex() || index == other.index) + && (!hasSrcSlot() || srcSlot == other.srcSlot) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual); } @@ -395,27 +395,27 @@ public final class SwapLineupCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(srcSlot); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(dstSlot); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(planeId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(planeId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(srcSlot); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 8); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 112); output.writeBoolNoTag(isVirtual); } } @@ -424,16 +424,16 @@ public final class SwapLineupCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(srcSlot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dstSlot); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dstSlot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(srcSlot); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); @@ -451,43 +451,43 @@ public final class SwapLineupCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // srcSlot - srcSlot = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { + case 16: { // dstSlot dstSlot = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 32) { break; } } - case 56: { + case 32: { + // planeId + planeId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // index index = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { + if (tag != 96) { break; } } - case 64: { - // planeId - planeId = input.readUInt32(); + case 96: { + // srcSlot + srcSlot = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 88) { + if (tag != 8) { break; } } - case 88: { + case 8: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { @@ -495,11 +495,11 @@ public final class SwapLineupCsReqOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 48) { + if (tag != 112) { break; } } - case 48: { + case 112: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000020; @@ -526,16 +526,16 @@ public final class SwapLineupCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.srcSlot, srcSlot); + output.writeUInt32(FieldNames.dstSlot, dstSlot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.dstSlot, dstSlot); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.srcSlot, srcSlot); } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); @@ -553,11 +553,11 @@ public final class SwapLineupCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1953527294: - case -418516103: { - if (input.isAtField(FieldNames.srcSlot)) { + case 1958115683: + case 583331896: { + if (input.isAtField(FieldNames.dstSlot)) { if (!input.trySkipNullValue()) { - srcSlot = input.readUInt32(); + dstSlot = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -565,11 +565,11 @@ public final class SwapLineupCsReqOuterClass { } break; } - case 1958115683: - case 583331896: { - if (input.isAtField(FieldNames.dstSlot)) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { - dstSlot = input.readUInt32(); + planeId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -588,11 +588,11 @@ public final class SwapLineupCsReqOuterClass { } break; } - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { + case -1953527294: + case -418516103: { + if (input.isAtField(FieldNames.srcSlot)) { if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); + srcSlot = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -682,13 +682,13 @@ public final class SwapLineupCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName srcSlot = FieldName.forField("srcSlot", "src_slot"); - static final FieldName dstSlot = FieldName.forField("dstSlot", "dst_slot"); + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); + static final FieldName index = FieldName.forField("index"); - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); + static final FieldName srcSlot = FieldName.forField("srcSlot", "src_slot"); static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); diff --git a/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexCsReqOuterClass.java index 06c0f05..d75f1c9 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 = 13; + * optional uint32 index = 4; */ private int index; @@ -34,7 +34,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 13; + * optional uint32 index = 4; * @return whether the index field is set */ public boolean hasIndex() { @@ -42,7 +42,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 13; + * optional uint32 index = 4; * @return this */ public SwitchLineupIndexCsReq clearIndex() { @@ -52,7 +52,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 13; + * optional uint32 index = 4; * @return the index */ public int getIndex() { @@ -60,7 +60,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 13; + * optional uint32 index = 4; * @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) 104); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(index); } } @@ -150,7 +150,7 @@ public final class SwitchLineupIndexCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 32: { // 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 92dabaa..aa1ecac 100644 --- a/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java @@ -19,15 +19,15 @@ public final class SwitchLineupIndexScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; - */ - private int retcode; - - /** - * optional uint32 index = 6; + * optional uint32 index = 4; */ private int index; + /** + * optional uint32 retcode = 10; + */ + private int retcode; + private SwitchLineupIndexScRsp() { } @@ -39,62 +39,25 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 retcode = 4; - * @return whether the retcode field is set + * optional uint32 index = 4; + * @return whether the index field is set */ - public boolean hasRetcode() { + public boolean hasIndex() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 4; - * @return this - */ - public SwitchLineupIndexScRsp 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 SwitchLineupIndexScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 index = 6; - * @return whether the index field is set - */ - public boolean hasIndex() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 index = 6; + * optional uint32 index = 4; * @return this */ public SwitchLineupIndexScRsp clearIndex() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; index = 0; return this; } /** - * optional uint32 index = 6; + * optional uint32 index = 4; * @return the index */ public int getIndex() { @@ -102,23 +65,60 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 index = 6; + * optional uint32 index = 4; * @param value the index to set * @return this */ public SwitchLineupIndexScRsp setIndex(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; index = 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 SwitchLineupIndexScRsp 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 SwitchLineupIndexScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + @Override public SwitchLineupIndexScRsp copyFrom(final SwitchLineupIndexScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; index = other.index; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public final class SwitchLineupIndexScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasIndex()) { setIndex(other.index); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public final class SwitchLineupIndexScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; index = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public final class SwitchLineupIndexScRspOuterClass { } SwitchLineupIndexScRsp other = (SwitchLineupIndexScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasIndex() || index == other.index); + && (!hasIndex() || index == other.index) + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(retcode); + output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(index); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public final class SwitchLineupIndexScRspOuterClass { 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); } return size; } @@ -206,17 +206,17 @@ public final class SwitchLineupIndexScRspOuterClass { while (true) { switch (tag) { case 32: { - // retcode - retcode = input.readUInt32(); + // index + index = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 80) { break; } } - case 48: { - // index - index = input.readUInt32(); + case 80: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class SwitchLineupIndexScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,10 @@ public final class SwitchLineupIndexScRspOuterClass { } 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 { @@ -267,10 +267,10 @@ public final class SwitchLineupIndexScRspOuterClass { } 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 { @@ -331,9 +331,9 @@ public final class SwitchLineupIndexScRspOuterClass { * 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"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SyncApplyFriendScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncApplyFriendScNotifyOuterClass.java index 37f774f..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 = 12; + * 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 = 12; + * 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 = 12; + * optional .FriendApplyInfo friend_apply_info = 6; * @return this */ public SyncApplyFriendScNotify clearFriendApplyInfo() { @@ -52,7 +52,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 12; + * 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 = 12; + * 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 = 12; + * 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) 98); + output.writeRawByte((byte) 50); output.writeMessageNoTag(friendApplyInfo); } } @@ -172,7 +172,7 @@ public final class SyncApplyFriendScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 98: { + 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 e915ec7..17f7e16 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncClientResVersionCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncClientResVersionCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SyncClientResVersionCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 client_res_version = 15; + * optional uint32 client_res_version = 1; */ private int clientResVersion; @@ -34,7 +34,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 15; + * optional uint32 client_res_version = 1; * @return whether the clientResVersion field is set */ public boolean hasClientResVersion() { @@ -42,7 +42,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 15; + * optional uint32 client_res_version = 1; * @return this */ public SyncClientResVersionCsReq clearClientResVersion() { @@ -52,7 +52,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 15; + * optional uint32 client_res_version = 1; * @return the clientResVersion */ public int getClientResVersion() { @@ -60,7 +60,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 15; + * optional uint32 client_res_version = 1; * @param value the clientResVersion to set * @return this */ @@ -129,7 +129,7 @@ public final class SyncClientResVersionCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(clientResVersion); } } @@ -150,7 +150,7 @@ public final class SyncClientResVersionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 8: { // 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 b21223e..093f1dd 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java @@ -19,7 +19,7 @@ public final class SyncClientResVersionScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 client_res_version = 5; + * optional uint32 client_res_version = 11; */ private int clientResVersion; @@ -39,7 +39,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 client_res_version = 5; + * optional uint32 client_res_version = 11; * @return whether the clientResVersion field is set */ public boolean hasClientResVersion() { @@ -47,7 +47,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 client_res_version = 5; + * optional uint32 client_res_version = 11; * @return this */ public SyncClientResVersionScRsp clearClientResVersion() { @@ -57,7 +57,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 client_res_version = 5; + * optional uint32 client_res_version = 11; * @return the clientResVersion */ public int getClientResVersion() { @@ -65,7 +65,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 client_res_version = 5; + * optional uint32 client_res_version = 11; * @param value the clientResVersion to set * @return this */ @@ -177,7 +177,7 @@ public final class SyncClientResVersionScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { @@ -205,7 +205,7 @@ public final class SyncClientResVersionScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 88: { // clientResVersion clientResVersion = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SyncDeleteFriendScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncDeleteFriendScNotifyOuterClass.java index b5eb32a..64bce21 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 = 15; + * optional uint32 uid = 6; */ private int uid; @@ -34,7 +34,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 15; + * optional uint32 uid = 6; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 15; + * optional uint32 uid = 6; * @return this */ public SyncDeleteFriendScNotify clearUid() { @@ -52,7 +52,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 15; + * optional uint32 uid = 6; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 15; + * optional uint32 uid = 6; * @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) 120); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 48: { // 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 f1782d9..430980a 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 = 13; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 9; */ private final RepeatedMessage entityBuffInfoList = RepeatedMessage.newEmptyInstance(EntityBuffChangeInfoOuterClass.EntityBuffChangeInfo.getFactory()); @@ -35,7 +35,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 13; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 9; * @return whether the entityBuffInfoList field is set */ public boolean hasEntityBuffInfoList() { @@ -43,7 +43,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 13; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 9; * @return this */ public SyncEntityBuffChangeListScNotify clearEntityBuffInfoList() { @@ -53,7 +53,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 13; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -68,7 +68,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 13; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -83,7 +83,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 13; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 9; * @param value the entityBuffInfoList to add * @return this */ @@ -95,7 +95,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 13; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 9; * @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) 106); + output.writeRawByte((byte) 74); output.writeMessageNoTag(entityBuffInfoList.get(i)); } } @@ -190,7 +190,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 106: { + case 74: { // 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 c5b3fca..e42c7fb 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 = 15; + * optional uint32 uid = 5; */ private int uid; /** - * optional bool handle_result = 7; + * optional bool handle_result = 14; */ private boolean handleResult; /** - * optional .FriendListInfo handle_friend_info = 2; + * optional .FriendListInfo handle_friend_info = 3; */ private final FriendListInfoOuterClass.FriendListInfo handleFriendInfo = FriendListInfoOuterClass.FriendListInfo.newInstance(); @@ -44,7 +44,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 15; + * 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 = 15; + * optional uint32 uid = 5; * @return this */ public SyncHandleFriendScNotify clearUid() { @@ -62,7 +62,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 15; + * optional uint32 uid = 5; * @return the uid */ public int getUid() { @@ -70,7 +70,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 15; + * optional uint32 uid = 5; * @param value the uid to set * @return this */ @@ -81,7 +81,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 7; + * optional bool handle_result = 14; * @return whether the handleResult field is set */ public boolean hasHandleResult() { @@ -89,7 +89,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 7; + * optional bool handle_result = 14; * @return this */ public SyncHandleFriendScNotify clearHandleResult() { @@ -99,7 +99,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 7; + * optional bool handle_result = 14; * @return the handleResult */ public boolean getHandleResult() { @@ -107,7 +107,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 7; + * optional bool handle_result = 14; * @param value the handleResult to set * @return this */ @@ -118,7 +118,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 2; + * optional .FriendListInfo handle_friend_info = 3; * @return whether the handleFriendInfo field is set */ public boolean hasHandleFriendInfo() { @@ -126,7 +126,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 2; + * optional .FriendListInfo handle_friend_info = 3; * @return this */ public SyncHandleFriendScNotify clearHandleFriendInfo() { @@ -136,7 +136,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 2; + * optional .FriendListInfo handle_friend_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. @@ -150,7 +150,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 2; + * optional .FriendListInfo handle_friend_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 @@ -164,7 +164,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 2; + * optional .FriendListInfo handle_friend_info = 3; * @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) 120); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 112); output.writeBoolNoTag(handleResult); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 26); output.writeMessageNoTag(handleFriendInfo); } } @@ -282,25 +282,25 @@ public final class SyncHandleFriendScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 40: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 112) { break; } } - case 56: { + case 112: { // handleResult handleResult = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 26) { break; } } - case 18: { + case 26: { // 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 993131f..0061125 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncLineupNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncLineupNotifyOuterClass.java @@ -20,12 +20,12 @@ public final class SyncLineupNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .LineupInfo lineup = 1; + * optional .LineupInfo lineup = 6; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * repeated .SyncReason reason_list = 11; + * repeated .SyncReason reason_list = 9; */ private final RepeatedEnum reasonList = RepeatedEnum.newEmptyInstance(SyncReasonOuterClass.SyncReason.converter()); @@ -40,7 +40,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 1; + * optional .LineupInfo lineup = 6; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -48,7 +48,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 1; + * optional .LineupInfo lineup = 6; * @return this */ public SyncLineupNotify clearLineup() { @@ -58,7 +58,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 1; + * optional .LineupInfo lineup = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -72,7 +72,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 1; + * optional .LineupInfo lineup = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -86,7 +86,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 1; + * optional .LineupInfo lineup = 6; * @param value the lineup to set * @return this */ @@ -97,7 +97,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 11; + * repeated .SyncReason reason_list = 9; * @return whether the reasonList field is set */ public boolean hasReasonList() { @@ -105,7 +105,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 11; + * repeated .SyncReason reason_list = 9; * @return this */ public SyncLineupNotify clearReasonList() { @@ -115,7 +115,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 11; + * repeated .SyncReason reason_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. @@ -129,7 +129,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 11; + * repeated .SyncReason reason_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 @@ -143,7 +143,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 11; + * repeated .SyncReason reason_list = 9; * @param value the reasonList to add * @return this */ @@ -154,7 +154,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 11; + * repeated .SyncReason reason_list = 9; * @param values the reasonList to add * @return this */ @@ -231,12 +231,12 @@ public final class SyncLineupNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 50); output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < reasonList.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 72); output.writeEnumNoTag(reasonList.array()[i]); } } @@ -261,16 +261,16 @@ public final class SyncLineupNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 50: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 74) { break; } } - case 90: { + case 74: { // reasonList [packed=true] input.readPackedEnum(reasonList, tag); bitField0_ |= 0x00000002; @@ -289,7 +289,7 @@ public final class SyncLineupNotifyOuterClass { tag = input.readTag(); break; } - case 88: { + case 72: { // reasonList [packed=false] tag = input.readRepeatedEnum(reasonList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java index 88fd98b..8b5d467 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java @@ -10,6 +10,7 @@ import us.hebi.quickbuf.MessageFactory; import us.hebi.quickbuf.ProtoMessage; import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; +import us.hebi.quickbuf.RepeatedMessage; public final class SyncRogueCommonActionResultScNotifyOuterClass { /** @@ -19,18 +20,19 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     * PBCHNCIJKNA MDBPDPDDHBC = 12;
-     *
- * - * optional uint32 OCPBNBPAMEN = 5; + * optional uint32 rogue_version_id = 15; */ - private int oCPBNBPAMEN; + private int rogueVersionId; /** - * optional .RogueActionResult action = 11; + * optional .RogueCommonActionResultDisplayType display_type = 12; */ - private final RogueActionResultOuterClass.RogueActionResult action = RogueActionResultOuterClass.RogueActionResult.newInstance(); + private int displayType; + + /** + * repeated .RogueActionResult action_result_list = 8; + */ + private final RepeatedMessage actionResultList = RepeatedMessage.newEmptyInstance(RogueActionResultOuterClass.RogueActionResult.getFactory()); private SyncRogueCommonActionResultScNotify() { } @@ -43,92 +45,140 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * 
-     * PBCHNCIJKNA MDBPDPDDHBC = 12;
-     *
- * - * optional uint32 OCPBNBPAMEN = 5; - * @return whether the oCPBNBPAMEN field is set + * optional uint32 rogue_version_id = 15; + * @return whether the rogueVersionId field is set */ - public boolean hasOCPBNBPAMEN() { + public boolean hasRogueVersionId() { return (bitField0_ & 0x00000001) != 0; } /** - * 
-     * PBCHNCIJKNA MDBPDPDDHBC = 12;
-     *
- * - * optional uint32 OCPBNBPAMEN = 5; + * optional uint32 rogue_version_id = 15; * @return this */ - public SyncRogueCommonActionResultScNotify clearOCPBNBPAMEN() { + public SyncRogueCommonActionResultScNotify clearRogueVersionId() { bitField0_ &= ~0x00000001; - oCPBNBPAMEN = 0; + rogueVersionId = 0; return this; } /** - * 
-     * PBCHNCIJKNA MDBPDPDDHBC = 12;
-     *
- * - * optional uint32 OCPBNBPAMEN = 5; - * @return the oCPBNBPAMEN + * optional uint32 rogue_version_id = 15; + * @return the rogueVersionId */ - public int getOCPBNBPAMEN() { - return oCPBNBPAMEN; + public int getRogueVersionId() { + return rogueVersionId; } /** - * 
-     * PBCHNCIJKNA MDBPDPDDHBC = 12;
-     *
- * - * optional uint32 OCPBNBPAMEN = 5; - * @param value the oCPBNBPAMEN to set + * optional uint32 rogue_version_id = 15; + * @param value the rogueVersionId to set * @return this */ - public SyncRogueCommonActionResultScNotify setOCPBNBPAMEN(final int value) { + public SyncRogueCommonActionResultScNotify setRogueVersionId(final int value) { bitField0_ |= 0x00000001; - oCPBNBPAMEN = value; + rogueVersionId = value; return this; } /** - * optional .RogueActionResult action = 11; - * @return whether the action field is set + * optional .RogueCommonActionResultDisplayType display_type = 12; + * @return whether the displayType field is set */ - public boolean hasAction() { + public boolean hasDisplayType() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .RogueActionResult action = 11; + * optional .RogueCommonActionResultDisplayType display_type = 12; * @return this */ - public SyncRogueCommonActionResultScNotify clearAction() { + public SyncRogueCommonActionResultScNotify clearDisplayType() { bitField0_ &= ~0x00000002; - action.clear(); + displayType = 0; return this; } /** - * optional .RogueActionResult action = 11; + * optional .RogueCommonActionResultDisplayType display_type = 12; + * @return the displayType + */ + public RogueCommonActionResultDisplayTypeOuterClass.RogueCommonActionResultDisplayType getDisplayType( + ) { + return RogueCommonActionResultDisplayTypeOuterClass.RogueCommonActionResultDisplayType.forNumber(displayType); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link SyncRogueCommonActionResultScNotify#getDisplayType()}.getNumber(). + * + * @return numeric wire representation + */ + public int getDisplayTypeValue() { + return displayType; + } + + /** + * 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 RogueCommonActionResultDisplayTypeOuterClass.RogueCommonActionResultDisplayType}. Setting an invalid value + * can cause {@link SyncRogueCommonActionResultScNotify#getDisplayType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public SyncRogueCommonActionResultScNotify setDisplayTypeValue(final int value) { + bitField0_ |= 0x00000002; + displayType = value; + return this; + } + + /** + * optional .RogueCommonActionResultDisplayType display_type = 12; + * @param value the displayType to set + * @return this + */ + public SyncRogueCommonActionResultScNotify setDisplayType( + final RogueCommonActionResultDisplayTypeOuterClass.RogueCommonActionResultDisplayType value) { + bitField0_ |= 0x00000002; + displayType = value.getNumber(); + return this; + } + + /** + * repeated .RogueActionResult action_result_list = 8; + * @return whether the actionResultList field is set + */ + public boolean hasActionResultList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated .RogueActionResult action_result_list = 8; + * @return this + */ + public SyncRogueCommonActionResultScNotify clearActionResultList() { + bitField0_ &= ~0x00000004; + actionResultList.clear(); + return this; + } + + /** + * repeated .RogueActionResult action_result_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableAction()} if you want to modify it. + * Use {@link #getMutableActionResultList()} if you want to modify it. * * @return internal storage object for reading */ - public RogueActionResultOuterClass.RogueActionResult getAction() { - return action; + public RepeatedMessage getActionResultList() { + return actionResultList; } /** - * optional .RogueActionResult action = 11; + * repeated .RogueActionResult action_result_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 @@ -136,20 +186,33 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { * * @return internal storage object for modifications */ - public RogueActionResultOuterClass.RogueActionResult getMutableAction() { - bitField0_ |= 0x00000002; - return action; + public RepeatedMessage getMutableActionResultList( + ) { + bitField0_ |= 0x00000004; + return actionResultList; } /** - * optional .RogueActionResult action = 11; - * @param value the action to set + * repeated .RogueActionResult action_result_list = 8; + * @param value the actionResultList to add * @return this */ - public SyncRogueCommonActionResultScNotify setAction( + public SyncRogueCommonActionResultScNotify addActionResultList( final RogueActionResultOuterClass.RogueActionResult value) { - bitField0_ |= 0x00000002; - action.copyFrom(value); + bitField0_ |= 0x00000004; + actionResultList.add(value); + return this; + } + + /** + * repeated .RogueActionResult action_result_list = 8; + * @param values the actionResultList to add + * @return this + */ + public SyncRogueCommonActionResultScNotify addAllActionResultList( + final RogueActionResultOuterClass.RogueActionResult... values) { + bitField0_ |= 0x00000004; + actionResultList.addAll(values); return this; } @@ -159,8 +222,9 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - oCPBNBPAMEN = other.oCPBNBPAMEN; - action.copyFrom(other.action); + rogueVersionId = other.rogueVersionId; + displayType = other.displayType; + actionResultList.copyFrom(other.actionResultList); } return this; } @@ -172,11 +236,14 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { return this; } cachedSize = -1; - if (other.hasOCPBNBPAMEN()) { - setOCPBNBPAMEN(other.oCPBNBPAMEN); + if (other.hasRogueVersionId()) { + setRogueVersionId(other.rogueVersionId); } - if (other.hasAction()) { - getMutableAction().mergeFrom(other.action); + if (other.hasDisplayType()) { + setDisplayTypeValue(other.displayType); + } + if (other.hasActionResultList()) { + getMutableActionResultList().addAll(other.actionResultList); } return this; } @@ -188,8 +255,9 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - oCPBNBPAMEN = 0; - action.clear(); + rogueVersionId = 0; + displayType = 0; + actionResultList.clear(); return this; } @@ -200,7 +268,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - action.clearQuick(); + actionResultList.clearQuick(); return this; } @@ -214,19 +282,26 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } SyncRogueCommonActionResultScNotify other = (SyncRogueCommonActionResultScNotify) o; return bitField0_ == other.bitField0_ - && (!hasOCPBNBPAMEN() || oCPBNBPAMEN == other.oCPBNBPAMEN) - && (!hasAction() || action.equals(other.action)); + && (!hasRogueVersionId() || rogueVersionId == other.rogueVersionId) + && (!hasDisplayType() || displayType == other.displayType) + && (!hasActionResultList() || actionResultList.equals(other.actionResultList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(oCPBNBPAMEN); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(rogueVersionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(action); + output.writeRawByte((byte) 96); + output.writeEnumNoTag(displayType); + } + if ((bitField0_ & 0x00000004) != 0) { + for (int i = 0; i < actionResultList.length(); i++) { + output.writeRawByte((byte) 66); + output.writeMessageNoTag(actionResultList.get(i)); + } } } @@ -234,10 +309,13 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(oCPBNBPAMEN); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueVersionId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(action); + size += 1 + ProtoSink.computeEnumSizeNoTag(displayType); + } + if ((bitField0_ & 0x00000004) != 0) { + size += (1 * actionResultList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(actionResultList); } return size; } @@ -250,20 +328,31 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // oCPBNBPAMEN - oCPBNBPAMEN = input.readUInt32(); + case 120: { + // rogueVersionId + rogueVersionId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 96) { break; } } - case 90: { - // action - input.readMessage(action); - bitField0_ |= 0x00000002; + case 96: { + // displayType + final int value = input.readInt32(); + if (RogueCommonActionResultDisplayTypeOuterClass.RogueCommonActionResultDisplayType.forNumber(value) != null) { + displayType = value; + bitField0_ |= 0x00000002; + } tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { + // actionResultList + tag = input.readRepeatedMessage(actionResultList, tag); + bitField0_ |= 0x00000004; if (tag != 0) { break; } @@ -286,10 +375,13 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.oCPBNBPAMEN, oCPBNBPAMEN); + output.writeUInt32(FieldNames.rogueVersionId, rogueVersionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.action, action); + output.writeEnum(FieldNames.displayType, displayType, RogueCommonActionResultDisplayTypeOuterClass.RogueCommonActionResultDisplayType.converter()); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRepeatedMessage(FieldNames.actionResultList, actionResultList); } output.endObject(); } @@ -302,10 +394,11 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1836582037: { - if (input.isAtField(FieldNames.oCPBNBPAMEN)) { + case -1457526951: + case 1832096103: { + if (input.isAtField(FieldNames.rogueVersionId)) { if (!input.trySkipNullValue()) { - oCPBNBPAMEN = input.readUInt32(); + rogueVersionId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -313,11 +406,29 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } break; } - case -1422950858: { - if (input.isAtField(FieldNames.action)) { + case 1714350876: + case 1615288471: { + if (input.isAtField(FieldNames.displayType)) { if (!input.trySkipNullValue()) { - input.readMessage(action); - bitField0_ |= 0x00000002; + final RogueCommonActionResultDisplayTypeOuterClass.RogueCommonActionResultDisplayType value = input.readEnum(RogueCommonActionResultDisplayTypeOuterClass.RogueCommonActionResultDisplayType.converter()); + if (value != null) { + displayType = value.getNumber(); + bitField0_ |= 0x00000002; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + case 157295921: + case -462723337: { + if (input.isAtField(FieldNames.actionResultList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(actionResultList); + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -379,9 +490,11 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName oCPBNBPAMEN = FieldName.forField("OCPBNBPAMEN"); + static final FieldName rogueVersionId = FieldName.forField("rogueVersionId", "rogue_version_id"); - static final FieldName action = FieldName.forField("action"); + static final FieldName displayType = FieldName.forField("displayType", "display_type"); + + static final FieldName actionResultList = FieldName.forField("actionResultList", "action_result_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java index 1f8f50d..7036d11 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 OCPBNBPAMEN = 9; + * optional uint32 rogue_version_id = 3; */ - private int oCPBNBPAMEN; + private int rogueVersionId; /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 4; + * optional .RogueCommonPendingAction rogue_common_pending_action = 14; */ private final RogueCommonPendingActionOuterClass.RogueCommonPendingAction rogueCommonPendingAction = RogueCommonPendingActionOuterClass.RogueCommonPendingAction.newInstance(); @@ -39,44 +39,44 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional uint32 OCPBNBPAMEN = 9; - * @return whether the oCPBNBPAMEN field is set + * optional uint32 rogue_version_id = 3; + * @return whether the rogueVersionId field is set */ - public boolean hasOCPBNBPAMEN() { + public boolean hasRogueVersionId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 OCPBNBPAMEN = 9; + * optional uint32 rogue_version_id = 3; * @return this */ - public SyncRogueCommonPendingActionScNotify clearOCPBNBPAMEN() { + public SyncRogueCommonPendingActionScNotify clearRogueVersionId() { bitField0_ &= ~0x00000001; - oCPBNBPAMEN = 0; + rogueVersionId = 0; return this; } /** - * optional uint32 OCPBNBPAMEN = 9; - * @return the oCPBNBPAMEN + * optional uint32 rogue_version_id = 3; + * @return the rogueVersionId */ - public int getOCPBNBPAMEN() { - return oCPBNBPAMEN; + public int getRogueVersionId() { + return rogueVersionId; } /** - * optional uint32 OCPBNBPAMEN = 9; - * @param value the oCPBNBPAMEN to set + * optional uint32 rogue_version_id = 3; + * @param value the rogueVersionId to set * @return this */ - public SyncRogueCommonPendingActionScNotify setOCPBNBPAMEN(final int value) { + public SyncRogueCommonPendingActionScNotify setRogueVersionId(final int value) { bitField0_ |= 0x00000001; - oCPBNBPAMEN = value; + rogueVersionId = value; return this; } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 4; + * optional .RogueCommonPendingAction rogue_common_pending_action = 14; * @return whether the rogueCommonPendingAction field is set */ public boolean hasRogueCommonPendingAction() { @@ -84,7 +84,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 4; + * optional .RogueCommonPendingAction rogue_common_pending_action = 14; * @return this */ public SyncRogueCommonPendingActionScNotify clearRogueCommonPendingAction() { @@ -94,7 +94,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 4; + * optional .RogueCommonPendingAction rogue_common_pending_action = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 4; + * optional .RogueCommonPendingAction rogue_common_pending_action = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -124,7 +124,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 4; + * optional .RogueCommonPendingAction rogue_common_pending_action = 14; * @param value the rogueCommonPendingAction to set * @return this */ @@ -141,7 +141,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - oCPBNBPAMEN = other.oCPBNBPAMEN; + rogueVersionId = other.rogueVersionId; rogueCommonPendingAction.copyFrom(other.rogueCommonPendingAction); } return this; @@ -154,8 +154,8 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { return this; } cachedSize = -1; - if (other.hasOCPBNBPAMEN()) { - setOCPBNBPAMEN(other.oCPBNBPAMEN); + if (other.hasRogueVersionId()) { + setRogueVersionId(other.rogueVersionId); } if (other.hasRogueCommonPendingAction()) { getMutableRogueCommonPendingAction().mergeFrom(other.rogueCommonPendingAction); @@ -170,7 +170,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - oCPBNBPAMEN = 0; + rogueVersionId = 0; rogueCommonPendingAction.clear(); return this; } @@ -196,18 +196,18 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } SyncRogueCommonPendingActionScNotify other = (SyncRogueCommonPendingActionScNotify) o; return bitField0_ == other.bitField0_ - && (!hasOCPBNBPAMEN() || oCPBNBPAMEN == other.oCPBNBPAMEN) + && (!hasRogueVersionId() || rogueVersionId == other.rogueVersionId) && (!hasRogueCommonPendingAction() || rogueCommonPendingAction.equals(other.rogueCommonPendingAction)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(oCPBNBPAMEN); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(rogueVersionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 114); output.writeMessageNoTag(rogueCommonPendingAction); } } @@ -216,7 +216,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(oCPBNBPAMEN); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueVersionId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueCommonPendingAction); @@ -232,16 +232,16 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // oCPBNBPAMEN - oCPBNBPAMEN = input.readUInt32(); + case 24: { + // rogueVersionId + rogueVersionId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 114) { break; } } - case 34: { + case 114: { // rogueCommonPendingAction input.readMessage(rogueCommonPendingAction); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.oCPBNBPAMEN, oCPBNBPAMEN); + output.writeUInt32(FieldNames.rogueVersionId, rogueVersionId); } if ((bitField0_ & 0x00000002) != 0) { output.writeMessage(FieldNames.rogueCommonPendingAction, rogueCommonPendingAction); @@ -284,10 +284,11 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1836582037: { - if (input.isAtField(FieldNames.oCPBNBPAMEN)) { + case -1457526951: + case 1832096103: { + if (input.isAtField(FieldNames.rogueVersionId)) { if (!input.trySkipNullValue()) { - oCPBNBPAMEN = input.readUInt32(); + rogueVersionId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -362,7 +363,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName oCPBNBPAMEN = FieldName.forField("OCPBNBPAMEN"); + static final FieldName rogueVersionId = FieldName.forField("rogueVersionId", "rogue_version_id"); static final FieldName rogueCommonPendingAction = FieldName.forField("rogueCommonPendingAction", "rogue_common_pending_action"); } diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueDialogueEventDataScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueDialogueEventDataScNotifyOuterClass.java index be7355d..1c608e1 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncRogueDialogueEventDataScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncRogueDialogueEventDataScNotifyOuterClass.java @@ -20,7 +20,7 @@ public final class SyncRogueDialogueEventDataScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .RogueDialogueEvent rogue_dialogue_event = 1; + * repeated .RogueDialogueEvent rogue_dialogue_event = 2; */ private final RepeatedMessage rogueDialogueEvent = RepeatedMessage.newEmptyInstance(RogueDialogueEventOuterClass.RogueDialogueEvent.getFactory()); @@ -35,7 +35,7 @@ public final class SyncRogueDialogueEventDataScNotifyOuterClass { } /** - * repeated .RogueDialogueEvent rogue_dialogue_event = 1; + * repeated .RogueDialogueEvent rogue_dialogue_event = 2; * @return whether the rogueDialogueEvent field is set */ public boolean hasRogueDialogueEvent() { @@ -43,7 +43,7 @@ public final class SyncRogueDialogueEventDataScNotifyOuterClass { } /** - * repeated .RogueDialogueEvent rogue_dialogue_event = 1; + * repeated .RogueDialogueEvent rogue_dialogue_event = 2; * @return this */ public SyncRogueDialogueEventDataScNotify clearRogueDialogueEvent() { @@ -53,7 +53,7 @@ public final class SyncRogueDialogueEventDataScNotifyOuterClass { } /** - * repeated .RogueDialogueEvent rogue_dialogue_event = 1; + * repeated .RogueDialogueEvent rogue_dialogue_event = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -68,7 +68,7 @@ public final class SyncRogueDialogueEventDataScNotifyOuterClass { } /** - * repeated .RogueDialogueEvent rogue_dialogue_event = 1; + * repeated .RogueDialogueEvent rogue_dialogue_event = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -83,7 +83,7 @@ public final class SyncRogueDialogueEventDataScNotifyOuterClass { } /** - * repeated .RogueDialogueEvent rogue_dialogue_event = 1; + * repeated .RogueDialogueEvent rogue_dialogue_event = 2; * @param value the rogueDialogueEvent to add * @return this */ @@ -95,7 +95,7 @@ public final class SyncRogueDialogueEventDataScNotifyOuterClass { } /** - * repeated .RogueDialogueEvent rogue_dialogue_event = 1; + * repeated .RogueDialogueEvent rogue_dialogue_event = 2; * @param values the rogueDialogueEvent to add * @return this */ @@ -169,7 +169,7 @@ public final class SyncRogueDialogueEventDataScNotifyOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < rogueDialogueEvent.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 18); output.writeMessageNoTag(rogueDialogueEvent.get(i)); } } @@ -192,7 +192,7 @@ public final class SyncRogueDialogueEventDataScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 18: { // rogueDialogueEvent tag = input.readRepeatedMessage(rogueDialogueEvent, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueFinishScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueFinishScNotifyOuterClass.java index e351360..75cda39 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 = 3; + * optional .RogueFinishInfo finish_info = 12; */ private final RogueFinishInfoOuterClass.RogueFinishInfo finishInfo = RogueFinishInfoOuterClass.RogueFinishInfo.newInstance(); @@ -34,7 +34,7 @@ public final class SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 3; + * optional .RogueFinishInfo finish_info = 12; * @return whether the finishInfo field is set */ public boolean hasFinishInfo() { @@ -42,7 +42,7 @@ public final class SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 3; + * optional .RogueFinishInfo finish_info = 12; * @return this */ public SyncRogueFinishScNotify clearFinishInfo() { @@ -52,7 +52,7 @@ public final class SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 3; + * optional .RogueFinishInfo finish_info = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public final class SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 3; + * optional .RogueFinishInfo finish_info = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public final class SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 3; + * optional .RogueFinishInfo finish_info = 12; * @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) 26); + output.writeRawByte((byte) 98); output.writeMessageNoTag(finishInfo); } } @@ -172,7 +172,7 @@ public final class SyncRogueFinishScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { + case 98: { // finishInfo input.readMessage(finishInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardCsReqOuterClass.java index 9db80a8..5e4183f 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class TakeChallengeRewardCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 group_id = 1; + * optional uint32 group_id = 5; */ private int groupId; @@ -34,7 +34,7 @@ public final class TakeChallengeRewardCsReqOuterClass { } /** - * optional uint32 group_id = 1; + * optional uint32 group_id = 5; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -42,7 +42,7 @@ public final class TakeChallengeRewardCsReqOuterClass { } /** - * optional uint32 group_id = 1; + * optional uint32 group_id = 5; * @return this */ public TakeChallengeRewardCsReq clearGroupId() { @@ -52,7 +52,7 @@ public final class TakeChallengeRewardCsReqOuterClass { } /** - * optional uint32 group_id = 1; + * optional uint32 group_id = 5; * @return the groupId */ public int getGroupId() { @@ -60,7 +60,7 @@ public final class TakeChallengeRewardCsReqOuterClass { } /** - * optional uint32 group_id = 1; + * optional uint32 group_id = 5; * @param value the groupId to set * @return this */ @@ -129,7 +129,7 @@ public final class TakeChallengeRewardCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(groupId); } } @@ -150,7 +150,7 @@ public final class TakeChallengeRewardCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 40: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardScRspOuterClass.java index f334c63..997544f 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardScRspOuterClass.java @@ -20,17 +20,17 @@ public final class TakeChallengeRewardScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 group_id = 6; - */ - private int groupId; - - /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 6; */ private int retcode; /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 10; + * optional uint32 group_id = 14; + */ + private int groupId; + + /** + * repeated .TakenChallengeRewardInfo taken_reward_list = 13; */ private final RepeatedMessage takenRewardList = RepeatedMessage.newEmptyInstance(TakenChallengeRewardInfoOuterClass.TakenChallengeRewardInfo.getFactory()); @@ -45,62 +45,25 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 group_id = 6; - * @return whether the groupId field is set + * optional uint32 retcode = 6; + * @return whether the retcode field is set */ - public boolean hasGroupId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 group_id = 6; - * @return this - */ - public TakeChallengeRewardScRsp clearGroupId() { - bitField0_ &= ~0x00000001; - groupId = 0; - return this; - } - - /** - * optional uint32 group_id = 6; - * @return the groupId - */ - public int getGroupId() { - return groupId; - } - - /** - * optional uint32 group_id = 6; - * @param value the groupId to set - * @return this - */ - public TakeChallengeRewardScRsp setGroupId(final int value) { - bitField0_ |= 0x00000001; - groupId = value; - return this; - } - - /** - * optional uint32 retcode = 14; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 6; * @return this */ public TakeChallengeRewardScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -108,18 +71,55 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ public TakeChallengeRewardScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 10; + * optional uint32 group_id = 14; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 group_id = 14; + * @return this + */ + public TakeChallengeRewardScRsp clearGroupId() { + bitField0_ &= ~0x00000002; + groupId = 0; + return this; + } + + /** + * optional uint32 group_id = 14; + * @return the groupId + */ + public int getGroupId() { + return groupId; + } + + /** + * optional uint32 group_id = 14; + * @param value the groupId to set + * @return this + */ + public TakeChallengeRewardScRsp setGroupId(final int value) { + bitField0_ |= 0x00000002; + groupId = value; + return this; + } + + /** + * repeated .TakenChallengeRewardInfo taken_reward_list = 13; * @return whether the takenRewardList field is set */ public boolean hasTakenRewardList() { @@ -127,7 +127,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 10; + * repeated .TakenChallengeRewardInfo taken_reward_list = 13; * @return this */ public TakeChallengeRewardScRsp clearTakenRewardList() { @@ -137,7 +137,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 10; + * repeated .TakenChallengeRewardInfo taken_reward_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -152,7 +152,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 10; + * repeated .TakenChallengeRewardInfo taken_reward_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -167,7 +167,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 10; + * repeated .TakenChallengeRewardInfo taken_reward_list = 13; * @param value the takenRewardList to add * @return this */ @@ -179,7 +179,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 10; + * repeated .TakenChallengeRewardInfo taken_reward_list = 13; * @param values the takenRewardList to add * @return this */ @@ -195,8 +195,8 @@ public final class TakeChallengeRewardScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - groupId = other.groupId; retcode = other.retcode; + groupId = other.groupId; takenRewardList.copyFrom(other.takenRewardList); } return this; @@ -208,12 +208,12 @@ public final class TakeChallengeRewardScRspOuterClass { return this; } cachedSize = -1; - if (other.hasGroupId()) { - setGroupId(other.groupId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } if (other.hasTakenRewardList()) { getMutableTakenRewardList().addAll(other.takenRewardList); } @@ -227,8 +227,8 @@ public final class TakeChallengeRewardScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - groupId = 0; retcode = 0; + groupId = 0; takenRewardList.clear(); return this; } @@ -254,8 +254,8 @@ public final class TakeChallengeRewardScRspOuterClass { } TakeChallengeRewardScRsp other = (TakeChallengeRewardScRsp) o; return bitField0_ == other.bitField0_ - && (!hasGroupId() || groupId == other.groupId) && (!hasRetcode() || retcode == other.retcode) + && (!hasGroupId() || groupId == other.groupId) && (!hasTakenRewardList() || takenRewardList.equals(other.takenRewardList)); } @@ -263,15 +263,15 @@ public final class TakeChallengeRewardScRspOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 48); - output.writeUInt32NoTag(groupId); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(retcode); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < takenRewardList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 106); output.writeMessageNoTag(takenRewardList.get(i)); } } @@ -281,10 +281,10 @@ public final class TakeChallengeRewardScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * takenRewardList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(takenRewardList); @@ -300,8 +300,8 @@ public final class TakeChallengeRewardScRspOuterClass { while (true) { switch (tag) { case 48: { - // groupId - groupId = input.readUInt32(); + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 112) { @@ -309,15 +309,15 @@ public final class TakeChallengeRewardScRspOuterClass { } } case 112: { - // retcode - retcode = input.readUInt32(); + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { + if (tag != 106) { break; } } - case 82: { + case 106: { // takenRewardList tag = input.readRepeatedMessage(takenRewardList, tag); bitField0_ |= 0x00000004; @@ -343,10 +343,10 @@ public final class TakeChallengeRewardScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.takenRewardList, takenRewardList); @@ -361,11 +361,10 @@ public final class TakeChallengeRewardScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -373,10 +372,11 @@ public final class TakeChallengeRewardScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -449,10 +449,10 @@ public final class TakeChallengeRewardScRspOuterClass { * 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 groupId = FieldName.forField("groupId", "group_id"); + static final FieldName takenRewardList = FieldName.forField("takenRewardList", "taken_reward_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentScRspOuterClass.java index 65a7660..37c943e 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentScRspOuterClass.java @@ -20,7 +20,7 @@ public final class TakeMailAttachmentScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 3; */ private int retcode; @@ -30,7 +30,7 @@ public final class TakeMailAttachmentScRspOuterClass { private final ItemListOuterClass.ItemList attachment = ItemListOuterClass.ItemList.newInstance(); /** - * repeated uint32 succ_mail_id_list = 13; + * repeated uint32 succ_mail_id_list = 6; */ private final RepeatedInt succMailIdList = RepeatedInt.newEmptyInstance(); @@ -45,7 +45,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 3; * @return this */ public TakeMailAttachmentScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 3; * @param value the retcode 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 = 6; * @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 = 6; * @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 = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -171,7 +171,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 13; + * repeated uint32 succ_mail_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 @@ -185,7 +185,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 13; + * repeated uint32 succ_mail_id_list = 6; * @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 = 6; * @param values the succMailIdList to add * @return this */ @@ -279,7 +279,7 @@ public final class TakeMailAttachmentScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { @@ -288,7 +288,7 @@ public final class TakeMailAttachmentScRspOuterClass { } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < succMailIdList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(succMailIdList.array()[i]); } } @@ -316,7 +316,7 @@ public final class TakeMailAttachmentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; @@ -330,11 +330,11 @@ public final class TakeMailAttachmentScRspOuterClass { input.readMessage(attachment); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 106) { + if (tag != 50) { break; } } - case 106: { + case 50: { // succMailIdList [packed=true] input.readPackedUInt32(succMailIdList, tag); bitField0_ |= 0x00000004; @@ -353,7 +353,7 @@ public final class TakeMailAttachmentScRspOuterClass { tag = input.readTag(); break; } - case 104: { + case 48: { // 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 3a7aba8..bc27248 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 base_avatar_id = 7; + * optional uint32 base_avatar_id = 4; */ private int baseAvatarId; @@ -34,7 +34,7 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 base_avatar_id = 4; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -42,7 +42,7 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 base_avatar_id = 4; * @return this */ public TakeOffEquipmentCsReq clearBaseAvatarId() { @@ -52,7 +52,7 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 base_avatar_id = 4; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -60,7 +60,7 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 base_avatar_id = 4; * @param value the baseAvatarId 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) 56); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(baseAvatarId); } } @@ -150,7 +150,7 @@ public final class TakeOffEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 32: { // baseAvatarId baseAvatarId = 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 5f50e09..cbbd2a9 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 base_avatar_id = 8; + * optional uint32 base_avatar_id = 11; */ private int baseAvatarId; /** - * repeated uint32 slot_list = 5; + * repeated uint32 slot_list = 1; */ private final RepeatedInt slotList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 11; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -48,7 +48,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 11; * @return this */ public TakeOffRelicCsReq clearBaseAvatarId() { @@ -58,7 +58,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 11; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -66,7 +66,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 11; * @param value the baseAvatarId to set * @return this */ @@ -77,7 +77,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 5; + * repeated uint32 slot_list = 1; * @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 = 1; * @return this */ public TakeOffRelicCsReq clearSlotList() { @@ -95,7 +95,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 5; + * repeated uint32 slot_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 TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 5; + * repeated uint32 slot_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 TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 5; + * repeated uint32 slot_list = 1; * @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 = 1; * @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) 88); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < slotList.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(slotList.array()[i]); } } @@ -240,16 +240,16 @@ public final class TakeOffRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 88: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 10) { break; } } - case 42: { + case 10: { // slotList [packed=true] input.readPackedUInt32(slotList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class TakeOffRelicCsReqOuterClass { tag = input.readTag(); break; } - case 40: { + case 8: { // 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 b3a10c4..33516cc 100644 --- a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class TakePromotionRewardCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 6; */ private int baseAvatarId; /** - * optional uint32 promotion = 10; + * optional uint32 promotion = 14; */ private int promotion; @@ -39,7 +39,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 6; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -47,7 +47,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 6; * @return this */ public TakePromotionRewardCsReq clearBaseAvatarId() { @@ -57,7 +57,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 6; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -65,7 +65,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 6; * @param value the baseAvatarId to set * @return this */ @@ -76,7 +76,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 promotion = 10; + * optional uint32 promotion = 14; * @return whether the promotion field is set */ public boolean hasPromotion() { @@ -84,7 +84,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 promotion = 10; + * optional uint32 promotion = 14; * @return this */ public TakePromotionRewardCsReq clearPromotion() { @@ -94,7 +94,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 promotion = 10; + * optional uint32 promotion = 14; * @return the promotion */ public int getPromotion() { @@ -102,7 +102,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 promotion = 10; + * optional uint32 promotion = 14; * @param value the promotion to set * @return this */ @@ -177,11 +177,11 @@ public final class TakePromotionRewardCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(promotion); } } @@ -205,16 +205,16 @@ public final class TakePromotionRewardCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 48: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 112) { break; } } - case 80: { + case 112: { // promotion promotion = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java index 9997c59..e9c16f1 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 = 12; + * optional uint32 retcode = 10; */ private int retcode; /** - * optional .ItemList reward_list = 10; + * optional .ItemList reward_list = 4; */ private final ItemListOuterClass.ItemList rewardList = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 10; * @return this */ public TakePromotionRewardScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 10; + * optional .ItemList reward_list = 4; * @return whether the rewardList field is set */ public boolean hasRewardList() { @@ -84,7 +84,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 10; + * optional .ItemList reward_list = 4; * @return this */ public TakePromotionRewardScRsp clearRewardList() { @@ -94,7 +94,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 10; + * optional .ItemList 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. @@ -108,7 +108,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 10; + * optional .ItemList 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 @@ -122,7 +122,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 10; + * optional .ItemList reward_list = 4; * @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) 96); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 34); output.writeMessageNoTag(rewardList); } } @@ -226,16 +226,16 @@ public final class TakePromotionRewardScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 34) { break; } } - case 82: { + case 34: { // 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 dfb530d..95e2659 100644 --- a/src/generated/main/emu/lunarcore/proto/TakenChallengeRewardInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakenChallengeRewardInfoOuterClass.java @@ -19,12 +19,12 @@ public final class TakenChallengeRewardInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 star_count = 9; + * optional uint32 star_count = 7; */ private int starCount; /** - * optional .ItemList reward = 14; + * optional .ItemList reward = 11; */ private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 9; + * optional uint32 star_count = 7; * @return whether the starCount field is set */ public boolean hasStarCount() { @@ -47,7 +47,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 9; + * optional uint32 star_count = 7; * @return this */ public TakenChallengeRewardInfo clearStarCount() { @@ -57,7 +57,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 9; + * optional uint32 star_count = 7; * @return the starCount */ public int getStarCount() { @@ -65,7 +65,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 9; + * optional uint32 star_count = 7; * @param value the starCount to set * @return this */ @@ -76,7 +76,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 14; + * optional .ItemList reward = 11; * @return whether the reward field is set */ public boolean hasReward() { @@ -84,7 +84,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 14; + * optional .ItemList reward = 11; * @return this */ public TakenChallengeRewardInfo clearReward() { @@ -94,7 +94,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 14; + * 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. @@ -108,7 +108,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 14; + * 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 @@ -122,7 +122,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 14; + * optional .ItemList reward = 11; * @param value the reward to set * @return this */ @@ -198,11 +198,11 @@ public final class TakenChallengeRewardInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(starCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 90); output.writeMessageNoTag(reward); } } @@ -226,16 +226,16 @@ public final class TakenChallengeRewardInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 56: { // starCount starCount = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 90) { break; } } - case 114: { + case 90: { // reward input.readMessage(reward); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/TextJoinQueryCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TextJoinQueryCsReqOuterClass.java index d15e9bf..498a511 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 = 15; + * repeated uint32 text_join_id_list = 1; */ private final RepeatedInt textJoinIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 15; + * repeated uint32 text_join_id_list = 1; * @return whether the textJoinIdList field is set */ public boolean hasTextJoinIdList() { @@ -43,7 +43,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 15; + * repeated uint32 text_join_id_list = 1; * @return this */ public TextJoinQueryCsReq clearTextJoinIdList() { @@ -53,7 +53,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 15; + * repeated uint32 text_join_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 TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 15; + * repeated uint32 text_join_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 TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 15; + * repeated uint32 text_join_id_list = 1; * @param value the textJoinIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 15; + * repeated uint32 text_join_id_list = 1; * @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) 120); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(textJoinIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class TextJoinQueryCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 122: { + case 10: { // textJoinIdList [packed=true] input.readPackedUInt32(textJoinIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class TextJoinQueryCsReqOuterClass { tag = input.readTag(); break; } - case 120: { + case 8: { // 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 850a96a..bf26b1b 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 = 1; */ private int retcode; /** - * repeated .TextJoinInfo text_join_list = 15; + * repeated .TextJoinInfo text_join_list = 6; */ private final RepeatedMessage textJoinList = RepeatedMessage.newEmptyInstance(TextJoinInfoOuterClass.TextJoinInfo.getFactory()); @@ -40,7 +40,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 1; * @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 = 1; * @return this */ public TextJoinQueryScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 15; + * repeated .TextJoinInfo text_join_list = 6; * @return whether the textJoinList field is set */ public boolean hasTextJoinList() { @@ -85,7 +85,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 15; + * repeated .TextJoinInfo text_join_list = 6; * @return this */ public TextJoinQueryScRsp clearTextJoinList() { @@ -95,7 +95,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 15; + * repeated .TextJoinInfo text_join_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 TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 15; + * repeated .TextJoinInfo text_join_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 TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 15; + * repeated .TextJoinInfo text_join_list = 6; * @param value the textJoinList to add * @return this */ @@ -134,7 +134,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 15; + * repeated .TextJoinInfo text_join_list = 6; * @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) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < textJoinList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 50); output.writeMessageNoTag(textJoinList.get(i)); } } @@ -241,16 +241,16 @@ public final class TextJoinQueryScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 50) { break; } } - case 122: { + case 50: { // textJoinList tag = input.readRepeatedMessage(textJoinList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicCsReqOuterClass.java index baf8a6b..6f248b8 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class UnlockBackGroundMusicCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 unlock_ids = 5; + * repeated uint32 unlock_ids = 14; */ private final RepeatedInt unlockIds = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class UnlockBackGroundMusicCsReqOuterClass { } /** - * repeated uint32 unlock_ids = 5; + * repeated uint32 unlock_ids = 14; * @return whether the unlockIds field is set */ public boolean hasUnlockIds() { @@ -43,7 +43,7 @@ public final class UnlockBackGroundMusicCsReqOuterClass { } /** - * repeated uint32 unlock_ids = 5; + * repeated uint32 unlock_ids = 14; * @return this */ public UnlockBackGroundMusicCsReq clearUnlockIds() { @@ -53,7 +53,7 @@ public final class UnlockBackGroundMusicCsReqOuterClass { } /** - * repeated uint32 unlock_ids = 5; + * repeated uint32 unlock_ids = 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 UnlockBackGroundMusicCsReqOuterClass { } /** - * repeated uint32 unlock_ids = 5; + * repeated uint32 unlock_ids = 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 UnlockBackGroundMusicCsReqOuterClass { } /** - * repeated uint32 unlock_ids = 5; + * repeated uint32 unlock_ids = 14; * @param value the unlockIds to add * @return this */ @@ -92,7 +92,7 @@ public final class UnlockBackGroundMusicCsReqOuterClass { } /** - * repeated uint32 unlock_ids = 5; + * repeated uint32 unlock_ids = 14; * @param values the unlockIds to add * @return this */ @@ -163,7 +163,7 @@ public final class UnlockBackGroundMusicCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < unlockIds.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(unlockIds.array()[i]); } } @@ -185,7 +185,7 @@ public final class UnlockBackGroundMusicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 42: { + case 114: { // unlockIds [packed=true] input.readPackedUInt32(unlockIds, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class UnlockBackGroundMusicCsReqOuterClass { tag = input.readTag(); break; } - case 40: { + case 112: { // unlockIds [packed=false] tag = input.readRepeatedUInt32(unlockIds, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockBackGroundMusicScRspOuterClass.java index dc4aa87..28f9f90 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 = 12; + * optional uint32 retcode = 5; */ private int retcode; /** - * repeated uint32 unlocked_ids = 4; + * repeated uint32 unlocked_ids = 10; */ private final RepeatedInt unlockedIds = RepeatedInt.newEmptyInstance(); /** - * repeated .UnlockedMusic music_list = 2; + * repeated .UnlockedMusic music_list = 12; */ private final RepeatedMessage musicList = RepeatedMessage.newEmptyInstance(UnlockedMusicOuterClass.UnlockedMusic.getFactory()); @@ -46,7 +46,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -54,7 +54,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @return this */ public UnlockBackGroundMusicScRsp clearRetcode() { @@ -64,7 +64,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -72,7 +72,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -83,7 +83,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated uint32 unlocked_ids = 4; + * repeated uint32 unlocked_ids = 10; * @return whether the unlockedIds field is set */ public boolean hasUnlockedIds() { @@ -91,7 +91,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated uint32 unlocked_ids = 4; + * repeated uint32 unlocked_ids = 10; * @return this */ public UnlockBackGroundMusicScRsp clearUnlockedIds() { @@ -101,7 +101,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated uint32 unlocked_ids = 4; + * repeated uint32 unlocked_ids = 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. @@ -115,7 +115,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated uint32 unlocked_ids = 4; + * repeated uint32 unlocked_ids = 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 @@ -129,7 +129,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated uint32 unlocked_ids = 4; + * repeated uint32 unlocked_ids = 10; * @param value the unlockedIds to add * @return this */ @@ -140,7 +140,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated uint32 unlocked_ids = 4; + * repeated uint32 unlocked_ids = 10; * @param values the unlockedIds to add * @return this */ @@ -151,7 +151,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 2; + * repeated .UnlockedMusic music_list = 12; * @return whether the musicList field is set */ public boolean hasMusicList() { @@ -159,7 +159,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 2; + * repeated .UnlockedMusic music_list = 12; * @return this */ public UnlockBackGroundMusicScRsp clearMusicList() { @@ -169,7 +169,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 2; + * repeated .UnlockedMusic music_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. @@ -183,7 +183,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 2; + * repeated .UnlockedMusic music_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 @@ -197,7 +197,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 2; + * repeated .UnlockedMusic music_list = 12; * @param value the musicList to add * @return this */ @@ -209,7 +209,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 2; + * repeated .UnlockedMusic music_list = 12; * @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) 96); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unlockedIds.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(unlockedIds.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < musicList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 98); output.writeMessageNoTag(musicList.get(i)); } } @@ -332,25 +332,25 @@ public final class UnlockBackGroundMusicScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 82) { break; } } - case 34: { + case 82: { // unlockedIds [packed=true] input.readPackedUInt32(unlockedIds, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 98) { break; } } - case 18: { + case 98: { // musicList tag = input.readRepeatedMessage(musicList, tag); bitField0_ |= 0x00000004; @@ -368,7 +368,7 @@ public final class UnlockBackGroundMusicScRspOuterClass { tag = input.readTag(); break; } - case 32: { + case 80: { // 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 2d6334b..babc25d 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 = 9; + * optional uint32 bubble_id = 15; */ private int bubbleId; @@ -34,7 +34,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 9; + * optional uint32 bubble_id = 15; * @return whether the bubbleId field is set */ public boolean hasBubbleId() { @@ -42,7 +42,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 9; + * optional uint32 bubble_id = 15; * @return this */ public UnlockChatBubbleScNotify clearBubbleId() { @@ -52,7 +52,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 9; + * optional uint32 bubble_id = 15; * @return the bubbleId */ public int getBubbleId() { @@ -60,7 +60,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 9; + * optional uint32 bubble_id = 15; * @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) 72); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(bubbleId); } } @@ -150,7 +150,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 120: { // 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 bbf4847..25f005e 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 = 4; + * optional uint32 theme_id = 2; */ private int themeId; @@ -34,7 +34,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 4; + * optional uint32 theme_id = 2; * @return whether the themeId field is set */ public boolean hasThemeId() { @@ -42,7 +42,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 4; + * optional uint32 theme_id = 2; * @return this */ public UnlockPhoneThemeScNotify clearThemeId() { @@ -52,7 +52,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 4; + * optional uint32 theme_id = 2; * @return the themeId */ public int getThemeId() { @@ -60,7 +60,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 4; + * optional uint32 theme_id = 2; * @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) 32); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(themeId); } } @@ -150,7 +150,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 16: { // 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 74d8c2e..541e806 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 level = 5; + * optional uint32 level = 3; */ private int level; /** - * optional uint32 point_id = 13; + * optional uint32 point_id = 4; */ private int pointId; /** - * repeated .ItemCost item_list = 14; + * repeated .ItemCost item_list = 10; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory()); @@ -45,7 +45,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 5; + * optional uint32 level = 3; * @return whether the level field is set */ public boolean hasLevel() { @@ -53,7 +53,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 5; + * optional uint32 level = 3; * @return this */ public UnlockSkilltreeCsReq clearLevel() { @@ -63,7 +63,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 5; + * optional uint32 level = 3; * @return the level */ public int getLevel() { @@ -71,7 +71,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 5; + * optional uint32 level = 3; * @param value the level to set * @return this */ @@ -82,7 +82,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 13; + * optional uint32 point_id = 4; * @return whether the pointId field is set */ public boolean hasPointId() { @@ -90,7 +90,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 13; + * optional uint32 point_id = 4; * @return this */ public UnlockSkilltreeCsReq clearPointId() { @@ -100,7 +100,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 13; + * optional uint32 point_id = 4; * @return the pointId */ public int getPointId() { @@ -108,7 +108,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 13; + * optional uint32 point_id = 4; * @param value the pointId to set * @return this */ @@ -119,7 +119,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 14; + * repeated .ItemCost item_list = 10; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -127,7 +127,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 14; + * repeated .ItemCost item_list = 10; * @return this */ public UnlockSkilltreeCsReq clearItemList() { @@ -137,7 +137,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 14; + * repeated .ItemCost 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. @@ -151,7 +151,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 14; + * repeated .ItemCost 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 @@ -165,7 +165,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 14; + * repeated .ItemCost item_list = 10; * @param value the itemList to add * @return this */ @@ -176,7 +176,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 14; + * repeated .ItemCost item_list = 10; * @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) 40); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(pointId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 82); output.writeMessageNoTag(itemList.get(i)); } } @@ -295,25 +295,25 @@ public final class UnlockSkilltreeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 24: { // level level = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 32) { break; } } - case 104: { + case 32: { // pointId pointId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 114) { + if (tag != 82) { break; } } - case 114: { + case 82: { // 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 210240a..2051fe1 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java @@ -19,24 +19,24 @@ public final class UnlockSkilltreeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 point_id = 9; + * optional uint32 retcode = 3; */ - private int pointId; + private int retcode; /** - * optional uint32 level = 10; - */ - private int level; - - /** - * optional uint32 base_avatar_id = 11; + * optional uint32 base_avatar_id = 8; */ private int baseAvatarId; /** - * optional uint32 retcode = 14; + * optional uint32 level = 9; */ - private int retcode; + private int level; + + /** + * optional uint32 point_id = 10; + */ + private int pointId; private UnlockSkilltreeScRsp() { } @@ -49,136 +49,25 @@ public final class UnlockSkilltreeScRspOuterClass { } /** - * optional uint32 point_id = 9; - * @return whether the pointId field is set + * optional uint32 retcode = 3; + * @return whether the retcode field is set */ - public boolean hasPointId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 point_id = 9; - * @return this - */ - public UnlockSkilltreeScRsp clearPointId() { - bitField0_ &= ~0x00000001; - pointId = 0; - return this; - } - - /** - * optional uint32 point_id = 9; - * @return the pointId - */ - public int getPointId() { - return pointId; - } - - /** - * optional uint32 point_id = 9; - * @param value the pointId to set - * @return this - */ - public UnlockSkilltreeScRsp setPointId(final int value) { - bitField0_ |= 0x00000001; - pointId = value; - return this; - } - - /** - * optional uint32 level = 10; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 level = 10; - * @return this - */ - public UnlockSkilltreeScRsp clearLevel() { - bitField0_ &= ~0x00000002; - 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 UnlockSkilltreeScRsp setLevel(final int value) { - bitField0_ |= 0x00000002; - level = 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 UnlockSkilltreeScRsp 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 UnlockSkilltreeScRsp setBaseAvatarId(final int value) { - bitField0_ |= 0x00000004; - baseAvatarId = 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; + * optional uint32 retcode = 3; * @return this */ public UnlockSkilltreeScRsp clearRetcode() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -186,25 +75,136 @@ public final class UnlockSkilltreeScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ public UnlockSkilltreeScRsp setRetcode(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; retcode = value; return this; } + /** + * optional uint32 base_avatar_id = 8; + * @return whether the baseAvatarId field is set + */ + public boolean hasBaseAvatarId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 base_avatar_id = 8; + * @return this + */ + public UnlockSkilltreeScRsp 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 UnlockSkilltreeScRsp setBaseAvatarId(final int value) { + bitField0_ |= 0x00000002; + baseAvatarId = value; + return this; + } + + /** + * optional uint32 level = 9; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 level = 9; + * @return this + */ + public UnlockSkilltreeScRsp clearLevel() { + bitField0_ &= ~0x00000004; + level = 0; + return this; + } + + /** + * optional uint32 level = 9; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 9; + * @param value the level to set + * @return this + */ + public UnlockSkilltreeScRsp setLevel(final int value) { + bitField0_ |= 0x00000004; + level = value; + return this; + } + + /** + * optional uint32 point_id = 10; + * @return whether the pointId field is set + */ + public boolean hasPointId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 point_id = 10; + * @return this + */ + public UnlockSkilltreeScRsp clearPointId() { + bitField0_ &= ~0x00000008; + pointId = 0; + return this; + } + + /** + * optional uint32 point_id = 10; + * @return the pointId + */ + public int getPointId() { + return pointId; + } + + /** + * optional uint32 point_id = 10; + * @param value the pointId to set + * @return this + */ + public UnlockSkilltreeScRsp setPointId(final int value) { + bitField0_ |= 0x00000008; + pointId = value; + return this; + } + @Override public UnlockSkilltreeScRsp copyFrom(final UnlockSkilltreeScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - pointId = other.pointId; - level = other.level; - baseAvatarId = other.baseAvatarId; retcode = other.retcode; + baseAvatarId = other.baseAvatarId; + level = other.level; + pointId = other.pointId; } return this; } @@ -215,17 +215,17 @@ public final class UnlockSkilltreeScRspOuterClass { return this; } cachedSize = -1; - if (other.hasPointId()) { - setPointId(other.pointId); - } - if (other.hasLevel()) { - setLevel(other.level); + if (other.hasRetcode()) { + setRetcode(other.retcode); } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } - if (other.hasRetcode()) { - setRetcode(other.retcode); + if (other.hasLevel()) { + setLevel(other.level); + } + if (other.hasPointId()) { + setPointId(other.pointId); } return this; } @@ -237,10 +237,10 @@ public final class UnlockSkilltreeScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - pointId = 0; - level = 0; - baseAvatarId = 0; retcode = 0; + baseAvatarId = 0; + level = 0; + pointId = 0; return this; } @@ -264,29 +264,29 @@ public final class UnlockSkilltreeScRspOuterClass { } UnlockSkilltreeScRsp other = (UnlockSkilltreeScRsp) o; return bitField0_ == other.bitField0_ - && (!hasPointId() || pointId == other.pointId) - && (!hasLevel() || level == other.level) + && (!hasRetcode() || retcode == other.retcode) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasRetcode() || retcode == other.retcode); + && (!hasLevel() || level == other.level) + && (!hasPointId() || pointId == other.pointId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(pointId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(baseAvatarId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(level); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(pointId); } } @@ -294,16 +294,16 @@ public final class UnlockSkilltreeScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pointId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(pointId); } return size; } @@ -315,36 +315,36 @@ public final class UnlockSkilltreeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // pointId - pointId = input.readUInt32(); + case 24: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // baseAvatarId + baseAvatarId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 80) { break; } } case 80: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // baseAvatarId - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // retcode - retcode = input.readUInt32(); + // pointId + pointId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public final class UnlockSkilltreeScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.pointId, pointId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.level, level); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.pointId, pointId); } output.endObject(); } @@ -390,11 +390,10 @@ public final class UnlockSkilltreeScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -400606517: - case 466121258: { - if (input.isAtField(FieldNames.pointId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - pointId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -402,22 +401,22 @@ public final class UnlockSkilltreeScRspOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 118022725: case -1756826157: { if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { baseAvatarId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -425,10 +424,11 @@ public final class UnlockSkilltreeScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -400606517: + case 466121258: { + if (input.isAtField(FieldNames.pointId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + pointId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -489,13 +489,13 @@ public final class UnlockSkilltreeScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName pointId = FieldName.forField("pointId", "point_id"); - - static final FieldName level = FieldName.forField("level"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName level = FieldName.forField("level"); + + static final FieldName pointId = FieldName.forField("pointId", "point_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/UnlockedMusicOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockedMusicOuterClass.java index 0c6cbb8..05ac095 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockedMusicOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockedMusicOuterClass.java @@ -19,21 +19,17 @@ public final class UnlockedMusicOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 id = 4; - */ - private int id; - - /** - * optional uint32 group_id = 12; + * optional uint32 group_id = 6; */ private int groupId; /** - * 
-     *  is_played
-     *
- * - * optional bool unkbool = 15; + * optional uint32 id = 10; + */ + private int id; + + /** + * optional bool unkbool = 13; */ private boolean unkbool; @@ -48,62 +44,25 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 id = 4; - * @return whether the id field is set + * optional uint32 group_id = 6; + * @return whether the groupId field is set */ - public boolean hasId() { + public boolean hasGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 id = 4; - * @return this - */ - public UnlockedMusic clearId() { - bitField0_ &= ~0x00000001; - id = 0; - return this; - } - - /** - * optional uint32 id = 4; - * @return the id - */ - public int getId() { - return id; - } - - /** - * optional uint32 id = 4; - * @param value the id to set - * @return this - */ - public UnlockedMusic setId(final int value) { - bitField0_ |= 0x00000001; - id = value; - return this; - } - - /** - * optional uint32 group_id = 12; - * @return whether the groupId field is set - */ - public boolean hasGroupId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 group_id = 12; + * optional uint32 group_id = 6; * @return this */ public UnlockedMusic clearGroupId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; groupId = 0; return this; } /** - * optional uint32 group_id = 12; + * optional uint32 group_id = 6; * @return the groupId */ public int getGroupId() { @@ -111,22 +70,55 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 group_id = 12; + * optional uint32 group_id = 6; * @param value the groupId to set * @return this */ public UnlockedMusic setGroupId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; groupId = value; return this; } /** - * 
-     *  is_played
-     *
- * - * optional bool unkbool = 15; + * optional uint32 id = 10; + * @return whether the id field is set + */ + public boolean hasId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 id = 10; + * @return this + */ + public UnlockedMusic clearId() { + bitField0_ &= ~0x00000002; + id = 0; + return this; + } + + /** + * optional uint32 id = 10; + * @return the id + */ + public int getId() { + return id; + } + + /** + * optional uint32 id = 10; + * @param value the id to set + * @return this + */ + public UnlockedMusic setId(final int value) { + bitField0_ |= 0x00000002; + id = value; + return this; + } + + /** + * optional bool unkbool = 13; * @return whether the unkbool field is set */ public boolean hasUnkbool() { @@ -134,11 +126,7 @@ public final class UnlockedMusicOuterClass { } /** - * 
-     *  is_played
-     *
- * - * optional bool unkbool = 15; + * optional bool unkbool = 13; * @return this */ public UnlockedMusic clearUnkbool() { @@ -148,11 +136,7 @@ public final class UnlockedMusicOuterClass { } /** - * 
-     *  is_played
-     *
- * - * optional bool unkbool = 15; + * optional bool unkbool = 13; * @return the unkbool */ public boolean getUnkbool() { @@ -160,11 +144,7 @@ public final class UnlockedMusicOuterClass { } /** - * 
-     *  is_played
-     *
- * - * optional bool unkbool = 15; + * optional bool unkbool = 13; * @param value the unkbool to set * @return this */ @@ -179,8 +159,8 @@ public final class UnlockedMusicOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - id = other.id; groupId = other.groupId; + id = other.id; unkbool = other.unkbool; } return this; @@ -192,12 +172,12 @@ public final class UnlockedMusicOuterClass { return this; } cachedSize = -1; - if (other.hasId()) { - setId(other.id); - } if (other.hasGroupId()) { setGroupId(other.groupId); } + if (other.hasId()) { + setId(other.id); + } if (other.hasUnkbool()) { setUnkbool(other.unkbool); } @@ -211,8 +191,8 @@ public final class UnlockedMusicOuterClass { } cachedSize = -1; bitField0_ = 0; - id = 0; groupId = 0; + id = 0; unkbool = false; return this; } @@ -237,23 +217,23 @@ public final class UnlockedMusicOuterClass { } UnlockedMusic other = (UnlockedMusic) o; return bitField0_ == other.bitField0_ - && (!hasId() || id == other.id) && (!hasGroupId() || groupId == other.groupId) + && (!hasId() || id == other.id) && (!hasUnkbool() || unkbool == other.unkbool); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(id); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(groupId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(id); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 104); output.writeBoolNoTag(unkbool); } } @@ -262,10 +242,10 @@ public final class UnlockedMusicOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -280,25 +260,25 @@ public final class UnlockedMusicOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // id - id = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 48: { // groupId groupId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 80) { break; } } - case 120: { + case 80: { + // id + id = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { // unkbool unkbool = input.readBool(); bitField0_ |= 0x00000004; @@ -325,10 +305,10 @@ public final class UnlockedMusicOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.unkbool, unkbool); @@ -343,10 +323,11 @@ public final class UnlockedMusicOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3355: { - if (input.isAtField(FieldNames.id)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - id = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -354,11 +335,10 @@ public final class UnlockedMusicOuterClass { } break; } - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case 3355: { + if (input.isAtField(FieldNames.id)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + id = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -429,10 +409,10 @@ public final class UnlockedMusicOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName id = FieldName.forField("id"); - static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName id = FieldName.forField("id"); + static final FieldName unkbool = FieldName.forField("unkbool"); } } diff --git a/src/generated/main/emu/lunarcore/proto/UpdateEnergyScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/UpdateEnergyScNotifyOuterClass.java index a567350..e69ac0a 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 = 1; + * optional .RotatorEnergyInfo energy_info = 5; */ private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance(); @@ -34,7 +34,7 @@ public final class UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 1; + * optional .RotatorEnergyInfo energy_info = 5; * @return whether the energyInfo field is set */ public boolean hasEnergyInfo() { @@ -42,7 +42,7 @@ public final class UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 1; + * optional .RotatorEnergyInfo energy_info = 5; * @return this */ public UpdateEnergyScNotify clearEnergyInfo() { @@ -52,7 +52,7 @@ public final class UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 1; + * optional .RotatorEnergyInfo energy_info = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -66,7 +66,7 @@ public final class UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 1; + * optional .RotatorEnergyInfo energy_info = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -80,7 +80,7 @@ public final class UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 1; + * optional .RotatorEnergyInfo energy_info = 5; * @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) 10); + output.writeRawByte((byte) 42); output.writeMessageNoTag(energyInfo); } } @@ -172,7 +172,7 @@ public final class UpdateEnergyScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 42: { // energyInfo input.readMessage(energyInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java index 61ba99d..90ef383 100644 --- a/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java @@ -19,27 +19,27 @@ public final class UseItemCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 use_item_id = 2; - */ - private int useItemId; - - /** - * optional uint32 use_item_count = 7; + * optional uint32 use_item_count = 2; */ private int useItemCount; /** - * optional uint32 base_avatar_id = 12; - */ - private int baseAvatarId; - - /** - * optional uint32 optional_reward_id = 15; + * optional uint32 optional_reward_id = 6; */ private int optionalRewardId; /** - * optional .AvatarType use_avatar_type = 14; + * optional uint32 use_item_id = 9; + */ + private int useItemId; + + /** + * optional uint32 base_avatar_id = 10; + */ + private int baseAvatarId; + + /** + * optional .AvatarType use_avatar_type = 7; */ private int useAvatarType; @@ -54,62 +54,25 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_id = 2; - * @return whether the useItemId field is set + * optional uint32 use_item_count = 2; + * @return whether the useItemCount field is set */ - public boolean hasUseItemId() { + public boolean hasUseItemCount() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 use_item_id = 2; - * @return this - */ - public UseItemCsReq clearUseItemId() { - bitField0_ &= ~0x00000001; - useItemId = 0; - return this; - } - - /** - * optional uint32 use_item_id = 2; - * @return the useItemId - */ - public int getUseItemId() { - return useItemId; - } - - /** - * optional uint32 use_item_id = 2; - * @param value the useItemId to set - * @return this - */ - public UseItemCsReq setUseItemId(final int value) { - bitField0_ |= 0x00000001; - useItemId = value; - return this; - } - - /** - * optional uint32 use_item_count = 7; - * @return whether the useItemCount field is set - */ - public boolean hasUseItemCount() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 use_item_count = 7; + * optional uint32 use_item_count = 2; * @return this */ public UseItemCsReq clearUseItemCount() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; useItemCount = 0; return this; } /** - * optional uint32 use_item_count = 7; + * optional uint32 use_item_count = 2; * @return the useItemCount */ public int getUseItemCount() { @@ -117,73 +80,36 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_count = 7; + * optional uint32 use_item_count = 2; * @param value the useItemCount to set * @return this */ public UseItemCsReq setUseItemCount(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; useItemCount = value; return this; } /** - * optional uint32 base_avatar_id = 12; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 base_avatar_id = 12; - * @return this - */ - public UseItemCsReq clearBaseAvatarId() { - bitField0_ &= ~0x00000004; - baseAvatarId = 0; - return this; - } - - /** - * optional uint32 base_avatar_id = 12; - * @return the baseAvatarId - */ - public int getBaseAvatarId() { - return baseAvatarId; - } - - /** - * optional uint32 base_avatar_id = 12; - * @param value the baseAvatarId to set - * @return this - */ - public UseItemCsReq setBaseAvatarId(final int value) { - bitField0_ |= 0x00000004; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 optional_reward_id = 15; + * optional uint32 optional_reward_id = 6; * @return whether the optionalRewardId field is set */ public boolean hasOptionalRewardId() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 optional_reward_id = 15; + * optional uint32 optional_reward_id = 6; * @return this */ public UseItemCsReq clearOptionalRewardId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; optionalRewardId = 0; return this; } /** - * optional uint32 optional_reward_id = 15; + * optional uint32 optional_reward_id = 6; * @return the optionalRewardId */ public int getOptionalRewardId() { @@ -191,18 +117,92 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 15; + * optional uint32 optional_reward_id = 6; * @param value the optionalRewardId to set * @return this */ public UseItemCsReq setOptionalRewardId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; optionalRewardId = value; return this; } /** - * optional .AvatarType use_avatar_type = 14; + * optional uint32 use_item_id = 9; + * @return whether the useItemId field is set + */ + public boolean hasUseItemId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 use_item_id = 9; + * @return this + */ + public UseItemCsReq clearUseItemId() { + bitField0_ &= ~0x00000004; + useItemId = 0; + return this; + } + + /** + * optional uint32 use_item_id = 9; + * @return the useItemId + */ + public int getUseItemId() { + return useItemId; + } + + /** + * optional uint32 use_item_id = 9; + * @param value the useItemId to set + * @return this + */ + public UseItemCsReq setUseItemId(final int value) { + bitField0_ |= 0x00000004; + useItemId = value; + return this; + } + + /** + * optional uint32 base_avatar_id = 10; + * @return whether the baseAvatarId field is set + */ + public boolean hasBaseAvatarId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 base_avatar_id = 10; + * @return this + */ + public UseItemCsReq clearBaseAvatarId() { + bitField0_ &= ~0x00000008; + baseAvatarId = 0; + return this; + } + + /** + * optional uint32 base_avatar_id = 10; + * @return the baseAvatarId + */ + public int getBaseAvatarId() { + return baseAvatarId; + } + + /** + * optional uint32 base_avatar_id = 10; + * @param value the baseAvatarId to set + * @return this + */ + public UseItemCsReq setBaseAvatarId(final int value) { + bitField0_ |= 0x00000008; + baseAvatarId = value; + return this; + } + + /** + * optional .AvatarType use_avatar_type = 7; * @return whether the useAvatarType field is set */ public boolean hasUseAvatarType() { @@ -210,7 +210,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional .AvatarType use_avatar_type = 14; + * optional .AvatarType use_avatar_type = 7; * @return this */ public UseItemCsReq clearUseAvatarType() { @@ -220,7 +220,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional .AvatarType use_avatar_type = 14; + * optional .AvatarType use_avatar_type = 7; * @return the useAvatarType */ public AvatarTypeOuterClass.AvatarType getUseAvatarType() { @@ -253,7 +253,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional .AvatarType use_avatar_type = 14; + * optional .AvatarType use_avatar_type = 7; * @param value the useAvatarType to set * @return this */ @@ -268,10 +268,10 @@ public final class UseItemCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - useItemId = other.useItemId; useItemCount = other.useItemCount; - baseAvatarId = other.baseAvatarId; optionalRewardId = other.optionalRewardId; + useItemId = other.useItemId; + baseAvatarId = other.baseAvatarId; useAvatarType = other.useAvatarType; } return this; @@ -283,18 +283,18 @@ public final class UseItemCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasUseItemId()) { - setUseItemId(other.useItemId); - } if (other.hasUseItemCount()) { setUseItemCount(other.useItemCount); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); - } if (other.hasOptionalRewardId()) { setOptionalRewardId(other.optionalRewardId); } + if (other.hasUseItemId()) { + setUseItemId(other.useItemId); + } + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); + } if (other.hasUseAvatarType()) { setUseAvatarTypeValue(other.useAvatarType); } @@ -308,10 +308,10 @@ public final class UseItemCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - useItemId = 0; useItemCount = 0; - baseAvatarId = 0; optionalRewardId = 0; + useItemId = 0; + baseAvatarId = 0; useAvatarType = 0; return this; } @@ -336,10 +336,10 @@ public final class UseItemCsReqOuterClass { } UseItemCsReq other = (UseItemCsReq) o; return bitField0_ == other.bitField0_ - && (!hasUseItemId() || useItemId == other.useItemId) && (!hasUseItemCount() || useItemCount == other.useItemCount) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasOptionalRewardId() || optionalRewardId == other.optionalRewardId) + && (!hasUseItemId() || useItemId == other.useItemId) + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasUseAvatarType() || useAvatarType == other.useAvatarType); } @@ -347,22 +347,22 @@ public final class UseItemCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(useItemId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); output.writeUInt32NoTag(useItemCount); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); output.writeUInt32NoTag(optionalRewardId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(useItemId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(baseAvatarId); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 56); output.writeEnumNoTag(useAvatarType); } } @@ -371,16 +371,16 @@ public final class UseItemCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemCount); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(optionalRewardId); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(optionalRewardId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(useAvatarType); @@ -396,42 +396,42 @@ public final class UseItemCsReqOuterClass { while (true) { switch (tag) { case 16: { + // useItemCount + useItemCount = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // optionalRewardId + optionalRewardId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { // useItemId useItemId = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // baseAvatarId + baseAvatarId = input.readUInt32(); + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 56) { break; } } case 56: { - // useItemCount - useItemCount = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // baseAvatarId - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // optionalRewardId - optionalRewardId = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { // useAvatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -461,16 +461,16 @@ public final class UseItemCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.useItemId, useItemId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.useItemCount, useItemCount); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.optionalRewardId, optionalRewardId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.useItemId, useItemId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.optionalRewardId, optionalRewardId); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.useAvatarType, useAvatarType, AvatarTypeOuterClass.AvatarType.converter()); @@ -485,36 +485,12 @@ public final class UseItemCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -815318027: - case 1396027151: { - if (input.isAtField(FieldNames.useItemId)) { - if (!input.trySkipNullValue()) { - useItemId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -1104380939: case 871430811: { if (input.isAtField(FieldNames.useItemCount)) { if (!input.trySkipNullValue()) { useItemCount = 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(); @@ -526,6 +502,30 @@ public final class UseItemCsReqOuterClass { if (input.isAtField(FieldNames.optionalRewardId)) { if (!input.trySkipNullValue()) { optionalRewardId = 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 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { + if (!input.trySkipNullValue()) { + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -602,14 +602,14 @@ public final class UseItemCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName useItemId = FieldName.forField("useItemId", "use_item_id"); - static final FieldName useItemCount = FieldName.forField("useItemCount", "use_item_count"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - static final FieldName optionalRewardId = FieldName.forField("optionalRewardId", "optional_reward_id"); + static final FieldName useItemId = FieldName.forField("useItemId", "use_item_id"); + + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName 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 dfcf2e3..66428c7 100644 --- a/src/generated/main/emu/lunarcore/proto/UseItemScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UseItemScRspOuterClass.java @@ -19,22 +19,22 @@ public final class UseItemScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 use_item_id = 8; + * optional uint32 use_item_id = 3; */ private int useItemId; /** - * optional uint32 retcode = 11; - */ - private int retcode; - - /** - * optional uint32 use_item_count = 15; + * optional uint32 use_item_count = 6; */ private int useItemCount; /** - * optional .ItemList return_data = 9; + * optional uint32 retcode = 7; + */ + private int retcode; + + /** + * optional .ItemList return_data = 1; */ private final ItemListOuterClass.ItemList returnData = ItemListOuterClass.ItemList.newInstance(); @@ -49,7 +49,7 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_id = 8; + * optional uint32 use_item_id = 3; * @return whether the useItemId field is set */ public boolean hasUseItemId() { @@ -57,7 +57,7 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_id = 8; + * optional uint32 use_item_id = 3; * @return this */ public UseItemScRsp clearUseItemId() { @@ -67,7 +67,7 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_id = 8; + * optional uint32 use_item_id = 3; * @return the useItemId */ public int getUseItemId() { @@ -75,7 +75,7 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_id = 8; + * optional uint32 use_item_id = 3; * @param value the useItemId to set * @return this */ @@ -86,62 +86,25 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 retcode = 11; - * @return whether the retcode field is set + * optional uint32 use_item_count = 6; + * @return whether the useItemCount field is set */ - public boolean hasRetcode() { + public boolean hasUseItemCount() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 11; - * @return this - */ - public UseItemScRsp clearRetcode() { - bitField0_ &= ~0x00000002; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 11; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 11; - * @param value the retcode to set - * @return this - */ - public UseItemScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; - retcode = value; - return this; - } - - /** - * optional uint32 use_item_count = 15; - * @return whether the useItemCount field is set - */ - public boolean hasUseItemCount() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 use_item_count = 15; + * optional uint32 use_item_count = 6; * @return this */ public UseItemScRsp clearUseItemCount() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; useItemCount = 0; return this; } /** - * optional uint32 use_item_count = 15; + * optional uint32 use_item_count = 6; * @return the useItemCount */ public int getUseItemCount() { @@ -149,18 +112,55 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_count = 15; + * optional uint32 use_item_count = 6; * @param value the useItemCount to set * @return this */ public UseItemScRsp setUseItemCount(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; useItemCount = value; return this; } /** - * optional .ItemList return_data = 9; + * optional uint32 retcode = 7; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 retcode = 7; + * @return this + */ + public UseItemScRsp clearRetcode() { + bitField0_ &= ~0x00000004; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 7; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 7; + * @param value the retcode to set + * @return this + */ + public UseItemScRsp setRetcode(final int value) { + bitField0_ |= 0x00000004; + retcode = value; + return this; + } + + /** + * optional .ItemList return_data = 1; * @return whether the returnData field is set */ public boolean hasReturnData() { @@ -168,7 +168,7 @@ public final class UseItemScRspOuterClass { } /** - * optional .ItemList return_data = 9; + * optional .ItemList return_data = 1; * @return this */ public UseItemScRsp clearReturnData() { @@ -178,7 +178,7 @@ public final class UseItemScRspOuterClass { } /** - * optional .ItemList return_data = 9; + * optional .ItemList return_data = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -192,7 +192,7 @@ public final class UseItemScRspOuterClass { } /** - * optional .ItemList return_data = 9; + * optional .ItemList return_data = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -206,7 +206,7 @@ public final class UseItemScRspOuterClass { } /** - * optional .ItemList return_data = 9; + * optional .ItemList return_data = 1; * @param value the returnData to set * @return this */ @@ -222,8 +222,8 @@ public final class UseItemScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; useItemId = other.useItemId; - retcode = other.retcode; useItemCount = other.useItemCount; + retcode = other.retcode; returnData.copyFrom(other.returnData); } return this; @@ -238,12 +238,12 @@ public final class UseItemScRspOuterClass { if (other.hasUseItemId()) { setUseItemId(other.useItemId); } - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasUseItemCount()) { setUseItemCount(other.useItemCount); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasReturnData()) { getMutableReturnData().mergeFrom(other.returnData); } @@ -258,8 +258,8 @@ public final class UseItemScRspOuterClass { cachedSize = -1; bitField0_ = 0; useItemId = 0; - retcode = 0; useItemCount = 0; + retcode = 0; returnData.clear(); return this; } @@ -286,27 +286,27 @@ public final class UseItemScRspOuterClass { UseItemScRsp other = (UseItemScRsp) o; return bitField0_ == other.bitField0_ && (!hasUseItemId() || useItemId == other.useItemId) - && (!hasRetcode() || retcode == other.retcode) && (!hasUseItemCount() || useItemCount == other.useItemCount) + && (!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) 64); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(useItemId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(useItemCount); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 10); output.writeMessageNoTag(returnData); } } @@ -318,10 +318,10 @@ public final class UseItemScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemCount); } 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 64: { + case 24: { // useItemId useItemId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 48) { break; } } - case 88: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 48: { // useItemCount useItemCount = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 74) { + if (tag != 56) { break; } } - case 74: { + case 56: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { // returnData input.readMessage(returnData); bitField0_ |= 0x00000008; @@ -393,10 +393,10 @@ public final class UseItemScRspOuterClass { output.writeUInt32(FieldNames.useItemId, useItemId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.useItemCount, useItemCount); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.useItemCount, useItemCount); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.returnData, returnData); @@ -423,10 +423,11 @@ public final class UseItemScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1104380939: + case 871430811: { + if (input.isAtField(FieldNames.useItemCount)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + useItemCount = input.readUInt32(); bitField0_ |= 0x00000002; } } 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 { @@ -512,10 +512,10 @@ public final class UseItemScRspOuterClass { static class FieldNames { static final FieldName useItemId = FieldName.forField("useItemId", "use_item_id"); - static final FieldName retcode = FieldName.forField("retcode"); - 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 bc91b15..61c92ab 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 x = 3; + */ + private int x; + + /** + * optional sint32 y = 7; */ private int y; /** - * optional sint32 z = 11; + * optional sint32 z = 9; */ private int z; - /** - * optional sint32 x = 12; - */ - private int x; - private Vector() { } @@ -44,99 +44,25 @@ public final class VectorOuterClass { } /** - * optional sint32 y = 2; - * @return whether the y field is set + * optional sint32 x = 3; + * @return whether the x field is set */ - public boolean hasY() { + public boolean hasX() { 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 z = 11; - * @return whether the z field is set - */ - public boolean hasZ() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional sint32 z = 11; - * @return this - */ - public Vector clearZ() { - bitField0_ &= ~0x00000002; - z = 0; - return this; - } - - /** - * optional sint32 z = 11; - * @return the z - */ - public int getZ() { - return z; - } - - /** - * optional sint32 z = 11; - * @param value the z to set - * @return this - */ - public Vector setZ(final int value) { - bitField0_ |= 0x00000002; - z = value; - return this; - } - - /** - * optional sint32 x = 12; - * @return whether the x field is set - */ - public boolean hasX() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional sint32 x = 12; + * optional sint32 x = 3; * @return this */ public Vector clearX() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; x = 0; return this; } /** - * optional sint32 x = 12; + * optional sint32 x = 3; * @return the x */ public int getX() { @@ -144,24 +70,98 @@ public final class VectorOuterClass { } /** - * optional sint32 x = 12; + * optional sint32 x = 3; * @param value the x to set * @return this */ public Vector setX(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; x = value; return this; } + /** + * optional sint32 y = 7; + * @return whether the y field is set + */ + public boolean hasY() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional sint32 y = 7; + * @return this + */ + public Vector clearY() { + bitField0_ &= ~0x00000002; + y = 0; + return this; + } + + /** + * optional sint32 y = 7; + * @return the y + */ + public int getY() { + return y; + } + + /** + * optional sint32 y = 7; + * @param value the y to set + * @return this + */ + public Vector setY(final int value) { + bitField0_ |= 0x00000002; + y = value; + return this; + } + + /** + * optional sint32 z = 9; + * @return whether the z field is set + */ + public boolean hasZ() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional sint32 z = 9; + * @return this + */ + public Vector clearZ() { + bitField0_ &= ~0x00000004; + z = 0; + return this; + } + + /** + * optional sint32 z = 9; + * @return the z + */ + public int getZ() { + return z; + } + + /** + * optional sint32 z = 9; + * @param value the z to set + * @return this + */ + public Vector setZ(final int value) { + bitField0_ |= 0x00000004; + z = value; + return this; + } + @Override public Vector copyFrom(final Vector other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + x = other.x; y = other.y; z = other.z; - x = other.x; } return this; } @@ -172,15 +172,15 @@ public final class VectorOuterClass { return this; } cachedSize = -1; + if (other.hasX()) { + setX(other.x); + } if (other.hasY()) { setY(other.y); } if (other.hasZ()) { setZ(other.z); } - if (other.hasX()) { - setX(other.x); - } return this; } @@ -191,9 +191,9 @@ public final class VectorOuterClass { } cachedSize = -1; bitField0_ = 0; + x = 0; y = 0; z = 0; - x = 0; return this; } @@ -217,24 +217,24 @@ public final class VectorOuterClass { } Vector other = (Vector) o; return bitField0_ == other.bitField0_ + && (!hasX() || x == other.x) && (!hasY() || y == other.y) - && (!hasZ() || z == other.z) - && (!hasX() || x == other.x); + && (!hasZ() || z == other.z); } @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(x); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeSInt32NoTag(z); + output.writeRawByte((byte) 56); + output.writeSInt32NoTag(y); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeSInt32NoTag(x); + output.writeRawByte((byte) 72); + output.writeSInt32NoTag(z); } } @@ -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(x); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeSInt32SizeNoTag(z); + size += 1 + ProtoSink.computeSInt32SizeNoTag(y); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeSInt32SizeNoTag(x); + size += 1 + ProtoSink.computeSInt32SizeNoTag(z); } 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 != 88) { - break; - } - } - case 88: { - // z - z = input.readSInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 24: { // x x = input.readSInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // y + y = input.readSInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // z + z = 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.x, x); } if ((bitField0_ & 0x00000002) != 0) { - output.writeSInt32(FieldNames.z, z); + output.writeSInt32(FieldNames.y, y); } if ((bitField0_ & 0x00000004) != 0) { - output.writeSInt32(FieldNames.x, x); + output.writeSInt32(FieldNames.z, z); } output.endObject(); } @@ -323,11 +323,22 @@ public final class VectorOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 120: { + if (input.isAtField(FieldNames.x)) { + if (!input.trySkipNullValue()) { + x = 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.z)) { if (!input.trySkipNullValue()) { z = input.readSInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 120: { - if (input.isAtField(FieldNames.x)) { - if (!input.trySkipNullValue()) { - x = input.readSInt32(); bitField0_ |= 0x00000004; } } else { @@ -408,11 +408,11 @@ public final class VectorOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName x = FieldName.forField("x"); + static final FieldName y = FieldName.forField("y"); static final FieldName z = FieldName.forField("z"); - - static final FieldName x = FieldName.forField("x"); } } } diff --git a/src/main/java/emu/lunarcore/GameConstants.java b/src/main/java/emu/lunarcore/GameConstants.java index c5c4960..97c11c1 100644 --- a/src/main/java/emu/lunarcore/GameConstants.java +++ b/src/main/java/emu/lunarcore/GameConstants.java @@ -6,13 +6,13 @@ import java.time.ZoneOffset; import emu.lunarcore.util.Position; public class GameConstants { - public static String VERSION = "2.0.0"; + public static String VERSION = "2.1.0"; public static final ZoneOffset CURRENT_ZONEOFFSET = ZoneOffset.systemDefault().getRules().getOffset(Instant.now()); public static final int CURRENT_TIMEZONE = CURRENT_ZONEOFFSET.getTotalSeconds() / 3600; // Game - public static final String DEFAULT_NAME = "Trailblazer"; + public static final String DEFAULT_NAME = "A Nameless"; public static final int[] DEFAULT_HEAD_ICONS = {208001, 208002}; public static final int TRAILBLAZER_AVATAR_ID = 8001; public static final int MAX_TRAILBLAZER_LEVEL = 70; @@ -35,7 +35,7 @@ public class GameConstants { public static final int RELIC_REMAINS_ID = 235; public static final int INVENTORY_MAX_EQUIPMENT = 1500; - public static final int INVENTORY_MAX_RELIC = 1500; + public static final int INVENTORY_MAX_RELIC = 2000; public static final int INVENTORY_MAX_MATERIAL = 2000; // Start position @@ -55,7 +55,7 @@ public class GameConstants { public static final int CHALLENGE_STORY_ENTRANCE = 102020107; // Rogue - public static final boolean ENABLE_ROGUE = false; + public static final boolean ENABLE_ROGUE = true; public static final int ROGUE_ENTRANCE = 801120102; public static final int ROGUE_TALENT_POINT_ITEM_ID = 32; diff --git a/src/main/java/emu/lunarcore/data/config/SkillAbilityInfo.java b/src/main/java/emu/lunarcore/data/config/SkillAbilityInfo.java index 3a1fae7..d689645 100644 --- a/src/main/java/emu/lunarcore/data/config/SkillAbilityInfo.java +++ b/src/main/java/emu/lunarcore/data/config/SkillAbilityInfo.java @@ -23,17 +23,17 @@ public class SkillAbilityInfo { List actionList = null; // Skip if not a maze skill - if (ability.getName().contains("MazeSkill")) { + if (ability.getName().endsWith("MazeSkill")) { skill = new MazeSkill(avatarExcel, 2); avatarExcel.setMazeSkill(skill); actionList = skill.getCastActions(); // Hacky way to check if an avatar can summon with their skill - var summonUnitExcel = GameData.getSummonUnitExcelMap().get((skill.getId() * 10) + 1); - if (summonUnitExcel != null && !summonUnitExcel.isIsClient()) { + var excel = GameData.getSummonUnitExcelMap().get((skill.getId() * 10) + 1); + if (excel != null && !excel.isIsClient() && excel.getInfo() != null) { // TODO duration is hardcoded - skill.getCastActions().add(new MazeSkillSummonUnit(summonUnitExcel, 20)); + skill.getCastActions().add(new MazeSkillSummonUnit(excel, 20)); } } else if (ability.getName().contains("NormalAtk")) { skill = new MazeSkill(avatarExcel, 1); @@ -69,18 +69,25 @@ public class SkillAbilityInfo { actionList.add(new MazeSkillModifySP(50)); } else if (task.getType().contains("CreateSummonUnit")) { skill.setTriggerBattle(false); + } else if (task.getType().contains("AdventureSetAttackTargetMonsterDie")) { + actionList.add(new MazeSkillSetAttackTargetMonsterDie()); } else if (task.getSuccessTaskList() != null) { for (TaskInfo t : task.getSuccessTaskList()) { parseTask(skill, actionList, t); } } else if (task.getType().contains("AdventureTriggerAttack")) { + if (skill.getIndex() == 2) { + skill.setTriggerBattle(task.isTriggerBattle()); + } if (task.getOnAttack() != null) { for (TaskInfo t : task.getOnAttack()) { parseTask(skill, skill.getAttackActions(), t); } } - if (skill.getIndex() == 2) { - skill.setTriggerBattle(task.isTriggerBattle()); + if (task.getOnBattle() != null) { + for (TaskInfo t : task.getOnBattle()) { + parseTask(skill, skill.getAttackActions(), t); + } } } else if (task.getType().contains("AdventureFireProjectile")) { if (task.getOnProjectileHit() != null) { diff --git a/src/main/java/emu/lunarcore/data/config/TaskInfo.java b/src/main/java/emu/lunarcore/data/config/TaskInfo.java index 87cd607..86c6d96 100644 --- a/src/main/java/emu/lunarcore/data/config/TaskInfo.java +++ b/src/main/java/emu/lunarcore/data/config/TaskInfo.java @@ -21,8 +21,8 @@ public class TaskInfo { private boolean TriggerBattle = true; private DynamicFloat LifeTime; - @SerializedName(value = "OnAttack", alternate = {"OnBattle"}) private List OnAttack; + private List OnBattle; private List SuccessTaskList; private List OnProjectileHit; private List OnProjectileLifetimeFinish; diff --git a/src/main/java/emu/lunarcore/data/excel/NpcMonsterExcel.java b/src/main/java/emu/lunarcore/data/excel/NpcMonsterExcel.java index ec5805c..489fe29 100644 --- a/src/main/java/emu/lunarcore/data/excel/NpcMonsterExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/NpcMonsterExcel.java @@ -2,6 +2,7 @@ package emu.lunarcore.data.excel; import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; +import emu.lunarcore.game.enums.MonsterRank; import lombok.Getter; @Getter @@ -9,6 +10,7 @@ import lombok.Getter; public class NpcMonsterExcel extends GameResource { private int ID; private long NPCName; + private MonsterRank Rank; @Override public int getId() { diff --git a/src/main/java/emu/lunarcore/data/excel/RogueBuffGroupExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueBuffGroupExcel.java index 943e764..fef7e52 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 = "GJHLAKLLFDI") + @SerializedName(value = "EGDAIIJDDPA") private int RogueBuffGroupID; // RogueBuffGroupID - @SerializedName(value = "DNKFBOAIDCE") + @SerializedName(value = "AMGHNOBDGLM") private IntArrayList RogueBuffTagList; // RogueBuffTagList or RogueBuffGroupList private transient Set rogueBuffList = new HashSet<>(); diff --git a/src/main/java/emu/lunarcore/game/avatar/GameAvatar.java b/src/main/java/emu/lunarcore/game/avatar/GameAvatar.java index b6fbd41..d466d5c 100644 --- a/src/main/java/emu/lunarcore/game/avatar/GameAvatar.java +++ b/src/main/java/emu/lunarcore/game/avatar/GameAvatar.java @@ -347,8 +347,10 @@ public class GameAvatar implements GameEntity { .setWorldLevel(this.getOwner().getWorldLevel()); // Skill tree - for (var skill : getSkills().entrySet()) { - proto.addSkilltreeList(AvatarSkillTree.newInstance().setPointId(skill.getKey()).setLevel(skill.getValue())); + if (!this.isHero()) { + for (var skill : getSkills().entrySet()) { + proto.addSkilltreeList(AvatarSkillTree.newInstance().setPointId(skill.getKey()).setLevel(skill.getValue())); + } } // Build equips diff --git a/src/main/java/emu/lunarcore/game/battle/BattleService.java b/src/main/java/emu/lunarcore/game/battle/BattleService.java index dbb8883..ea8e373 100644 --- a/src/main/java/emu/lunarcore/game/battle/BattleService.java +++ b/src/main/java/emu/lunarcore/game/battle/BattleService.java @@ -105,15 +105,6 @@ public class BattleService extends BaseGameService { return; } - // Add any assisting monsters from monster assist list - for (int entityId : assistMonsters) { - GameEntity entity = player.getScene().getEntities().get(entityId); - - if (entity != null && entity instanceof EntityMonster monster) { - monsters.add(monster); - } - } - // Start battle if (monsters.size() > 0) { // Maze skill attack event @@ -121,6 +112,21 @@ public class BattleService extends BaseGameService { castedSkill.onAttack(castingAvatar, targets); } + // Skip battle if monsters were killed + if (monsters.stream().filter(m -> m.isAlive()).count() == 0) { + player.sendPacket(new PacketSceneCastSkillScRsp(attackedGroupId)); + return; + } + + // Add any assisting monsters from monster assist list + for (int entityId : assistMonsters) { + GameEntity entity = player.getScene().getEntities().get(entityId); + + if (entity != null && entity instanceof EntityMonster monster) { + monsters.add(monster); + } + } + // Create battle and add npc monsters to it Battle battle = new Battle(player, player.getLineupManager().getCurrentLineup(), monsters); @@ -384,4 +390,4 @@ public class BattleService extends BaseGameService { // Send packet player.sendPacket(new PacketReEnterLastElementStageScRsp(battle)); } -} +} \ No newline at end of file diff --git a/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillSetAttackTargetMonsterDie.java b/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillSetAttackTargetMonsterDie.java new file mode 100644 index 0000000..094e1ab --- /dev/null +++ b/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillSetAttackTargetMonsterDie.java @@ -0,0 +1,34 @@ +package emu.lunarcore.game.battle.skills; + +import java.util.List; + +import emu.lunarcore.game.avatar.GameAvatar; +import emu.lunarcore.game.enums.MonsterRank; +import emu.lunarcore.game.inventory.ItemParamMap; +import emu.lunarcore.game.scene.entity.EntityMonster; +import emu.lunarcore.game.scene.entity.GameEntity; +import emu.lunarcore.util.Utils; + +public class MazeSkillSetAttackTargetMonsterDie extends MazeSkillAction { + + public void onAttack(GameAvatar caster, List entities) { + for (var entity : entities) { + if (entity instanceof EntityMonster monster && monster.getExcel().getRank().getVal() < MonsterRank.Elite.getVal()) { + // Remove entity + monster.getScene().removeEntity(monster); + + // Handle drops + var drops = new ItemParamMap(); + monster.calculateDrops(drops); + caster.getOwner().getInventory().addItems(drops.toItemList(), true); + + // Rogue TODO optimize + if (caster.getOwner().getRogueInstance() != null) { + caster.getOwner().getRogueInstance().createBuffSelect(1); + caster.getOwner().getRogueInstance().addMoney(Utils.randomRange(20, 40)); + } + } + } + } + +} diff --git a/src/main/java/emu/lunarcore/game/enums/MonsterRank.java b/src/main/java/emu/lunarcore/game/enums/MonsterRank.java new file mode 100644 index 0000000..3203d00 --- /dev/null +++ b/src/main/java/emu/lunarcore/game/enums/MonsterRank.java @@ -0,0 +1,19 @@ +package emu.lunarcore.game.enums; + +import lombok.Getter; + +@Getter +public enum MonsterRank { + Unknow (0), + Minion (1), + MinionLv2 (2), + Elite (3), + LittleBoss (4), + BigBoss (5); + + private final int val; + + private MonsterRank(int value) { + this.val = value; + } +} diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueBuffData.java b/src/main/java/emu/lunarcore/game/rogue/RogueBuffData.java index 3119f60..bfa1f60 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueBuffData.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueBuffData.java @@ -43,7 +43,7 @@ public class RogueBuffData { public RogueCommonBuff toCommonProto() { var proto = RogueCommonBuff.newInstance() .setBuffId(this.getId()) - .setLevel(this.getLevel()); + .setBuffLevel(this.getLevel()); return proto; } diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueBuffSelectMenu.java b/src/main/java/emu/lunarcore/game/rogue/RogueBuffSelectMenu.java index 7150767..107947b 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueBuffSelectMenu.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueBuffSelectMenu.java @@ -146,11 +146,11 @@ public class RogueBuffSelectMenu { } // Create item list for reroll cost - proto.setRollBuffsCost(ItemCostList.newInstance() + proto.getMutableRollBuffsCost() .addItemList(ItemCost.newInstance() .setPileItem(PileItem.newInstance() .setItemId(31) - .setItemNum(30)))); + .setItemNum(30))); return proto; } diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java b/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java index 46dcd06..d0aa890 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java @@ -182,12 +182,8 @@ public class RogueInstance { for (int i = 0; i < amount; i++) { this.pendingBuffSelects.add(buffs); } - RogueBuffSelectMenu buffSelect = this.updateBuffSelect(); + this.updateBuffSelect(); } - -// if (buffSelect != null) { -// getPlayer().sendPacket(new PacketSyncRogueBuffSelectInfoScNotify(buffSelect)); -// } } public synchronized void createBuffSelect(int amount, Set buffs) { @@ -195,18 +191,16 @@ public class RogueInstance { for (int i = 0; i < amount; i++) { this.pendingBuffSelects.add(buffs); } - RogueBuffSelectMenu buffSelect = this.updateBuffSelect(); + + this.updateBuffSelect(); } -// if (buffSelect != null) { -// getPlayer().sendPacket(new PacketSyncRogueBuffSelectInfoScNotify(buffSelect)); -// } } public synchronized void createBuffSelect(int amount) { for (int i = 0; i < amount; i++) { this.pendingBuffSelects.add(normalBuff); } - RogueBuffSelectMenu buffSelect = this.updateBuffSelect(); + this.updateBuffSelect(); } public synchronized RogueBuffSelectMenu updateBuffSelect() { @@ -318,11 +312,7 @@ public class RogueInstance { public synchronized void createMiracleSelect(int amount) { this.pendingMiracleSelects += amount; - - RogueMiracleSelectMenu miracleSelect = this.updateMiracleSelect(); -// if (miracleSelect != null) { -// getPlayer().sendPacket(new PacketSyncRogueMiracleSelectInfoScNotify(miracleSelect)); -// } + this.updateMiracleSelect(); } public synchronized RogueMiracleSelectMenu updateMiracleSelect() { @@ -359,7 +349,7 @@ public class RogueInstance { this.miracleSelect = null; this.pendingAction = null; this.getMiracles().put(miracle.getId(), miracle); - //getPlayer().sendPacket(new PacketAddRogueMiracleScNotify(miracle, RogueMiracleSource.ROGUE_MIRACLE_SOURCE_TYPE_SELECT)); + this.updateMiracleSelect(); this.getPlayer().sendPacket(new PacketSyncRogueCommonActionResultScNotify(RogueBuffSource.ROGUE_BUFF_SOURCE_TYPE_SELECT, miracle.toDataProto())); @@ -372,8 +362,7 @@ public class RogueInstance { public synchronized void createBonusSelect(int amount) { this.pendingBonusSelects += amount; - - RogueBonusSelectMenu bonusSelect = this.updateBonusSelect(); + this.updateBonusSelect(); } public synchronized RogueBonusSelectMenu updateBonusSelect() { @@ -430,11 +419,21 @@ public class RogueInstance { this.getPlayer().sendPacket(new PacketSyncRogueVirtualItemInfoScNotify(this.getPlayer())); } + public synchronized void addMoney(int amount) { + this.setMoney(this.money + amount); + } + public synchronized void addDialogueMoney(int money) { this.money += money; this.getPlayer().sendPacket(new PacketSyncRogueVirtualItemInfoScNotify(this.getPlayer())); this.getPlayer().sendPacket(new PacketSyncRogueCommonActionResultScNotify(RogueBuffSource.ROGUE_BUFF_SOURCE_TYPE_DIALOGUE, money)); } + + public synchronized void addCommandMoney(int money_num) { + this.money += money_num; + this.getPlayer().sendPacket(new PacketSyncRogueVirtualItemInfoScNotify(this.getPlayer())); + this.getPlayer().sendPacket(new PacketScenePlaneEventScNotify(new GameItem(31, money))); + } public synchronized void pickAvatar(RepeatedInt avatarId) { var newAvatarIds = new HashSet(); @@ -595,12 +594,12 @@ public class RogueInstance { } else { // Give blessings to player int amount = battle.getNpcMonsters().size(); - if (this.getCurrentRoom().getExcel().getRogueRoomType() == 6) { // area boss + if (this.getCurrentRoom().getExcel().getRogueRoomType() == RogueRoomType.ELITE.getVal()) { this.createBuffSelect(amount, this.getUncommonBuff()); } else { this.createBuffSelect(amount); } - this.setMoney(this.getMoney() + Utils.randomRange(20, 80) * amount); + this.addMoney(Utils.randomRange(20, 40) * amount); } } else { this.getPlayer().getRogueManager().quitRogue(); @@ -630,7 +629,7 @@ public class RogueInstance { .setRoomMap(this.toMapInfoProto()) .setRogueBuffInfo(this.toBuffInfoProto()) .setRogueMiracleInfo(this.toMiracleInfoProto()) - .setRogueAeon(this.toAeonProto()) + .setRogueAeonInfo(this.toAeonProto()) .setRogueVirtualItem(this.toVirtualItemProto()); if (pendingAction != null) { diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueManager.java b/src/main/java/emu/lunarcore/game/rogue/RogueManager.java index b30d5d1..5e80c2f 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueManager.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueManager.java @@ -1,8 +1,8 @@ package emu.lunarcore.game.rogue; import java.util.Arrays; -import java.util.concurrent.TimeUnit; +import java.util.stream.IntStream; import emu.lunarcore.GameConstants; import emu.lunarcore.LunarCore; import emu.lunarcore.data.GameData; @@ -20,6 +20,7 @@ import emu.lunarcore.proto.RogueInfoDataOuterClass.RogueInfoData; import emu.lunarcore.proto.RogueInfoOuterClass.RogueInfo; import emu.lunarcore.proto.RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo; import emu.lunarcore.proto.RogueSeasonInfoOuterClass.RogueSeasonInfo; +import emu.lunarcore.proto.RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo; import emu.lunarcore.proto.RogueTalentInfoOuterClass.RogueTalentInfo; import emu.lunarcore.proto.RogueTalentOuterClass.RogueTalent; import emu.lunarcore.proto.RogueTalentStatusOuterClass.RogueTalentStatus; @@ -168,31 +169,37 @@ public class RogueManager extends BasePlayerManager { var schedule = GameDepot.getCurrentRogueSchedule(); int seasonId = 0; - long beginTime = (System.currentTimeMillis() / 1000) - TimeUnit.DAYS.toSeconds(1); - long endTime = beginTime + TimeUnit.DAYS.toSeconds(8); + long beginTime = 0; + long endTime = 1999999999; if (schedule != null) { seasonId = schedule.getRogueSeason(); } var score = RogueScoreRewardInfo.newInstance() - .setPoolId(20 + getPlayer().getWorldLevel()) // TODO pool ids should not change when world level changes - .setPoolRefreshed(true) + .setPoolId(26) // TODO pool ids should not change when world level changes + .setPoolRefreshed(false) .setHasTakenInitialScore(true) + .setScore(14000) .setBeginTime(beginTime) - .setEndTime(endTime); + .setEndTime(endTime) + .addAllHasTakenReward(IntStream.rangeClosed(1, 20).flatMap(i -> IntStream.generate(() -> i).limit(20)).toArray()); var season = RogueSeasonInfo.newInstance() .setBeginTime(beginTime) .setSeasonId(seasonId) .setEndTime(endTime); + + var rogueVirtualItemInfo = RogueVirtualItemInfo.newInstance() + .setMoney(100000) + .setX(100000); // Path resonance var aeonInfo = RogueAeonInfo.newInstance(); aeonInfo.setIsUnlocked(false); - if (this.hasTalent(1) || true) { // Consider using a constant for this because talent is not working now + if (true) { // Consider using a constant for this because talent is not working now aeonInfo = RogueAeonInfo.newInstance() .setUnlockAeonNum(GameData.getRogueAeonExcelMap().size()); @@ -220,11 +227,14 @@ public class RogueManager extends BasePlayerManager { var area = RogueArea.newInstance() .setAreaId(excel.getRogueAreaID()) + .setRogueStatus(4) + .setHasTakenRewards(true) .setRogueAreaStatus(RogueAreaStatus.ROGUE_AREA_STATUS_FIRST_PASS.getNumber()); if (instance != null && excel == instance.getExcel()) { area.setMapId(instance.getExcel().getMapId()); area.setCurReachRoomNum(instance.getCurrentRoomProgress()); + area.setRogueStatus(4); //area.setRogueStatus(instance.getStatus()); } diff --git a/src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java b/src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java index fb49dd6..653777b 100644 --- a/src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java +++ b/src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java @@ -1,9 +1,11 @@ package emu.lunarcore.game.scene.entity; +import emu.lunarcore.data.GameData; import emu.lunarcore.data.config.GroupInfo; import emu.lunarcore.data.config.MonsterInfo; import emu.lunarcore.data.excel.NpcMonsterExcel; import emu.lunarcore.game.battle.Battle; +import emu.lunarcore.game.inventory.ItemParamMap; import emu.lunarcore.game.scene.Scene; import emu.lunarcore.game.scene.SceneBuff; import emu.lunarcore.game.scene.triggers.PropTriggerType; @@ -47,6 +49,10 @@ public class EntityMonster implements GameEntity, Tickable { this.instId = monsterInfo.getID(); this.farmElementId = monsterInfo.getFarmElementID(); } + + public boolean isAlive() { + return this.entityId > 0; + } public boolean isFarmElement() { return this.farmElementId > 0; @@ -106,6 +112,15 @@ public class EntityMonster implements GameEntity, Tickable { return false; } + public void calculateDrops(ItemParamMap drops) { + var dropExcel = GameData.getMonsterDropExcel(this.getExcel().getId(), this.getWorldLevel()); + if (dropExcel == null) return; + + for (var dropParam : dropExcel.getDropList()) { + dropParam.roll(drops); + } + } + @Override public void onRemove() { // Try to fire any triggers diff --git a/src/main/java/emu/lunarcore/game/scene/entity/EntityNpc.java b/src/main/java/emu/lunarcore/game/scene/entity/EntityNpc.java index 9e3e102..9b338de 100644 --- a/src/main/java/emu/lunarcore/game/scene/entity/EntityNpc.java +++ b/src/main/java/emu/lunarcore/game/scene/entity/EntityNpc.java @@ -46,7 +46,7 @@ public class EntityNpc implements GameEntity { var rogue = NpcRogueInfo.newInstance() .setRogueNpcId(this.rogueNpcId) .setFinishDialogue(isDialogueFinished) - .setGBMDBBBMBEJ(eventId); + .setDialogueGroupId(eventId); npc.getMutableExtraInfo().setRogueInfo(rogue); } diff --git a/src/main/java/emu/lunarcore/server/packet/CmdId.java b/src/main/java/emu/lunarcore/server/packet/CmdId.java index 16ee1b6..b8a1ad1 100644 --- a/src/main/java/emu/lunarcore/server/packet/CmdId.java +++ b/src/main/java/emu/lunarcore/server/packet/CmdId.java @@ -3,1146 +3,1268 @@ package emu.lunarcore.server.packet; public class CmdId { // Empty public static final int NONE = 0; - + // Cmd Ids - public static final int SpringRecoverCsReq = 1472; - public static final int TakeTrainVisitorUntakenBehaviorRewardScRsp = 3746; - public static final int FinishEmotionDialoguePerformanceScRsp = 6334; - public static final int SelectChatBubbleScRsp = 5197; - public static final int GetEnhanceCommonRogueBuffInfoCsReq = 5650; - public static final int SubmitMonsterResearchActivityMaterialCsReq = 2698; - public static final int EnterAetherDivideSceneCsReq = 4807; - public static final int HeliobusActivityDataCsReq = 5807; - public static final int CommonRogueQueryScRsp = 5627; - public static final int GetRogueShopMiracleInfoCsReq = 5697; - public static final int ApplyFriendCsReq = 2971; - public static final int GetHeartDialInfoScRsp = 6357; - public static final int ComposeLimitNumUpdateNotify = 510; - public static final int GetCurAssistCsReq = 2917; - public static final int TakeRollShopRewardCsReq = 6903; - public static final int RelicRecommendScRsp = 530; - public static final int ChangeLineupLeaderCsReq = 789; - public static final int TrialActivityDataChangeScNotify = 2678; - public static final int AlleyGuaranteedFundsCsReq = 4717; - public static final int UpdateFeatureSwitchScNotify = 75; - public static final int FinishQuestCsReq = 946; - public static final int ChessRogueRollDiceScRsp = 5454; - public static final int GetAuthkeyScRsp = 39; - public static final int ActivateFarmElementCsReq = 1430; - public static final int StartAetherDivideChallengeBattleScRsp = 4834; - public static final int SetAetherDivideLineUpCsReq = 4823; - public static final int StartRogueScRsp = 1897; - public static final int UnlockAvatarSkinScNotify = 312; - public static final int SellItemCsReq = 598; - public static final int SwapLineupScRsp = 746; - public static final int TakeAllApRewardCsReq = 3319; - public static final int GetChallengeGroupStatisticsCsReq = 1739; - public static final int RetcodeNotify = 27; - public static final int FinishPerformSectionIdScRsp = 2746; - public static final int AetherDivideFinishChallengeScNotify = 4895; - public static final int SyncLineupNotify = 773; - public static final int UseItemScRsp = 534; - public static final int GetFarmStageGachaInfoCsReq = 1316; - public static final int UseTreasureDungeonItemScRsp = 4465; - public static final int AcceptMainMissionCsReq = 1254; + public static final int SpringRecoverCsReq = 1443; + public static final int TakeTrainVisitorUntakenBehaviorRewardScRsp = 3770; + public static final int FinishEmotionDialoguePerformanceScRsp = 6326; + public static final int SelectChatBubbleScRsp = 5145; + public static final int GetEnhanceCommonRogueBuffInfoCsReq = 5637; + public static final int SubmitMonsterResearchActivityMaterialCsReq = 2691; + public static final int EnterAetherDivideSceneCsReq = 4810; + public static final int HeliobusActivityDataCsReq = 5810; + public static final int CommonRogueQueryScRsp = 5622; + public static final int GetRogueShopMiracleInfoCsReq = 5645; + public static final int ApplyFriendCsReq = 2977; + public static final int GetHeartDialInfoScRsp = 6333; + public static final int ComposeLimitNumUpdateNotify = 567; + public static final int GetCurAssistCsReq = 2932; + public static final int TakeRollShopRewardCsReq = 6911; + public static final int RelicRecommendScRsp = 523; + public static final int ChangeLineupLeaderCsReq = 795; + public static final int TrialActivityDataChangeScNotify = 2668; + public static final int DrinkMakerChallengeCsReq = 6988; + public static final int GetMbtiReportCsReq = 7046; + public static final int AlleyGuaranteedFundsCsReq = 4732; + public static final int UpdateFeatureSwitchScNotify = 31; + public static final int FinishQuestCsReq = 970; + public static final int ChessRogueRollDiceScRsp = 5444; + public static final int GetAuthkeyScRsp = 99; + public static final int ActivateFarmElementCsReq = 1423; + public static final int SetAetherDivideLineUpCsReq = 4858; + public static final int StartAetherDivideChallengeBattleScRsp = 4826; + public static final int StartRogueScRsp = 1845; + public static final int UnlockAvatarSkinScNotify = 365; + public static final int SellItemCsReq = 591; + public static final int SwapLineupScRsp = 770; + public static final int TakeAllApRewardCsReq = 3360; + public static final int GetChallengeGroupStatisticsCsReq = 1799; + public static final int RetcodeNotify = 22; + public static final int FinishPerformSectionIdScRsp = 2770; + public static final int AetherDivideFinishChallengeScNotify = 4885; + public static final int SyncLineupNotify = 703; + public static final int UseItemScRsp = 526; + public static final int GetFarmStageGachaInfoCsReq = 1342; + public static final int UseTreasureDungeonItemScRsp = 4494; + public static final int AcceptMainMissionCsReq = 1238; public static final int GetWolfBroGameDataCsReq = 6600; - public static final int JoinLineupCsReq = 704; - public static final int DelSaveRaidScNotify = 2298; - public static final int InteractPropScRsp = 1497; - public static final int EnableRogueTalentCsReq = 1849; - public static final int CurTrialActivityScNotify = 2621; - public static final int UnlockPhoneThemeScNotify = 5134; - public static final int SubmitEmotionItemScRsp = 6319; - public static final int UpdateRogueAdventureRoomScoreScRsp = 5688; - public static final int NewAssistHistoryNotify = 2905; - public static final int AlleyShipUsedCountScNotify = 4724; - public static final int RecoverAllLineupCsReq = 1417; - public static final int HeliobusSnsPostScRsp = 5819; - public static final int SetNicknameCsReq = 60; - public static final int SharePunkLordMonsterCsReq = 3204; - public static final int GetChessRogueBuffEnhanceInfoScRsp = 5579; - public static final int AlleyPlacingGameCsReq = 4723; - public static final int TakeRogueEventHandbookRewardCsReq = 5613; - public static final int GetPlayerReturnMultiDropInfoScRsp = 4604; - public static final int MuseumTakeCollectRewardCsReq = 4395; - public static final int GetActivityScheduleConfigCsReq = 2604; - public static final int DeleteSummonUnitCsReq = 1487; - public static final int RefreshAlleyOrderScRsp = 4726; - public static final int FinishChessRogueSubStoryScRsp = 5476; - public static final int GetCurSceneInfoScRsp = 1434; - public static final int GetFightActivityDataScRsp = 3657; - public static final int QuitBattleCsReq = 116; - public static final int FinishFirstTalkNpcScRsp = 2134; - public static final int StartCocoonStageScRsp = 1405; - public static final int BattleLogReportScRsp = 173; - public static final int TreasureDungeonFinishScNotify = 4457; - public static final int ChessRogueEnterScRsp = 5527; - public static final int SetMissionEventProgressCsReq = 1253; - public static final int TreasureDungeonDataScNotify = 4407; - public static final int StrongChallengeActivityBattleEndScNotify = 6604; - public static final int StartAlleyEventCsReq = 4771; - public static final int ChessRogueCellUpdateNotify = 5493; + public static final int JoinLineupCsReq = 716; + public static final int DelSaveRaidScNotify = 2291; + public static final int InteractPropScRsp = 1445; + public static final int DeleteSocialEventServerCacheScRsp = 7079; + public static final int EnableRogueTalentCsReq = 1815; + public static final int CurTrialActivityScNotify = 2628; + public static final int UnlockPhoneThemeScNotify = 5126; + public static final int SubmitEmotionItemScRsp = 6360; + public static final int UpdateRogueAdventureRoomScoreScRsp = 5629; + public static final int NewAssistHistoryNotify = 2987; + public static final int AlleyShipUsedCountScNotify = 4712; + public static final int RecoverAllLineupCsReq = 1432; + public static final int HeliobusSnsPostScRsp = 5860; + public static final int SetNicknameCsReq = 66; + public static final int SharePunkLordMonsterCsReq = 3216; + public static final int GetChessRogueBuffEnhanceInfoScRsp = 5418; + public static final int AlleyPlacingGameCsReq = 4758; + public static final int TakeRogueEventHandbookRewardCsReq = 5649; + public static final int GetPlayerReturnMultiDropInfoScRsp = 4616; + public static final int MuseumTakeCollectRewardCsReq = 4385; + public static final int MonopolyGameCreateScNotify = 7018; + public static final int MonopolyGetRafflePoolInfoScRsp = 7088; + public static final int DailyFirstEnterMonopolyActivityCsReq = 7058; + public static final int GetActivityScheduleConfigCsReq = 2616; + public static final int DeleteSummonUnitCsReq = 1441; + public static final int RefreshAlleyOrderScRsp = 4776; + public static final int FinishChessRogueSubStoryScRsp = 5478; + public static final int GetCurSceneInfoScRsp = 1426; + public static final int GetFightActivityDataScRsp = 3633; + public static final int QuitBattleCsReq = 142; + public static final int FinishFirstTalkNpcScRsp = 2126; + public static final int StartCocoonStageScRsp = 1487; + public static final int BattleLogReportScRsp = 103; + public static final int TreasureDungeonFinishScNotify = 4433; + public static final int ChessRogueEnterScRsp = 5582; + public static final int SetMissionEventProgressCsReq = 1208; + public static final int TreasureDungeonDataScNotify = 4410; + public static final int StrongChallengeActivityBattleEndScNotify = 6616; + public static final int StartAlleyEventCsReq = 4777; + public static final int ChessRogueCellUpdateNotify = 5477; public static final int QuestRecordScNotify = 1000; - public static final int BuyRogueShopMiracleCsReq = 5634; - public static final int EnterRogueEndlessActivityStageScRsp = 6097; - public static final int StartAetherDivideStageBattleCsReq = 4850; - public static final int GetLoginActivityCsReq = 2607; - public static final int UpdateServerPrefsDataCsReq = 6104; - public static final int StartBoxingClubBattleScRsp = 4219; - public static final int GetStoryLineInfoCsReq = 6207; - public static final int ChessRogueUpdateReviveInfoScNotify = 5570; - public static final int GetWaypointCsReq = 407; - public static final int ReturnLastTownScRsp = 1465; - public static final int SubmitOfferingItemCsReq = 6940; - public static final int LeaveRogueScRsp = 1834; - public static final int FinishTutorialGuideCsReq = 1673; - public static final int SpaceZooExchangeItemScRsp = 6723; - public static final int SetSpringRecoverConfigScRsp = 1436; - public static final int TravelBrochureSetPageDescStatusScRsp = 6426; - public static final int GetAlleyInfoCsReq = 4707; - public static final int GetAllSaveRaidScRsp = 2226; - public static final int FightTreasureDungeonMonsterScRsp = 4426; - public static final int FinishCosumeItemMissionCsReq = 1223; - public static final int ExchangeStaminaScRsp = 81; - public static final int ChessRogueNousDiceSurfaceUnlockNotify = 5520; - public static final int FinishChapterScNotify = 4916; - public static final int GetPunkLordBattleRecordScRsp = 3217; - public static final int GetShopListScRsp = 1557; - public static final int LogisticsScoreRewardSyncInfoScNotify = 4708; - public static final int GetStageLineupScRsp = 757; - public static final int GetTelevisionActivityDataCsReq = 6965; - public static final int LockRelicCsReq = 539; - public static final int EnterSceneCsReq = 1422; - public static final int SetClientPausedCsReq = 1411; - public static final int PlayerLogoutCsReq = 16; - public static final int SpaceZooMutateCsReq = 6704; - public static final int BattlePassInfoNotify = 3007; - public static final int ReserveStaminaExchangeScRsp = 63; - public static final int MarkItemCsReq = 555; - public static final int StartFinishMainMissionScNotify = 1210; - public static final int FinishAeonDialogueGroupCsReq = 1882; - public static final int HeliobusSnsUpdateScNotify = 5873; - public static final int UpdateFloorSavedValueNotify = 1474; - public static final int TrainVisitorBehaviorFinishScRsp = 3757; - public static final int LockEquipmentCsReq = 504; - public static final int AetherDivideTainerInfoScNotify = 4879; - public static final int TextJoinBatchSaveCsReq = 3804; - public static final int ExpUpRelicScRsp = 518; - public static final int AlleyShipUnlockScNotify = 4776; - public static final int DeactivateFarmElementScRsp = 1438; - public static final int ChessRogueEnterNextLayerScRsp = 5443; - public static final int SyncRogueFinishScNotify = 1881; - public static final int HeliobusSnsReadCsReq = 5816; - public static final int ChessRogueNousEditDiceCsReq = 5407; - public static final int LeaveTrialActivityScRsp = 2633; - public static final int SetGameplayBirthdayScRsp = 72; - public static final int GroupStateChangeScNotify = 1425; - public static final int SetSignatureCsReq = 2846; - public static final int EquipAetherDividePassiveSkillCsReq = 4881; - public static final int SetLanguageScRsp = 79; - public static final int GetLevelRewardTakenListCsReq = 65; - public static final int InteractTreasureDungeonGridScRsp = 4460; - public static final int GetRndOptionCsReq = 3407; - public static final int ChessRogueNousDiceUpdateNotify = 5409; - public static final int TakeQuestRewardCsReq = 916; - public static final int TravelBrochureSelectMessageCsReq = 6404; - public static final int ChessRoguePickAvatarScRsp = 5541; - public static final int LeaveAetherDivideSceneScRsp = 4897; - public static final int MuseumRandomEventStartScNotify = 4398; - public static final int UpdateTrackMainMissionIdCsReq = 1205; - public static final int RemoveStuffFromAreaScRsp = 4334; - public static final int SetGenderScRsp = 8; - public static final int BoxingClubChallengeUpdateScNotify = 4246; - public static final int SyncRogueCommonVirtualItemInfoScNotify = 5637; - public static final int GetBasicInfoScRsp = 37; - public static final int AetherDivideSpiritExpUpCsReq = 4851; - public static final int GetFirstTalkByPerformanceNpcScRsp = 2106; - public static final int TrainRefreshTimeNotify = 3704; - public static final int ChooseBoxingClubStageOptionalBuffScRsp = 4218; - public static final int TakeCityShopRewardScRsp = 1519; - public static final int ChessRogueUpdateUnlockLevelScNotify = 5545; - public static final int ReviveRogueAvatarCsReq = 1898; - public static final int SetTurnFoodSwitchScRsp = 511; - public static final int SceneEntityMoveScNotify = 1473; + public static final int MonopolyCheatDiceCsReq = 7069; + public static final int BuyRogueShopMiracleCsReq = 5626; + public static final int EnterRogueEndlessActivityStageScRsp = 6045; + public static final int StartAetherDivideStageBattleCsReq = 4837; + public static final int GetLoginActivityCsReq = 2610; + public static final int UpdateServerPrefsDataCsReq = 6116; + public static final int StartBoxingClubBattleScRsp = 4260; + public static final int GetFeverTimeActivityDataScRsp = 7151; + public static final int GetStoryLineInfoCsReq = 6210; + public static final int ChessRogueUpdateReviveInfoScNotify = 5554; + public static final int GetWaypointCsReq = 410; + public static final int ReturnLastTownScRsp = 1494; + public static final int SubmitOfferingItemCsReq = 6921; + public static final int LeaveRogueScRsp = 1826; + public static final int FinishTutorialGuideCsReq = 1603; + public static final int SpaceZooExchangeItemScRsp = 6758; + public static final int MonopolyAcceptQuizCsReq = 7087; + public static final int MonopolySocialEventEffectScNotify = 7025; + public static final int SetSpringRecoverConfigScRsp = 1448; + public static final int TravelBrochureSetPageDescStatusScRsp = 6476; + public static final int GetAlleyInfoCsReq = 4710; + public static final int GetAllSaveRaidScRsp = 2276; + public static final int FightTreasureDungeonMonsterScRsp = 4476; + public static final int FinishCosumeItemMissionCsReq = 1258; + public static final int WolfBroGamePickupBulletScRsp = 6536; + public static final int ExchangeStaminaScRsp = 36; + public static final int ChessRogueNousDiceSurfaceUnlockNotify = 5590; + public static final int FinishChapterScNotify = 4942; + public static final int GetPunkLordBattleRecordScRsp = 3232; + public static final int GetShopListScRsp = 1533; + public static final int LogisticsScoreRewardSyncInfoScNotify = 4718; + public static final int GetStageLineupScRsp = 733; + public static final int GetTelevisionActivityDataCsReq = 6979; + public static final int LockRelicCsReq = 599; + public static final int EnterSceneCsReq = 1419; + public static final int SetClientPausedCsReq = 1497; + public static final int PlayerLogoutCsReq = 42; + public static final int SpaceZooMutateCsReq = 6716; + public static final int BattlePassInfoNotify = 3010; + public static final int MonopolyMoveCsReq = 7026; + public static final int ReserveStaminaExchangeScRsp = 20; + public static final int MarkItemCsReq = 501; + public static final int StartFinishMainMissionScNotify = 1267; + public static final int FinishAeonDialogueGroupCsReq = 1864; + public static final int HeliobusSnsUpdateScNotify = 5803; + public static final int MonopolyGameRaiseRatioCsReq = 7067; + public static final int MonopolyRollDiceScRsp = 7077; + public static final int UpdateFloorSavedValueNotify = 1488; + public static final int WolfBroGameActivateBulletScRsp = 6599; + public static final int TrainVisitorBehaviorFinishScRsp = 3733; + public static final int LockEquipmentCsReq = 516; + public static final int AetherDivideTainerInfoScNotify = 4883; + public static final int TextJoinBatchSaveCsReq = 3816; + public static final int ExpUpRelicScRsp = 502; + public static final int AlleyShipUnlockScNotify = 4706; + public static final int DeactivateFarmElementScRsp = 1444; + public static final int ChessRogueEnterNextLayerScRsp = 5437; + public static final int SyncRogueFinishScNotify = 1836; + public static final int HeliobusSnsReadCsReq = 5842; + public static final int ChessRogueNousEditDiceCsReq = 5450; + public static final int LeaveTrialActivityScRsp = 2625; + public static final int SetGameplayBirthdayScRsp = 43; + public static final int GroupStateChangeScNotify = 1417; + public static final int MonopolyTakePhaseRewardScRsp = 7052; + public static final int SetSignatureCsReq = 2870; + public static final int EquipAetherDividePassiveSkillCsReq = 4836; + public static final int SetLanguageScRsp = 83; + public static final int GetLevelRewardTakenListCsReq = 94; + public static final int InteractTreasureDungeonGridScRsp = 4466; + public static final int GetRndOptionCsReq = 3410; + public static final int ChessRogueNousDiceUpdateNotify = 5465; + public static final int TakeQuestRewardCsReq = 942; + public static final int TravelBrochureSelectMessageCsReq = 6416; + public static final int ChessRoguePickAvatarScRsp = 5595; + public static final int LeaveAetherDivideSceneScRsp = 4845; + public static final int MuseumRandomEventStartScNotify = 4391; + public static final int UpdateTrackMainMissionIdCsReq = 1287; + public static final int RemoveStuffFromAreaScRsp = 4326; + public static final int SetGenderScRsp = 18; + public static final int MonopolyScrachRaffleTicketCsReq = 7034; + public static final int BoxingClubChallengeUpdateScNotify = 4270; + public static final int SyncRogueCommonVirtualItemInfoScNotify = 5624; + public static final int GetBasicInfoScRsp = 24; + public static final int AetherDivideSpiritExpUpCsReq = 4896; + public static final int GetFirstTalkByPerformanceNpcScRsp = 2111; + public static final int TrainRefreshTimeNotify = 3716; + public static final int ChooseBoxingClubStageOptionalBuffScRsp = 4202; + public static final int TakeCityShopRewardScRsp = 1560; + public static final int ChessRogueUpdateUnlockLevelScNotify = 5572; + public static final int ReviveRogueAvatarCsReq = 1891; + public static final int SetTurnFoodSwitchScRsp = 597; + public static final int SceneEntityMoveScNotify = 1403; public static final int LeaveMapRotationRegionCsReq = 6900; - public static final int TakeTrialActivityRewardScRsp = 2635; - public static final int ClientObjDownloadDataScNotify = 69; - public static final int ExchangeHcoinScRsp = 551; - public static final int DressAvatarSkinCsReq = 365; - public static final int QueryProductInfoCsReq = 90; + public static final int TakeTrialActivityRewardScRsp = 2646; + public static final int ClientObjDownloadDataScNotify = 63; + public static final int ExchangeHcoinScRsp = 596; + public static final int DressAvatarSkinCsReq = 394; + public static final int QueryProductInfoCsReq = 39; public static final int TakeChallengeRaidRewardScRsp = 2300; - public static final int GetReplayTokenCsReq = 3507; - public static final int DoGachaInRollShopCsReq = 6920; - public static final int ChessRogueNousEnableRogueTalentScRsp = 5515; - public static final int EnhanceCommonRogueBuffCsReq = 5651; - public static final int EnterStrongChallengeActivityStageScRsp = 6697; - public static final int GetMapRotationDataCsReq = 6873; - public static final int PromoteEquipmentScRsp = 597; - public static final int RaidCollectionDataScNotify = 6960; - public static final int RankUpAvatarScRsp = 381; - public static final int SceneEntityMoveScRsp = 1457; - public static final int AlleyEventEffectNotify = 4746; - public static final int GetCurBattleInfoScRsp = 119; - public static final int ChangeStoryLineCsReq = 6297; - public static final int TriggerVoiceCsReq = 4123; - public static final int GameplayCounterUpdateScNotify = 1401; - public static final int ChessRogueUpdateDicePassiveAccumulateValueScNotify = 5420; - public static final int GiveUpBoxingClubChallengeScRsp = 4234; - public static final int AcceptedPamMissionExpireScRsp = 4057; - public static final int RegionStopScNotify = 26; - public static final int TakeRogueEndlessActivityPointRewardScRsp = 6071; - public static final int GetChessRogueStoryAeonTalkInfoCsReq = 5593; - public static final int DailyTaskDataScNotify = 1234; - public static final int BuyNpcStuffScRsp = 4397; - public static final int GetMissionDataCsReq = 1207; - public static final int GetFriendApplyListInfoCsReq = 2904; - public static final int GetUnlockTeleportCsReq = 1463; - public static final int ChessRogueFinishCurRoomNotify = 5429; - public static final int TextJoinQueryCsReq = 3816; - public static final int RotateMapScRsp = 6834; - public static final int LeaveChallengeScRsp = 1719; - public static final int TakeRogueAeonLevelRewardCsReq = 1829; - public static final int SummonPunkLordMonsterScRsp = 3234; - public static final int LeaveMapRotationRegionScNotify = 6881; - public static final int SetGroupCustomSaveDataScRsp = 1445; - public static final int SwitchLineupIndexCsReq = 718; - public static final int FinishItemIdCsReq = 2704; - public static final int MuseumRandomEventSelectCsReq = 4365; - public static final int PlayerGetTokenScRsp = 19; - public static final int RefreshTriggerByClientCsReq = 1456; - public static final int EnterTreasureDungeonScRsp = 4489; - public static final int GetQuestRecordScRsp = 934; - public static final int RogueModifierUpdateNotify = 5334; - public static final int RestoreWolfBroGameArchiveCsReq = 6504; - public static final int CommonRogueUpdateScNotify = 5635; - public static final int MissionGroupWarnScNotify = 1206; - public static final int GetEnteredSceneScRsp = 1482; - public static final int ArchiveWolfBroGameScRsp = 6597; - public static final int SyncTaskScRsp = 1271; - public static final int PlayerReturnTakeRewardScRsp = 4534; - public static final int PickRogueAvatarScRsp = 1839; - public static final int ComposeItemCsReq = 523; - public static final int SetFriendMarkCsReq = 2988; - public static final int SyncRogueRewardInfoScNotify = 1832; + public static final int GetReplayTokenCsReq = 3510; + public static final int DoGachaInRollShopCsReq = 6901; + public static final int ChessRogueNousEnableRogueTalentScRsp = 5562; + public static final int EnhanceCommonRogueBuffCsReq = 5696; + public static final int EnterStrongChallengeActivityStageScRsp = 6645; + public static final int WolfBroGameUseBulletCsReq = 6511; + public static final int GetMapRotationDataCsReq = 6803; + public static final int PromoteEquipmentScRsp = 545; + public static final int RaidCollectionDataScNotify = 6941; + public static final int RankUpAvatarScRsp = 336; + public static final int GetMovieRacingDataScRsp = 4194; + public static final int SceneEntityMoveScRsp = 1433; + public static final int AlleyEventEffectNotify = 4770; + public static final int GetCurBattleInfoScRsp = 160; + public static final int ChangeStoryLineCsReq = 6245; + public static final int TriggerVoiceCsReq = 4158; + public static final int GameplayCounterUpdateScNotify = 1404; + public static final int ChessRogueUpdateDicePassiveAccumulateValueScNotify = 5570; + public static final int GiveUpBoxingClubChallengeScRsp = 4226; + public static final int AcceptedPamMissionExpireScRsp = 4033; + public static final int RegionStopScNotify = 76; + public static final int TakeRogueEndlessActivityPointRewardScRsp = 6077; + public static final int GetChessRogueStoryAeonTalkInfoCsReq = 5524; + public static final int DailyTaskDataScNotify = 1226; + public static final int GetMonopolyFriendRankingListScRsp = 7068; + public static final int GetMonopolyDailyReportScRsp = 7040; + public static final int BuyNpcStuffScRsp = 4345; + public static final int GetMissionDataCsReq = 1210; + public static final int GetFriendApplyListInfoCsReq = 2916; + public static final int GetUnlockTeleportCsReq = 1420; + public static final int ChessRogueFinishCurRoomNotify = 5402; + public static final int TextJoinQueryCsReq = 3842; + public static final int RotateMapScRsp = 6826; + public static final int LeaveChallengeScRsp = 1760; + public static final int TakeRogueAeonLevelRewardCsReq = 1834; + public static final int MonopolyGuessDrawScNotify = 7044; + public static final int MonopolyGameGachaCsReq = 7032; + public static final int SummonPunkLordMonsterScRsp = 3226; + public static final int LeaveMapRotationRegionScNotify = 6836; + public static final int SetGroupCustomSaveDataScRsp = 1480; + public static final int SwitchLineupIndexCsReq = 702; + public static final int FinishItemIdCsReq = 2716; + public static final int MuseumRandomEventSelectCsReq = 4394; + public static final int PlayerGetTokenScRsp = 60; + public static final int RefreshTriggerByClientCsReq = 1461; + public static final int EnterTreasureDungeonScRsp = 4495; + public static final int GetQuestRecordScRsp = 926; + public static final int RogueModifierUpdateNotify = 5326; + public static final int RestoreWolfBroGameArchiveCsReq = 6516; + public static final int CommonRogueUpdateScNotify = 5646; + public static final int MissionGroupWarnScNotify = 1211; + public static final int GetEnteredSceneScRsp = 1464; + public static final int ArchiveWolfBroGameScRsp = 6545; + public static final int SyncTaskScRsp = 1277; + public static final int PlayerReturnTakeRewardScRsp = 4526; + public static final int PickRogueAvatarScRsp = 1899; + public static final int ComposeItemCsReq = 558; + public static final int SetFriendMarkCsReq = 2929; + public static final int SyncRogueRewardInfoScNotify = 1882; public static final int UnlockHeadIconScNotify = 2900; - public static final int SyncHandleFriendScNotify = 2906; - public static final int GetGachaInfoCsReq = 1907; - public static final int RogueModifierSelectCellScRsp = 5304; - public static final int HeliobusUpgradeLevelScRsp = 5889; - public static final int TakeLoginActivityRewardScRsp = 2697; - public static final int PVEBattleResultCsReq = 107; + public static final int SyncHandleFriendScNotify = 2911; + public static final int GetGachaInfoCsReq = 1910; + public static final int RogueModifierSelectCellScRsp = 5316; + public static final int HeliobusUpgradeLevelScRsp = 5895; + public static final int TakeMultipleExpeditionRewardScRsp = 2591; + public static final int TakeLoginActivityRewardScRsp = 2645; + public static final int PVEBattleResultCsReq = 110; + public static final int MonopolyGuessChooseScRsp = 7047; public static final int QuitBattleScNotify = 200; - public static final int TakeOffRelicCsReq = 326; - public static final int StartRaidScRsp = 2257; - public static final int RogueModifierStageStartNotify = 5346; - public static final int SetHeroBasicTypeCsReq = 54; - public static final int ComposeSelectedRelicCsReq = 553; - public static final int GetTutorialGuideScRsp = 1697; - public static final int GetFriendAssistListScRsp = 2936; - public static final int GetTreasureDungeonActivityDataScRsp = 4406; - public static final int InteractChargerCsReq = 6816; - public static final int GetPlayerBoardDataScRsp = 2857; - public static final int EntityBindPropScRsp = 1408; - public static final int GetExpeditionDataCsReq = 2507; - public static final int AlleyTakeEventRewardScRsp = 4715; - public static final int TakeMailAttachmentScRsp = 834; - public static final int SetDisplayAvatarCsReq = 2804; - public static final int ChessRogueQueryAeonDimensionsScRsp = 5492; - public static final int HeliobusSnsLikeCsReq = 5871; - public static final int TravelBrochureSetCustomValueScRsp = 6418; - public static final int ScenePlaneEventScNotify = 1499; - public static final int MatchBoxingClubOpponentScRsp = 4297; - public static final int CurAssistChangedNotify = 2911; - public static final int ArchiveWolfBroGameCsReq = 6516; - public static final int PlayerReturnTakePointRewardCsReq = 4504; - public static final int ChessRogueSelectBpCsReq = 5524; - public static final int DeployRotaterCsReq = 6804; - public static final int AceAntiCheaterScRsp = 52; - public static final int GetAllLineupDataCsReq = 760; - public static final int TakeFightActivityRewardCsReq = 3619; - public static final int MultipleDropInfoNotify = 4619; - public static final int GetPunkLordDataCsReq = 3218; - public static final int UnlockTutorialGuideScRsp = 1634; - public static final int WaypointShowNewCsNotify = 471; - public static final int AlleyShopLevelScNotify = 4753; - public static final int EnterSceneByServerScNotify = 1492; - public static final int GeneralVirtualItemDataNotify = 502; - public static final int DeleteFriendScRsp = 2989; - public static final int GetTutorialScRsp = 1657; - public static final int PlayerGetTokenCsReq = 4; - public static final int TravelBrochureGetDataScRsp = 6457; - public static final int GiveUpBoxingClubChallengeCsReq = 4271; - public static final int SwitchAetherDivideLineUpSlotScRsp = 4860; - public static final int HeliobusEnterBattleCsReq = 5860; - public static final int FinishCurTurnCsReq = 4373; - public static final int TakeRogueScoreRewardScRsp = 1865; - public static final int GetFriendRecommendListInfoScRsp = 2960; - public static final int PlayerReturnSignCsReq = 4557; - public static final int GetFriendLoginInfoCsReq = 2990; - public static final int GetFriendListInfoScRsp = 2957; + public static final int MonopolyGiveUpCurContentScRsp = 7065; + public static final int TakeOffRelicCsReq = 376; + public static final int StartRaidScRsp = 2233; + public static final int RogueModifierStageStartNotify = 5370; + public static final int MonopolyGetRegionProgressCsReq = 7020; + public static final int SetHeroBasicTypeCsReq = 38; + public static final int ComposeSelectedRelicCsReq = 508; + public static final int GetTutorialGuideScRsp = 1645; + public static final int SceneCastSkillCostMpScRsp = 1436; + public static final int GetFriendAssistListScRsp = 2948; + public static final int GetTreasureDungeonActivityDataScRsp = 4411; + public static final int InteractChargerCsReq = 6842; + public static final int GetPlayerBoardDataScRsp = 2833; + public static final int EntityBindPropScRsp = 1418; + public static final int GetExpeditionDataCsReq = 2510; + public static final int MonopolyConfirmRandomScRsp = 7066; + public static final int GetMonopolyDailyReportCsReq = 7050; + public static final int AlleyTakeEventRewardScRsp = 4707; + public static final int TakeMailAttachmentScRsp = 826; + public static final int SetDisplayAvatarCsReq = 2816; + public static final int ChessRogueQueryAeonDimensionsScRsp = 5404; + public static final int HeliobusSnsLikeCsReq = 5877; + public static final int TravelBrochureSetCustomValueScRsp = 6402; + public static final int ScenePlaneEventScNotify = 1471; + public static final int MatchBoxingClubOpponentScRsp = 4245; + public static final int CurAssistChangedNotify = 2997; + public static final int ArchiveWolfBroGameCsReq = 6542; + public static final int PlayerReturnTakePointRewardCsReq = 4516; + public static final int ChessRogueSelectBpCsReq = 5443; + public static final int DeployRotaterCsReq = 6816; + public static final int AceAntiCheaterScRsp = 84; + public static final int GetAllLineupDataCsReq = 766; + public static final int TakeFightActivityRewardCsReq = 3660; + public static final int GetMonopolyMbtiReportRewardScRsp = 7014; + public static final int MultipleDropInfoNotify = 4660; + public static final int GetPunkLordDataCsReq = 3202; + public static final int UnlockTutorialGuideScRsp = 1626; + public static final int WaypointShowNewCsNotify = 477; + public static final int AlleyShopLevelScNotify = 4708; + public static final int EnterSceneByServerScNotify = 1459; + public static final int GeneralVirtualItemDataNotify = 547; + public static final int DeleteFriendScRsp = 2995; + public static final int GetTutorialScRsp = 1633; + public static final int PlayerGetTokenCsReq = 16; + public static final int TravelBrochureGetDataScRsp = 6433; + public static final int GiveUpBoxingClubChallengeCsReq = 4277; + public static final int SwitchAetherDivideLineUpSlotScRsp = 4866; + public static final int HeliobusEnterBattleCsReq = 5866; + public static final int FinishCurTurnCsReq = 4303; + public static final int TakeRogueScoreRewardScRsp = 1894; + public static final int GetFriendRecommendListInfoScRsp = 2966; + public static final int PlayerReturnSignCsReq = 4533; + public static final int EnterFeverTimeActivityStageScRsp = 7158; + public static final int GetFriendLoginInfoCsReq = 2939; + public static final int GetFriendListInfoScRsp = 2933; public static final int BoxingClubRewardScNotify = 4300; - public static final int GetQuestDataCsReq = 907; - public static final int PlayerReturnInfoQueryScRsp = 4546; - public static final int PlayerReturnStartScNotify = 4507; - public static final int ChallengeLineupNotify = 1706; - public static final int ExchangeRogueBuffWithMiracleScRsp = 5660; - public static final int UpdateMechanismBarScNotify = 1435; - public static final int UpdatePlayerSettingCsReq = 67; - public static final int UpdateTrackMainMissionIdScRsp = 1243; - public static final int GetAssistHistoryScRsp = 2915; - public static final int PlayBackGroundMusicCsReq = 3116; - public static final int StartBattleCollegeScRsp = 5704; - public static final int ChangeScriptEmotionScRsp = 6397; - public static final int LeaveAetherDivideSceneCsReq = 4816; - public static final int SyncRogueCommonPendingActionScNotify = 5630; - public static final int MarkReadMailScRsp = 897; - public static final int GetRogueDialogueEventDataScRsp = 1872; - public static final int MarkChatEmojiScRsp = 3906; - public static final int GetServerPrefsDataCsReq = 6116; - public static final int GetSecretKeyInfoCsReq = 48; - public static final int ChessRogueSelectCellScRsp = 5474; - public static final int GetTrainVisitorBehaviorScRsp = 3797; - public static final int SelectInclinationTextScRsp = 2146; - public static final int SetIsDisplayAvatarInfoScRsp = 2834; - public static final int GetRogueInitialScoreCsReq = 1802; - public static final int LeaveChallengeCsReq = 1704; - public static final int BuyBpLevelScRsp = 3071; - public static final int AcceptMissionEventScRsp = 1298; - public static final int GetQuestRecordCsReq = 971; - public static final int StartTimedCocoonStageCsReq = 1431; - public static final int EnterRogueScRsp = 1819; - public static final int LastSpringRefreshTimeNotify = 1460; - public static final int LogisticsDetonateStarSkiffScRsp = 4743; - public static final int TakeOffEquipmentCsReq = 373; - public static final int GetRogueBuffEnhanceInfoScRsp = 1853; - public static final int EnhanceChessRogueBuffCsReq = 5472; - public static final int CancelCacheNotifyScRsp = 4146; - public static final int SendMsgCsReq = 3907; - public static final int SwitchLineupIndexScRsp = 739; - public static final int StoryLineInfoScNotify = 6216; - public static final int ChessRogueUpdateBoardScNotify = 5572; - public static final int GetQuestDataScRsp = 957; - public static final int BuyNpcStuffCsReq = 4316; - public static final int TakeRogueScoreRewardCsReq = 1850; - public static final int CancelActivityExpeditionCsReq = 2506; - public static final int HeliobusEnterBattleScRsp = 5850; - public static final int GetLevelRewardTakenListScRsp = 51; - public static final int SetHeadIconScRsp = 2897; - public static final int AcceptExpeditionCsReq = 2516; - public static final int HandleRogueCommonPendingActionCsReq = 5678; - public static final int LogisticsInfoScNotify = 4795; - public static final int DailyFirstMeetPamScRsp = 3497; - public static final int ChessRogueQuestFinishNotify = 5510; - public static final int RechargeSuccNotify = 550; - public static final int SyncRogueMapRoomScNotify = 1890; - public static final int SetCurWaypointCsReq = 416; - public static final int ChessRogueUpdateAllowedSelectCellScNotify = 5566; - public static final int SceneEntityTeleportCsReq = 1462; - public static final int TravelBrochureUpdatePasterPosScRsp = 6406; - public static final int ChessRogueCheatRollScRsp = 5586; - public static final int UnlockTutorialScRsp = 1619; - public static final int UnlockTeleportNotify = 1432; - public static final int SetFriendRemarkNameScRsp = 2965; - public static final int GetFriendListInfoCsReq = 2907; + public static final int RemoveRotaterCsReq = 6876; + public static final int GetQuestDataCsReq = 910; + public static final int PlayerReturnInfoQueryScRsp = 4570; + public static final int PlayerReturnStartScNotify = 4510; + public static final int ChallengeLineupNotify = 1711; + public static final int ExchangeRogueBuffWithMiracleScRsp = 5666; + public static final int UpdateMechanismBarScNotify = 1446; + public static final int UpdatePlayerSettingCsReq = 98; + public static final int UpdateTrackMainMissionIdScRsp = 1286; + public static final int GetAssistHistoryScRsp = 2907; + public static final int PlayBackGroundMusicCsReq = 3142; + public static final int SyncRogueExploreWinScNotify = 1801; + public static final int MonopolyGameBingoFlipCardCsReq = 7001; + public static final int GetMonopolyFriendRankingListCsReq = 7043; + public static final int StartBattleCollegeScRsp = 5716; + public static final int ChangeScriptEmotionScRsp = 6345; + public static final int LeaveAetherDivideSceneCsReq = 4842; + public static final int SyncRogueCommonPendingActionScNotify = 5623; + public static final int MarkReadMailScRsp = 845; + public static final int GetRogueDialogueEventDataScRsp = 1843; + public static final int MarkChatEmojiScRsp = 3911; + public static final int GetServerPrefsDataCsReq = 6142; + public static final int GetSecretKeyInfoCsReq = 54; + public static final int ChessRogueSelectCellScRsp = 5475; + public static final int GetTrainVisitorBehaviorScRsp = 3745; + public static final int SelectInclinationTextScRsp = 2170; + public static final int SetIsDisplayAvatarInfoScRsp = 2826; + public static final int GetRogueInitialScoreCsReq = 1847; + public static final int LeaveChallengeCsReq = 1716; + public static final int BuyBpLevelScRsp = 3077; + public static final int AcceptMissionEventScRsp = 1291; + public static final int GetMonopolyInfoCsReq = 7010; + public static final int GetQuestRecordCsReq = 977; + public static final int StartTimedCocoonStageCsReq = 1490; + public static final int EnterRogueScRsp = 1860; + public static final int LastSpringRefreshTimeNotify = 1466; + public static final int LogisticsDetonateStarSkiffScRsp = 4786; + public static final int DrinkMakerDayEndScNotify = 6996; + public static final int TakeOffEquipmentCsReq = 303; + public static final int GetRogueBuffEnhanceInfoScRsp = 1808; + public static final int EnhanceChessRogueBuffCsReq = 5545; + public static final int CancelCacheNotifyScRsp = 4170; + public static final int SendMsgCsReq = 3910; + public static final int SwitchLineupIndexScRsp = 799; + public static final int MonopolyMoveScRsp = 7100; + public static final int StoryLineInfoScNotify = 6242; + public static final int ChessRogueUpdateBoardScNotify = 5523; + public static final int GetQuestDataScRsp = 933; + public static final int BuyNpcStuffCsReq = 4342; + public static final int TakeRogueScoreRewardCsReq = 1837; + public static final int CancelActivityExpeditionCsReq = 2511; + public static final int HeliobusEnterBattleScRsp = 5837; + public static final int GetLevelRewardTakenListScRsp = 96; + public static final int SetHeadIconScRsp = 2845; + public static final int AcceptExpeditionCsReq = 2542; + public static final int HandleRogueCommonPendingActionCsReq = 5668; + public static final int LogisticsInfoScNotify = 4785; + public static final int DailyFirstMeetPamScRsp = 3445; + public static final int ChessRogueQuestFinishNotify = 5598; + public static final int RechargeSuccNotify = 537; + public static final int MonopolyLikeScNotify = 7022; + public static final int SyncRogueMapRoomScNotify = 1839; + public static final int SetCurWaypointCsReq = 442; + public static final int ChessRogueUpdateAllowedSelectCellScNotify = 5494; + public static final int SceneEntityTeleportCsReq = 1456; + public static final int TravelBrochureUpdatePasterPosScRsp = 6411; + public static final int ChessRogueCheatRollScRsp = 5529; + public static final int UnlockTutorialScRsp = 1660; + public static final int UnlockTeleportNotify = 1482; + public static final int SetFriendRemarkNameScRsp = 2994; + public static final int GetFriendListInfoCsReq = 2910; + public static final int MonopolyTakeRaffleTicketRewardScRsp = 7005; public static final int HeartDialScriptChangeScNotify = 6400; - public static final int ExchangeHcoinCsReq = 565; - public static final int HeliobusLineupUpdateScNotify = 5876; - public static final int ChessRogueQueryBpCsReq = 5422; - public static final int TakeChapterRewardCsReq = 434; - public static final int SelectPhoneThemeScRsp = 5171; - public static final int SyncRoguePickAvatarInfoScNotify = 1884; - public static final int TakeRogueMiracleHandbookRewardScRsp = 5602; - public static final int DoGachaInRollShopScRsp = 6902; - public static final int GetSaveLogisticsMapCsReq = 4710; - public static final int StartChallengeScRsp = 1797; - public static final int PVEBattleResultScRsp = 157; - public static final int UpdateRedDotDataCsReq = 5916; - public static final int FinishPlotCsReq = 1107; - public static final int BuyGoodsScRsp = 1597; - public static final int BuyRogueShopBuffCsReq = 5646; - public static final int SubmitOrigamiItemCsReq = 4181; + public static final int ExchangeHcoinCsReq = 594; + public static final int HeliobusLineupUpdateScNotify = 5806; + public static final int ChessRogueQueryBpCsReq = 5482; + public static final int TakeChapterRewardCsReq = 426; + public static final int SelectPhoneThemeScRsp = 5177; + public static final int SyncRoguePickAvatarInfoScNotify = 1853; + public static final int TakeRogueMiracleHandbookRewardScRsp = 5647; + public static final int DoGachaInRollShopScRsp = 6907; + public static final int GetSaveLogisticsMapCsReq = 4767; + public static final int EnterFeverTimeActivityStageCsReq = 7155; + public static final int StartChallengeScRsp = 1745; + public static final int PVEBattleResultScRsp = 133; + public static final int UpdateRedDotDataCsReq = 5942; + public static final int FinishPlotCsReq = 1110; + public static final int BuyGoodsScRsp = 1545; + public static final int BuyRogueShopBuffCsReq = 5670; + public static final int SubmitOrigamiItemCsReq = 4136; + public static final int UpdateMovieRacingDataScRsp = 4108; + public static final int MonopolyGameBingoFlipCardScRsp = 7007; public static final int ExpeditionDataChangeScNotify = 2600; - public static final int GetTelevisionActivityDataScRsp = 6961; + public static final int GetTelevisionActivityDataScRsp = 6977; public static final int FinishTutorialCsReq = 1700; - public static final int WolfBroGameDataChangeScNotify = 6573; - public static final int GroupStateChangeScRsp = 1447; - public static final int SyncRogueReviveInfoScNotify = 1854; - public static final int HeliobusUpgradeLevelCsReq = 5823; - public static final int HeliobusSelectSkillCsReq = 5818; + public static final int WolfBroGameDataChangeScNotify = 6503; + public static final int GroupStateChangeScRsp = 1440; + public static final int SyncRogueReviveInfoScNotify = 1838; + public static final int HeliobusUpgradeLevelCsReq = 5858; + public static final int HeliobusSelectSkillCsReq = 5802; public static final int PlayerKickOutScNotify = 100; - public static final int FinishFirstTalkByPerformanceNpcScRsp = 2189; - public static final int SyncClientResVersionCsReq = 171; - public static final int SceneUpdatePositionVersionNotify = 1406; - public static final int EnterTelevisionActivityStageScRsp = 6963; - public static final int TrainVisitorRewardSendNotify = 3719; - public static final int GetMarkItemListCsReq = 517; - public static final int AetherDivideRefreshEndlessScRsp = 4894; - public static final int ServerSimulateBattleFinishScNotify = 106; - public static final int EnterTrialActivityStageScRsp = 2642; - public static final int ChessRogueSkipTeachingLevelScRsp = 5411; - public static final int EntityBindPropCsReq = 1443; - public static final int GetMultipleDropInfoCsReq = 4607; - public static final int GetDailyActiveInfoCsReq = 3316; - public static final int GetPhoneDataCsReq = 5107; - public static final int SpaceZooExchangeItemCsReq = 6706; - public static final int ChessRogueReRollDiceCsReq = 5419; - public static final int PlayerHeartBeatScRsp = 70; - public static final int SecurityReportScRsp = 4106; - public static final int RaidCollectionDataScRsp = 6941; - public static final int GetPrivateChatHistoryCsReq = 3904; - public static final int PlayerReturnTakeRewardCsReq = 4571; - public static final int GetSingleRedDotParamGroupScRsp = 5919; - public static final int RankUpAvatarCsReq = 389; - public static final int GameplayCounterCountDownScRsp = 1486; - public static final int GetRogueHandbookDataCsReq = 5605; - public static final int SceneCastSkillScRsp = 1419; - public static final int ChessRogueGoAheadScRsp = 5416; - public static final int ChessRogueChangeyAeonDimensionNotify = 5589; - public static final int ChessRogueNousGetRogueTalentInfoCsReq = 5509; - public static final int GetTutorialCsReq = 1607; - public static final int GetArchiveDataScRsp = 2357; - public static final int SyncAddBlacklistScNotify = 2926; - public static final int AlleyTakeEventRewardCsReq = 4755; - public static final int ExchangeRogueRewardKeyCsReq = 1835; - public static final int ChessRogueQuitCsReq = 5523; - public static final int ChessRogueGiveUpCsReq = 5405; - public static final int QueryProductInfoScRsp = 38; - public static final int StartTimedFarmElementScRsp = 1441; - public static final int ReplaceLineupCsReq = 751; - public static final int GetTrainVisitorRegisterCsReq = 3771; - public static final int SetBoxingClubResonanceLineupCsReq = 4223; - public static final int GetAllRedDotDataCsReq = 5907; - public static final int UseItemCsReq = 571; - public static final int ShareScRsp = 4157; - public static final int StartTrialActivityCsReq = 2670; - public static final int GetStrongChallengeActivityDataCsReq = 6607; - public static final int TakeAllApRewardScRsp = 3371; - public static final int GetTrialActivityDataScRsp = 2672; - public static final int GetChessRogueBuffEnhanceInfoCsReq = 5516; - public static final int GetFriendApplyListInfoScRsp = 2919; - public static final int GetPlayerBoardDataCsReq = 2807; - public static final int UnlockSkilltreeCsReq = 304; - public static final int TakeAllRewardCsReq = 3034; + public static final int FinishFirstTalkByPerformanceNpcScRsp = 2195; + public static final int SyncClientResVersionCsReq = 177; + public static final int SceneUpdatePositionVersionNotify = 1411; + public static final int EnterTelevisionActivityStageScRsp = 6971; + public static final int TrainVisitorRewardSendNotify = 3760; + public static final int EndDrinkMakerSequenceScRsp = 7000; + public static final int GetMarkItemListCsReq = 532; + public static final int AetherDivideRefreshEndlessScRsp = 4872; + public static final int ServerSimulateBattleFinishScNotify = 111; + public static final int EnterTrialActivityStageScRsp = 2689; + public static final int ChessRogueSkipTeachingLevelScRsp = 5540; + public static final int EntityBindPropCsReq = 1486; + public static final int GetMultipleDropInfoCsReq = 4610; + public static final int GetDailyActiveInfoCsReq = 3342; + public static final int GetPhoneDataCsReq = 5110; + public static final int SpaceZooExchangeItemCsReq = 6711; + public static final int ChessRogueReRollDiceCsReq = 5435; + public static final int PlayerHeartBeatScRsp = 73; + public static final int SecurityReportScRsp = 4111; + public static final int RaidCollectionDataScRsp = 6957; + public static final int GetDrinkMakerDataScRsp = 6997; + public static final int ExtraLineupDestroyNotify = 706; + public static final int MonopolyGetRegionProgressScRsp = 7081; + public static final int GetPrivateChatHistoryCsReq = 3916; + public static final int PlayerReturnTakeRewardCsReq = 4577; + public static final int GetSingleRedDotParamGroupScRsp = 5960; + public static final int RankUpAvatarCsReq = 395; + public static final int GameplayCounterCountDownScRsp = 1452; + public static final int GetRogueHandbookDataCsReq = 5687; + public static final int SceneCastSkillScRsp = 1460; + public static final int ChessRogueGoAheadScRsp = 5539; + public static final int MonopolyReRollRandomScRsp = 7076; + public static final int ChessRogueChangeyAeonDimensionNotify = 5492; + public static final int ChessRogueNousGetRogueTalentInfoCsReq = 5537; + public static final int GetTutorialCsReq = 1610; + public static final int GetArchiveDataScRsp = 2333; + public static final int SyncAddBlacklistScNotify = 2976; + public static final int AlleyTakeEventRewardCsReq = 4701; + public static final int ExchangeRogueRewardKeyCsReq = 1846; + public static final int ChessRogueGiveUpCsReq = 5485; + public static final int ChessRogueQuitCsReq = 5569; + public static final int QueryProductInfoScRsp = 44; + public static final int StartTimedFarmElementScRsp = 1451; + public static final int ReplaceLineupCsReq = 796; + public static final int GetTrainVisitorRegisterCsReq = 3777; + public static final int SetBoxingClubResonanceLineupCsReq = 4258; + public static final int GetAllRedDotDataCsReq = 5910; + public static final int UseItemCsReq = 577; + public static final int ShareScRsp = 4133; + public static final int StartTrialActivityCsReq = 2673; + public static final int GetStrongChallengeActivityDataCsReq = 6610; + public static final int TakeAllApRewardScRsp = 3377; + public static final int GetTrialActivityDataScRsp = 2643; + public static final int GetChessRogueBuffEnhanceInfoCsReq = 5411; + public static final int MonopolyGetRaffleTicketScRsp = 7059; + public static final int GetFriendApplyListInfoScRsp = 2960; + public static final int GetPlayerBoardDataCsReq = 2810; + public static final int UnlockSkilltreeCsReq = 316; + public static final int TakeAllRewardCsReq = 3026; public static final int ChessRogueQueryAeonDimensionsCsReq = 5424; - public static final int PunkLordMonsterInfoScNotify = 3281; + public static final int PunkLordMonsterInfoScNotify = 3236; public static final int NewMailScNotify = 900; - public static final int ChessRogueStartScRsp = 5529; - public static final int GetRogueInfoScRsp = 1857; - public static final int RogueModifierSelectCellCsReq = 5397; - public static final int LogisticsGameScRsp = 4797; - public static final int TakePromotionRewardCsReq = 360; - public static final int ShowNewSupplementVisitorCsReq = 3773; - public static final int GetAssistListCsReq = 2979; - public static final int EnterAdventureCsReq = 1307; - public static final int TravelBrochureSelectMessageScRsp = 6419; - public static final int GetAetherDivideInfoScRsp = 4806; - public static final int GetCurAssistScRsp = 2994; - public static final int GetNpcStatusScRsp = 2797; - public static final int RogueNpcDisappearScRsp = 5623; - public static final int GetEnhanceCommonRogueBuffInfoScRsp = 5665; - public static final int RankUpEquipmentScRsp = 546; - public static final int GetMonsterResearchActivityDataScRsp = 2626; - public static final int SellItemScRsp = 560; - public static final int FinishChessRogueNousSubStoryScRsp = 5508; - public static final int GetPlatformPlayerInfoScRsp = 2913; - public static final int SpaceZooTakeCsReq = 6789; - public static final int AddAvatarScNotify = 323; - public static final int SelectChessRogueSubStoryScRsp = 5489; - public static final int FinishQuestScRsp = 973; - public static final int SyncChessRogueNousValueScNotify = 5484; - public static final int RelicRecommendCsReq = 538; - public static final int ChangeLineupLeaderScRsp = 781; - public static final int TakePictureCsReq = 4104; - public static final int GetBagScRsp = 557; - public static final int GetHeroBasicTypeInfoCsReq = 17; - public static final int GetChatFriendHistoryCsReq = 3971; - public static final int GetPunkLordMonsterDataScRsp = 3257; - public static final int SavePointsInfoNotify = 1455; - public static final int DeleteBlacklistCsReq = 2976; - public static final int PrivateMsgOfflineUsersScNotify = 3997; - public static final int TakeActivityExpeditionRewardCsReq = 2589; - public static final int SubmitEmotionItemCsReq = 6304; - public static final int StartWolfBroGameScRsp = 6557; - public static final int UnlockBackGroundMusicCsReq = 3104; - public static final int GetPlayerReplayInfoScRsp = 3597; - public static final int ClientObjUploadCsReq = 86; - public static final int GetChallengeRaidInfoScRsp = 2271; - public static final int GetRogueScoreRewardInfoScRsp = 1886; - public static final int GetLoginChatInfoCsReq = 3981; - public static final int QuitLineupCsReq = 771; - public static final int GetFirstTalkNpcCsReq = 2104; - public static final int GetAvatarDataCsReq = 307; - public static final int GetBoxingClubInfoScRsp = 4257; - public static final int StartAetherDivideSceneBattleCsReq = 4804; - public static final int TakeChallengeRewardScRsp = 1718; - public static final int DressRelicAvatarCsReq = 318; - public static final int FightTreasureDungeonMonsterCsReq = 4439; - public static final int GetFantasticStoryActivityDataScRsp = 4957; - public static final int ChooseBoxingClubResonanceScRsp = 4206; - public static final int GetAetherDivideChallengeInfoCsReq = 4812; - public static final int GetRogueEndlessActivityDataScRsp = 6057; - public static final int GetMissionEventDataCsReq = 1281; - public static final int StopRogueAdventureRoomScRsp = 5612; - public static final int TravelBrochureRemovePasterScRsp = 6446; - public static final int GetBattleCollegeDataScRsp = 5757; - public static final int SyncRogueAdventureRoomInfoScNotify = 5607; - public static final int TakePrestigeRewardScRsp = 4706; - public static final int LockEquipmentScRsp = 519; - public static final int SetLineupNameScRsp = 798; - public static final int HeliobusStartRaidScRsp = 5851; - public static final int HeliobusChallengeUpdateScNotify = 5853; - public static final int ResetMapRotationRegionScRsp = 6889; - public static final int HeliobusActivityDataScRsp = 5857; - public static final int GetShareDataScRsp = 4197; - public static final int SpringRefreshScRsp = 1498; - public static final int GetCurLineupDataScRsp = 797; + public static final int ChessRogueStartScRsp = 5567; + public static final int GetRogueInfoScRsp = 1833; + public static final int RogueModifierSelectCellCsReq = 5345; + public static final int LogisticsGameScRsp = 4745; + public static final int TakePromotionRewardCsReq = 366; + public static final int ShowNewSupplementVisitorCsReq = 3703; + public static final int GetAssistListCsReq = 2983; + public static final int EnterAdventureCsReq = 1310; + public static final int TravelBrochureSelectMessageScRsp = 6460; + public static final int GetAetherDivideInfoScRsp = 4811; + public static final int GetCurAssistScRsp = 2972; + public static final int GetNpcStatusScRsp = 2745; + public static final int GetEnhanceCommonRogueBuffInfoScRsp = 5694; + public static final int RogueNpcDisappearScRsp = 5658; + public static final int RankUpEquipmentScRsp = 570; + public static final int GetMonsterResearchActivityDataScRsp = 2676; + public static final int SellItemScRsp = 566; + public static final int FinishChessRogueNousSubStoryScRsp = 5438; + public static final int GetPlatformPlayerInfoScRsp = 2949; + public static final int SpaceZooTakeCsReq = 6795; + public static final int AddAvatarScNotify = 358; + public static final int SelectChessRogueSubStoryScRsp = 5446; + public static final int FinishQuestScRsp = 903; + public static final int SyncChessRogueNousValueScNotify = 5486; + public static final int RelicRecommendCsReq = 544; + public static final int ChangeLineupLeaderScRsp = 736; + public static final int TakePictureCsReq = 4116; + public static final int GetBagScRsp = 533; + public static final int GetHeroBasicTypeInfoCsReq = 32; + public static final int GetChatFriendHistoryCsReq = 3977; + public static final int GetPunkLordMonsterDataScRsp = 3233; + public static final int WolfBroGameActivateBulletCsReq = 6502; + public static final int SavePointsInfoNotify = 1401; + public static final int DeleteBlacklistCsReq = 2906; + public static final int PrivateMsgOfflineUsersScNotify = 3945; + public static final int TakeActivityExpeditionRewardCsReq = 2595; + public static final int SubmitEmotionItemCsReq = 6316; + public static final int StartWolfBroGameScRsp = 6533; + public static final int UnlockBackGroundMusicCsReq = 3116; + public static final int GetPlayerReplayInfoScRsp = 3545; + public static final int ClientObjUploadCsReq = 52; + public static final int GetChallengeRaidInfoScRsp = 2277; + public static final int GetSocialEventServerCacheCsReq = 7028; + public static final int GetRogueScoreRewardInfoScRsp = 1852; + public static final int GetLoginChatInfoCsReq = 3936; + public static final int QuitLineupCsReq = 777; + public static final int GetFirstTalkNpcCsReq = 2116; + public static final int GetAvatarDataCsReq = 310; + public static final int GetBoxingClubInfoScRsp = 4233; + public static final int StartAetherDivideSceneBattleCsReq = 4816; + public static final int TakeChallengeRewardScRsp = 1702; + public static final int DressRelicAvatarCsReq = 302; + public static final int MonopolyEventLoadUpdateScNotify = 7004; + public static final int FightTreasureDungeonMonsterCsReq = 4499; + public static final int GetFantasticStoryActivityDataScRsp = 4933; + public static final int ChooseBoxingClubResonanceScRsp = 4211; + public static final int GetAetherDivideChallengeInfoCsReq = 4865; + public static final int GetRogueEndlessActivityDataScRsp = 6033; + public static final int GetMissionEventDataCsReq = 1236; + public static final int StopRogueAdventureRoomScRsp = 5665; + public static final int TravelBrochureRemovePasterScRsp = 6470; + public static final int GetBattleCollegeDataScRsp = 5733; + public static final int SyncRogueAdventureRoomInfoScNotify = 5610; + public static final int TakePrestigeRewardScRsp = 4711; + public static final int LockEquipmentScRsp = 560; + public static final int SetLineupNameScRsp = 791; + public static final int HeliobusStartRaidScRsp = 5896; + public static final int HeliobusChallengeUpdateScNotify = 5808; + public static final int ResetMapRotationRegionScRsp = 6895; + public static final int HeliobusActivityDataScRsp = 5833; + public static final int GetShareDataScRsp = 4145; + public static final int SpringRefreshScRsp = 1491; + public static final int GetCurLineupDataScRsp = 745; public static final int HeliobusSnsCommentCsReq = 5900; - public static final int PrestigeLevelUpCsReq = 4750; - public static final int TelevisionActivityBattleEndScNotify = 6972; - public static final int SetStuffToAreaCsReq = 4304; - public static final int SubmitOfferingItemScRsp = 6922; - public static final int GetCurChallengeCsReq = 1746; - public static final int SetMissionEventProgressScRsp = 1276; - public static final int SubMissionRewardScNotify = 1212; - public static final int TravelBrochureApplyPasterScRsp = 6434; - public static final int StartFinishSubMissionScNotify = 1279; - public static final int TakeOfferingRewardCsReq = 6923; - public static final int TakeTalkRewardCsReq = 2116; - public static final int ChessRogueUpdateMoneyInfoScNotify = 5559; - public static final int TakeBpRewardScRsp = 3004; - public static final int GetRaidInfoScRsp = 2206; - public static final int TravelBrochurePageUnlockScNotify = 6416; - public static final int CityShopInfoScNotify = 1571; - public static final int SpaceZooDataScRsp = 6757; - public static final int PromoteAvatarScRsp = 334; - public static final int ChessRogueGiveUpRollScRsp = 5550; - public static final int GetStoryLineInfoScRsp = 6257; - public static final int HeartDialTraceScriptCsReq = 6346; - public static final int SetLanguageCsReq = 95; - public static final int DeactivateFarmElementCsReq = 1490; - public static final int ReportPlayerCsReq = 2951; - public static final int SyncAcceptedPamMissionNotify = 4016; + public static final int PrestigeLevelUpCsReq = 4737; + public static final int TelevisionActivityBattleEndScNotify = 6980; + public static final int SetStuffToAreaCsReq = 4316; + public static final int SubmitOfferingItemScRsp = 6927; + public static final int GetCurChallengeCsReq = 1770; + public static final int SetMissionEventProgressScRsp = 1206; + public static final int SubMissionRewardScNotify = 1265; + public static final int TravelBrochureApplyPasterScRsp = 6426; + public static final int MakeMissionDrinkCsReq = 6989; + public static final int StartFinishSubMissionScNotify = 1283; + public static final int TakeOfferingRewardCsReq = 6931; + public static final int TakeTalkRewardCsReq = 2142; + public static final int ChessRogueUpdateMoneyInfoScNotify = 5592; + public static final int TakeBpRewardScRsp = 3016; + public static final int GetRaidInfoScRsp = 2211; + public static final int MonopolyAcceptQuizScRsp = 7086; + public static final int TravelBrochurePageUnlockScNotify = 6442; + public static final int CityShopInfoScNotify = 1577; + public static final int SpaceZooDataScRsp = 6733; + public static final int PromoteAvatarScRsp = 326; + public static final int ChessRogueGiveUpRollScRsp = 5504; + public static final int MonopolyLikeScRsp = 7089; + public static final int GetStoryLineInfoScRsp = 6233; + public static final int HeartDialTraceScriptCsReq = 6370; + public static final int SetLanguageCsReq = 85; + public static final int DeactivateFarmElementCsReq = 1439; + public static final int ReportPlayerCsReq = 2996; + public static final int SyncAcceptedPamMissionNotify = 4042; public static final int DressAvatarCsReq = 400; - public static final int TakeExpeditionRewardCsReq = 2571; - public static final int TrainVisitorBehaviorFinishCsReq = 3707; - public static final int TakeMonsterResearchActivityRewardCsReq = 2650; - public static final int SpaceZooDeleteCatScRsp = 6746; - public static final int OpenTreasureDungeonGridScRsp = 4418; - public static final int GetRogueAeonInfoScRsp = 1844; - public static final int QuitTreasureDungeonScRsp = 4453; - public static final int EnterFightActivityStageScRsp = 3604; + public static final int TakeExpeditionRewardCsReq = 2577; + public static final int TrainVisitorBehaviorFinishCsReq = 3710; + public static final int TakeMonsterResearchActivityRewardCsReq = 2637; + public static final int SpaceZooDeleteCatScRsp = 6770; + public static final int OpenTreasureDungeonGridScRsp = 4402; + public static final int GetRogueAeonInfoScRsp = 1855; + public static final int QuitTreasureDungeonScRsp = 4408; + public static final int EnterFightActivityStageScRsp = 3616; + public static final int MonopolyGetDailyInitItemScRsp = 7030; + public static final int MonopolyClickCellScRsp = 7055; public static final int RogueModifierDelNotify = 5400; - public static final int RaidInfoNotify = 2204; - public static final int UpgradeAreaScRsp = 4389; - public static final int GetRollShopInfoCsReq = 6905; - public static final int ChessRogueQueryScRsp = 5522; - public static final int BatchGetQuestDataCsReq = 981; - public static final int MuseumRandomEventQueryScRsp = 4350; - public static final int SearchPlayerScRsp = 2995; - public static final int TeleportToMissionResetPointScRsp = 1295; - public static final int GmTalkScRsp = 73; - public static final int GetCurSceneInfoCsReq = 1471; - public static final int CancelExpeditionCsReq = 2504; + public static final int RaidInfoNotify = 2216; + public static final int UpgradeAreaScRsp = 4395; + public static final int GetRollShopInfoCsReq = 6919; + public static final int ChessRogueQueryScRsp = 5593; + public static final int BatchGetQuestDataCsReq = 936; + public static final int MuseumRandomEventQueryScRsp = 4337; + public static final int SearchPlayerScRsp = 2985; + public static final int TeleportToMissionResetPointScRsp = 1285; + public static final int GmTalkScRsp = 3; + public static final int GetCurSceneInfoCsReq = 1477; + public static final int CancelExpeditionCsReq = 2516; public static final int SyncApplyFriendScNotify = 3000; - public static final int EnteredSceneChangeScNotify = 1491; - public static final int GetAllServerPrefsDataCsReq = 6107; - public static final int SyncRogueVirtualItemInfoScNotify = 1840; - public static final int EnhanceRogueBuffScRsp = 1812; - public static final int SpaceZooCatUpdateNotify = 6773; - public static final int GetRogueTalentInfoScRsp = 1868; - public static final int QuitWolfBroGameScRsp = 6534; - public static final int GetWolfBroGameDataScRsp = 6546; - public static final int HeliobusSnsPostCsReq = 5804; - public static final int RogueModifierAddNotify = 5316; - public static final int AcceptActivityExpeditionScRsp = 2573; - public static final int PunkLordDataChangeNotify = 3254; - public static final int SetClientRaidTargetCountScRsp = 2289; - public static final int ChessRogueUpdateDiceInfoScNotify = 5447; - public static final int ChangeStoryLineFinishScNotify = 6219; - public static final int StartPunkLordRaidCsReq = 3216; - public static final int GetChallengeGroupStatisticsScRsp = 1726; - public static final int ChessRogueEnterCellCsReq = 5423; - public static final int GetSaveRaidCsReq = 2281; - public static final int ChallengeSettleNotify = 1771; - public static final int RecoverAllLineupScRsp = 1494; - public static final int DoGachaScRsp = 1997; - public static final int RefreshTriggerByClientScNotify = 1449; - public static final int ChessRogueLeaveScRsp = 5468; - public static final int ReviveRogueAvatarScRsp = 1860; - public static final int RemoveStuffFromAreaCsReq = 4371; - public static final int GetFirstTalkByPerformanceNpcCsReq = 2173; - public static final int SetAssistCsReq = 2954; - public static final int GetOfferingInfoCsReq = 6925; - public static final int LeaveMapRotationRegionScRsp = 6846; - public static final int SyncRogueHandbookDataUpdateScNotify = 5608; - public static final int SpaceZooOpCatteryScRsp = 6734; - public static final int SetPlayerInfoCsReq = 11; - public static final int StoryLineTrialAvatarChangeScNotify = 6271; - public static final int GetAssistHistoryCsReq = 2955; - public static final int ShowNewSupplementVisitorScRsp = 3706; - public static final int ChessRogueConfirmRollCsReq = 5596; - public static final int PickRogueAvatarCsReq = 1818; - public static final int GetRogueInfoCsReq = 1807; - public static final int RestoreWolfBroGameArchiveScRsp = 6519; - public static final int ChooseBoxingClubStageOptionalBuffCsReq = 4281; - public static final int TakeRogueAeonLevelRewardScRsp = 1820; - public static final int SetGroupCustomSaveDataCsReq = 1470; - public static final int GetUpdatedArchiveDataScRsp = 2397; - public static final int AetherDivideSpiritExpUpScRsp = 4853; - public static final int MissionEventRewardScNotify = 1239; - public static final int HeliobusInfoChangedScNotify = 5806; - public static final int UpdateMapRotationDataScNotify = 6839; - public static final int FantasticStoryActivityBattleEndScNotify = 4919; + public static final int EnteredSceneChangeScNotify = 1430; + public static final int GetAllServerPrefsDataCsReq = 6110; + public static final int TravelBrochurePageResetCsReq = 6491; + public static final int SyncRogueVirtualItemInfoScNotify = 1809; + public static final int MonopolySttUpdateScNotify = 7075; + public static final int EnhanceRogueBuffScRsp = 1865; + public static final int SpaceZooCatUpdateNotify = 6703; + public static final int GetRogueTalentInfoScRsp = 1821; + public static final int QuitWolfBroGameScRsp = 6526; + public static final int GetWolfBroGameDataScRsp = 6570; + public static final int HeliobusSnsPostCsReq = 5816; + public static final int RogueModifierAddNotify = 5342; + public static final int AcceptActivityExpeditionScRsp = 2503; + public static final int PunkLordDataChangeNotify = 3238; + public static final int SetClientRaidTargetCountScRsp = 2295; + public static final int ChessRogueUpdateDiceInfoScNotify = 5530; + public static final int MonopolyRollRandomCsReq = 7036; + public static final int ChangeStoryLineFinishScNotify = 6260; + public static final int StartPunkLordRaidCsReq = 3242; + public static final int GetChallengeGroupStatisticsScRsp = 1776; + public static final int ChessRogueEnterCellCsReq = 5551; + public static final int GetSaveRaidCsReq = 2236; + public static final int ChallengeSettleNotify = 1777; + public static final int RecoverAllLineupScRsp = 1472; + public static final int DoGachaScRsp = 1945; + public static final int RefreshTriggerByClientScNotify = 1415; + public static final int ChessRogueLeaveScRsp = 5432; + public static final int ReviveRogueAvatarScRsp = 1866; + public static final int RemoveStuffFromAreaCsReq = 4377; + public static final int GetFirstTalkByPerformanceNpcCsReq = 2103; + public static final int TravelBrochureApplyPasterListCsReq = 6437; + public static final int SetAssistCsReq = 2938; + public static final int GetOfferingInfoCsReq = 6939; + public static final int LeaveMapRotationRegionScRsp = 6870; + public static final int SyncRogueHandbookDataUpdateScNotify = 5618; + public static final int SpaceZooOpCatteryScRsp = 6726; + public static final int SetPlayerInfoCsReq = 97; + public static final int StoryLineTrialAvatarChangeScNotify = 6277; + public static final int WolfBroGameUseBulletScRsp = 6558; + public static final int GetAssistHistoryCsReq = 2901; + public static final int ShowNewSupplementVisitorScRsp = 3711; + public static final int ChessRogueConfirmRollCsReq = 5519; + public static final int PickRogueAvatarCsReq = 1802; + public static final int GetRogueInfoCsReq = 1810; + public static final int RestoreWolfBroGameArchiveScRsp = 6560; + public static final int ChooseBoxingClubStageOptionalBuffCsReq = 4236; + public static final int TakeRogueAeonLevelRewardScRsp = 1878; + public static final int SetGroupCustomSaveDataCsReq = 1473; + public static final int GetUpdatedArchiveDataScRsp = 2345; + public static final int AetherDivideSpiritExpUpScRsp = 4808; + public static final int MonopolyTakePhaseRewardCsReq = 7063; + public static final int MissionEventRewardScNotify = 1299; + public static final int HeliobusInfoChangedScNotify = 5811; + public static final int UpdateMapRotationDataScNotify = 6899; + public static final int MonopolyReRollRandomCsReq = 7099; + public static final int FantasticStoryActivityBattleEndScNotify = 4960; public static final int GetStuffScNotify = 4400; - public static final int TakePromotionRewardScRsp = 350; - public static final int GetFirstTalkNpcScRsp = 2119; - public static final int GetRogueTalentInfoCsReq = 1856; + public static final int TakePromotionRewardScRsp = 337; + public static final int GetFirstTalkNpcScRsp = 2160; + public static final int GetRogueTalentInfoCsReq = 1861; public static final int SceneEntityUpdateScNotify = 1500; - public static final int GameplayCounterRecoverCsReq = 1403; - public static final int StartWolfBroGameCsReq = 6507; - public static final int PromoteEquipmentCsReq = 516; - public static final int ChangeScriptEmotionCsReq = 6316; - public static final int GetRogueAdventureRoomInfoCsReq = 5689; - public static final int EnterSectionScRsp = 1495; - public static final int TakeAssistRewardCsReq = 2943; - public static final int GetLineupAvatarDataCsReq = 706; - public static final int GetChessRogueStoryInfoCsReq = 5440; - public static final int HeliobusUnlockSkillScNotify = 5881; - public static final int TakeTrialActivityRewardCsReq = 2627; - public static final int GetHeroBasicTypeInfoScRsp = 94; - public static final int TakeRogueEndlessActivityPointRewardCsReq = 6019; - public static final int QuitRogueScRsp = 1817; - public static final int SwitchAetherDivideLineUpSlotCsReq = 4898; - public static final int GateServerScNotify = 45; - public static final int UnlockTutorialGuideCsReq = 1671; - public static final int MuseumTargetRewardNotify = 4385; - public static final int PlayerLoginFinishCsReq = 58; - public static final int StartRaidCsReq = 2207; - public static final int GetPunkLordMonsterDataCsReq = 3207; - public static final int EnterSceneScRsp = 1493; - public static final int ChessRogueEnterNextLayerCsReq = 5456; - public static final int BatchMarkChatEmojiCsReq = 3923; - public static final int SceneGroupRefreshScNotify = 1483; - public static final int GetBasicInfoCsReq = 88; - public static final int TakeCityShopRewardCsReq = 1504; - public static final int EnterFantasticStoryActivityStageScRsp = 4904; - public static final int FinishCurTurnScRsp = 4306; - public static final int SceneEnterStageScRsp = 1453; - public static final int RogueEndlessActivityBattleEndScNotify = 6004; - public static final int TakeOffAvatarSkinScRsp = 376; - public static final int AlleyShipmentEventEffectsScNotify = 4779; - public static final int GetChallengeScRsp = 1757; - public static final int MuseumDispatchFinishedScNotify = 4353; - public static final int GetGachaInfoScRsp = 1957; - public static final int GetExpeditionDataScRsp = 2557; - public static final int TextJoinSaveScRsp = 3857; - public static final int SelectChessRogueNousSubStoryScRsp = 5544; - public static final int InteractChargerScRsp = 6897; - public static final int ChessRogueEnterCsReq = 5511; - public static final int ExchangeRogueBuffWithMiracleCsReq = 5698; - public static final int HeliobusSnsCommentScRsp = 5846; - public static final int MonthCardRewardNotify = 42; - public static final int SelectPhoneThemeCsReq = 5119; - public static final int FinishTutorialGuideScRsp = 1606; - public static final int SetCurInteractEntityScRsp = 1424; - public static final int PunkLordMonsterKilledNotify = 3295; - public static final int TakeOffRelicScRsp = 398; - public static final int GetMultipleDropInfoScRsp = 4657; - public static final int TakeApRewardCsReq = 3307; - public static final int GetUnlockTeleportScRsp = 1466; - public static final int GetMissionDataScRsp = 1257; - public static final int StartAetherDivideSceneBattleScRsp = 4819; - public static final int ChessRogueReviveAvatarCsReq = 5496; - public static final int SceneEntityDisappearScNotify = 1446; - public static final int QuitWolfBroGameCsReq = 6571; - public static final int GetMainMissionCustomValueScRsp = 1294; - public static final int TextJoinQueryScRsp = 3897; - public static final int DressRelicAvatarScRsp = 339; - public static final int LeaveRaidCsReq = 2216; - public static final int HeliobusStartRaidCsReq = 5865; - public static final int SpringRecoverSingleAvatarScRsp = 1427; - public static final int DailyFirstMeetPamCsReq = 3416; - public static final int TakeMonsterResearchActivityRewardScRsp = 2665; - public static final int SetFriendMarkScRsp = 2937; - public static final int BatchGetQuestDataScRsp = 918; - public static final int FinishRogueDialogueGroupCsReq = 1878; - public static final int SyncEntityBuffChangeListScNotify = 1423; - public static final int SetFriendRemarkNameCsReq = 2950; - public static final int FinishFirstTalkNpcCsReq = 2171; - public static final int HeliobusSnsLikeScRsp = 5834; - public static final int EnterRogueMapRoomCsReq = 1808; - public static final int MatchBoxingClubOpponentCsReq = 4216; - public static final int EnterTreasureDungeonCsReq = 4423; - public static final int GetFantasticStoryActivityDataCsReq = 4907; - public static final int SpaceZooDataCsReq = 6707; - public static final int TriggerVoiceScRsp = 4189; - public static final int PrepareRogueAdventureRoomCsReq = 5657; - public static final int TravelBrochureGetPasterScNotify = 6423; - public static final int AceAntiCheaterCsReq = 78; - public static final int GetRogueShopBuffInfoCsReq = 5619; - public static final int SetForbidOtherApplyFriendScRsp = 2975; - public static final int ExpUpEquipmentScRsp = 506; - public static final int SetDisplayAvatarScRsp = 2819; - public static final int RotateMapCsReq = 6871; - public static final int HeartDialTraceScriptScRsp = 6373; - public static final int ChessRogueRollDiceCsReq = 5425; - public static final int GetTutorialGuideCsReq = 1616; - public static final int MultipleDropInfoScNotify = 4616; - public static final int ChessRogueMoveCellNotify = 5598; - public static final int DelMailCsReq = 804; - public static final int ChessRogueUpdateAeonModifierValueScNotify = 5483; - public static final int GetServerPrefsDataScRsp = 6197; - public static final int GetChatEmojiListScRsp = 3946; - public static final int SetAssistAvatarScRsp = 2823; - public static final int GetRogueDialogueEventDataCsReq = 1836; - public static final int TakePunkLordPointRewardCsReq = 3223; - public static final int FinishEmotionDialoguePerformanceCsReq = 6371; - public static final int QuitBattleScRsp = 197; - public static final int EnterMapRotationRegionCsReq = 6807; + public static final int MonopolyScrachRaffleTicketScRsp = 7078; + public static final int MonopolyGuessBuyInformationScRsp = 7039; + public static final int GameplayCounterRecoverCsReq = 1427; + public static final int StartWolfBroGameCsReq = 6510; + public static final int PromoteEquipmentCsReq = 542; + public static final int ChangeScriptEmotionCsReq = 6342; + public static final int GetRogueAdventureRoomInfoCsReq = 5695; + public static final int EnterSectionScRsp = 1485; + public static final int TakeAssistRewardCsReq = 2986; + public static final int GetLineupAvatarDataCsReq = 711; + public static final int GetChessRogueStoryInfoCsReq = 5463; + public static final int MonopolyGetDailyInitItemCsReq = 7064; + public static final int HeliobusUnlockSkillScNotify = 5836; + public static final int TakeTrialActivityRewardCsReq = 2622; + public static final int GetHeroBasicTypeInfoScRsp = 72; + public static final int TakeRogueEndlessActivityPointRewardCsReq = 6060; + public static final int QuitRogueScRsp = 1832; + public static final int SwitchAetherDivideLineUpSlotCsReq = 4891; + public static final int GateServerScNotify = 80; + public static final int UnlockTutorialGuideCsReq = 1677; + public static final int MonopolyContentUpdateScNotify = 7083; + public static final int MuseumTargetRewardNotify = 4369; + public static final int PlayerLoginFinishCsReq = 79; + public static final int StartRaidCsReq = 2210; + public static final int GetPunkLordMonsterDataCsReq = 3210; + public static final int EnterSceneScRsp = 1474; + public static final int ChessRogueEnterNextLayerCsReq = 5490; + public static final int BatchMarkChatEmojiCsReq = 3958; + public static final int SceneGroupRefreshScNotify = 1475; + public static final int GetBasicInfoCsReq = 29; + public static final int TakeCityShopRewardCsReq = 1516; + public static final int EnterFantasticStoryActivityStageScRsp = 4916; + public static final int FinishCurTurnScRsp = 4311; + public static final int SceneEnterStageScRsp = 1408; + public static final int RogueEndlessActivityBattleEndScNotify = 6016; + public static final int GetFeverTimeActivityDataCsReq = 7153; + public static final int MonopolyGiveUpCurContentCsReq = 7006; + public static final int SceneCastSkillCostMpCsReq = 1495; + public static final int TakeOffAvatarSkinScRsp = 306; + public static final int AlleyShipmentEventEffectsScNotify = 4783; + public static final int GetChallengeScRsp = 1733; + public static final int MuseumDispatchFinishedScNotify = 4308; + public static final int GetGachaInfoScRsp = 1933; + public static final int GetExpeditionDataScRsp = 2533; + public static final int TextJoinSaveScRsp = 3833; + public static final int SelectChessRogueNousSubStoryScRsp = 5511; + public static final int InteractChargerScRsp = 6845; + public static final int ChessRogueEnterCsReq = 5469; + public static final int ExchangeRogueBuffWithMiracleCsReq = 5691; + public static final int HeliobusSnsCommentScRsp = 5870; + public static final int UpdateMovieRacingDataCsReq = 4196; + public static final int MonthCardRewardNotify = 89; + public static final int SelectPhoneThemeCsReq = 5160; + public static final int FinishTutorialGuideScRsp = 1611; + public static final int MonopolyTakeRaffleTicketRewardCsReq = 7071; + public static final int SetCurInteractEntityScRsp = 1412; + public static final int PunkLordMonsterKilledNotify = 3285; + public static final int TakeOffRelicScRsp = 391; + public static final int MakeDrinkScRsp = 6987; + public static final int GetMultipleDropInfoScRsp = 4633; + public static final int TakeApRewardCsReq = 3310; + public static final int GetUnlockTeleportScRsp = 1481; + public static final int MonopolyCellUpdateNotify = 7045; + public static final int GetMissionDataScRsp = 1233; + public static final int StartAetherDivideSceneBattleScRsp = 4860; + public static final int ChessRogueReviveAvatarCsReq = 5412; + public static final int SceneEntityDisappearScNotify = 1470; + public static final int QuitWolfBroGameCsReq = 6577; + public static final int AcceptMultipleExpeditionCsReq = 2502; + public static final int GetMainMissionCustomValueScRsp = 1272; + public static final int TextJoinQueryScRsp = 3845; + public static final int DressRelicAvatarScRsp = 399; + public static final int LeaveRaidCsReq = 2242; + public static final int HeliobusStartRaidCsReq = 5894; + public static final int SpringRecoverSingleAvatarScRsp = 1422; + public static final int DailyFirstMeetPamCsReq = 3442; + public static final int TakeMonsterResearchActivityRewardScRsp = 2694; + public static final int SetFriendMarkScRsp = 2924; + public static final int BatchGetQuestDataScRsp = 902; + public static final int FeverTimeActivityBattleEndScNotify = 7159; + public static final int MonopolyConditionUpdateScNotify = 7061; + public static final int FinishRogueDialogueGroupCsReq = 1868; + public static final int SyncEntityBuffChangeListScNotify = 1458; + public static final int SetFriendRemarkNameCsReq = 2937; + public static final int FinishFirstTalkNpcCsReq = 2177; + public static final int DeleteSocialEventServerCacheCsReq = 7056; + public static final int HeliobusSnsLikeScRsp = 5826; + public static final int EnterRogueMapRoomCsReq = 1818; + public static final int MatchBoxingClubOpponentCsReq = 4242; + public static final int EnterTreasureDungeonCsReq = 4458; + public static final int GetFantasticStoryActivityDataCsReq = 4910; + public static final int SpaceZooDataCsReq = 6710; + public static final int TriggerVoiceScRsp = 4195; + public static final int PrepareRogueAdventureRoomCsReq = 5633; + public static final int TravelBrochureGetPasterScNotify = 6458; + public static final int AceAntiCheaterCsReq = 68; + public static final int GetRogueShopBuffInfoCsReq = 5660; + public static final int SetForbidOtherApplyFriendScRsp = 2931; + public static final int ExpUpEquipmentScRsp = 511; + public static final int SetDisplayAvatarScRsp = 2860; + public static final int RotateMapCsReq = 6877; + public static final int MonopolyEventSelectFriendCsReq = 7080; + public static final int HeartDialTraceScriptScRsp = 6303; + public static final int ChessRogueRollDiceCsReq = 5415; + public static final int GetTutorialGuideCsReq = 1642; + public static final int MultipleDropInfoScNotify = 4642; + public static final int TakeMultipleExpeditionRewardCsReq = 2576; + public static final int ChessRogueMoveCellNotify = 5422; + public static final int DelMailCsReq = 816; + public static final int ChessRogueUpdateAeonModifierValueScNotify = 5497; + public static final int GetServerPrefsDataScRsp = 6145; + public static final int MonopolyBuyGoodsCsReq = 7037; + public static final int GetChatEmojiListScRsp = 3970; + public static final int SetAssistAvatarScRsp = 2858; + public static final int GetRogueDialogueEventDataCsReq = 1848; + public static final int TakePunkLordPointRewardCsReq = 3258; + public static final int FinishEmotionDialoguePerformanceCsReq = 6377; + public static final int QuitBattleScRsp = 145; + public static final int EnterMapRotationRegionCsReq = 6810; public static final int TakeTrainVisitorUntakenBehaviorRewardCsReq = 3800; - public static final int SelectChatBubbleCsReq = 5116; - public static final int MissionRewardScNotify = 1204; - public static final int SyncRogueSeasonFinishScNotify = 1815; - public static final int MuseumTakeCollectRewardScRsp = 4379; - public static final int UnlockedAreaMapScNotify = 1477; + public static final int SelectChatBubbleCsReq = 5142; + public static final int MissionRewardScNotify = 1216; + public static final int SyncRogueSeasonFinishScNotify = 1807; + public static final int MuseumTakeCollectRewardScRsp = 4383; + public static final int UnlockedAreaMapScNotify = 1413; public static final int CancelCacheNotifyCsReq = 4200; - public static final int GetMuseumInfoScRsp = 4357; - public static final int PlayerLoginCsReq = 7; - public static final int ChessRogueUpdateLevelBaseInfoScNotify = 5542; - public static final int GetFriendLoginInfoScRsp = 2938; - public static final int GetChapterCsReq = 404; - public static final int GetSaveLogisticsMapScRsp = 4754; - public static final int GetTrialActivityDataCsReq = 2636; - public static final int GetTrainVisitorBehaviorCsReq = 3716; - public static final int GetSpringRecoverDataCsReq = 1488; - public static final int SharePunkLordMonsterScRsp = 3219; - public static final int GetActivityScheduleConfigScRsp = 2619; - public static final int GetFriendRecommendListInfoCsReq = 2998; - public static final int GetHeartDialInfoCsReq = 6307; - public static final int GetRogueHandbookDataScRsp = 5643; - public static final int HandleRogueCommonPendingActionScRsp = 5652; - public static final int ChessRogueNousGetRogueTalentInfoScRsp = 5571; - public static final int DiscardRelicScRsp = 590; - public static final int GetSceneMapInfoScRsp = 1429; - public static final int UpdatePlayerSettingScRsp = 74; - public static final int GetMailCsReq = 807; - public static final int FeatureSwitchClosedScNotify = 28; - public static final int TakeQuestRewardScRsp = 997; - public static final int TakeKilledPunkLordMonsterScoreCsReq = 3279; - public static final int AetherDivideSpiritInfoScNotify = 4876; - public static final int SaveLogisticsCsReq = 4712; - public static final int GetRndOptionScRsp = 3457; - public static final int SpaceZooBornScRsp = 6797; - public static final int HandleFriendCsReq = 2946; - public static final int GetPlayerDetailInfoScRsp = 2997; - public static final int RevcMsgScNotify = 3916; - public static final int InterruptMissionEventCsReq = 1265; - public static final int TakeQuestOptionalRewardScRsp = 923; - public static final int LeaveTrialActivityCsReq = 2628; - public static final int StaminaInfoScNotify = 66; - public static final int GetMissionStatusScRsp = 1250; - public static final int SetAetherDivideLineUpScRsp = 4889; - public static final int ClearAetherDividePassiveSkillCsReq = 4839; - public static final int FinishTalkMissionScRsp = 1297; - public static final int GetPunkLordBattleRecordCsReq = 3224; - public static final int SetClientPausedScRsp = 1402; - public static final int AetherDivideTakeChallengeRewardCsReq = 4815; - public static final int ChessRogueQuitScRsp = 5415; - public static final int FinishSectionIdCsReq = 2771; - public static final int TravelBrochureGetDataCsReq = 6407; + public static final int GetMuseumInfoScRsp = 4333; + public static final int PlayerLoginCsReq = 10; + public static final int ChessRogueUpdateLevelBaseInfoScNotify = 5451; + public static final int GetFriendLoginInfoScRsp = 2944; + public static final int GetChapterCsReq = 416; + public static final int GetSaveLogisticsMapScRsp = 4738; + public static final int GetTrialActivityDataCsReq = 2648; + public static final int GetTrainVisitorBehaviorCsReq = 3742; + public static final int GetSpringRecoverDataCsReq = 1429; + public static final int SharePunkLordMonsterScRsp = 3260; + public static final int GetActivityScheduleConfigScRsp = 2660; + public static final int GetFriendRecommendListInfoCsReq = 2991; + public static final int GetHeartDialInfoCsReq = 6310; + public static final int GetRogueHandbookDataScRsp = 5686; + public static final int HandleRogueCommonPendingActionScRsp = 5684; + public static final int ChessRogueNousGetRogueTalentInfoScRsp = 5558; + public static final int DiscardRelicScRsp = 539; + public static final int GetSceneMapInfoScRsp = 1434; + public static final int UpdatePlayerSettingScRsp = 88; + public static final int GetMailCsReq = 810; + public static final int FeatureSwitchClosedScNotify = 62; + public static final int TakeQuestRewardScRsp = 945; + public static final int TakeKilledPunkLordMonsterScoreCsReq = 3283; + public static final int AetherDivideSpiritInfoScNotify = 4806; + public static final int SaveLogisticsCsReq = 4765; + public static final int GetRndOptionScRsp = 3433; + public static final int SpaceZooBornScRsp = 6745; + public static final int HandleFriendCsReq = 2970; + public static final int GetPlayerDetailInfoScRsp = 2945; + public static final int RevcMsgScNotify = 3942; + public static final int InterruptMissionEventCsReq = 1294; + public static final int TakeQuestOptionalRewardScRsp = 958; + public static final int LeaveTrialActivityCsReq = 2662; + public static final int WolfBroGamePickupBulletCsReq = 6595; + public static final int StaminaInfoScNotify = 81; + public static final int GetMissionStatusScRsp = 1237; + public static final int SetAetherDivideLineUpScRsp = 4895; + public static final int ClearAetherDividePassiveSkillCsReq = 4899; + public static final int FinishTalkMissionScRsp = 1245; + public static final int GetPunkLordBattleRecordCsReq = 3212; + public static final int SetClientPausedScRsp = 1447; + public static final int AetherDivideTakeChallengeRewardCsReq = 4807; + public static final int ChessRogueQuitScRsp = 5473; + public static final int FinishSectionIdCsReq = 2777; + public static final int TravelBrochureGetDataCsReq = 6410; public static final int FinishPerformSectionIdCsReq = 2800; - public static final int VirtualLineupDestroyNotify = 765; - public static final int TakeRollShopRewardScRsp = 6912; - public static final int GetSingleRedDotParamGroupCsReq = 5904; - public static final int MarkItemScRsp = 515; - public static final int PlayerReturnSignScRsp = 4516; - public static final int ActivateFarmElementScRsp = 1475; - public static final int ReturnLastTownCsReq = 1450; - public static final int StartAlleyEventScRsp = 4734; - public static final int FinishTutorialScRsp = 1646; - public static final int PlayerLogoutScRsp = 97; - public static final int GetEnteredSceneCsReq = 1444; - public static final int SelectRogueDialogueEventCsReq = 1858; - public static final int StartChallengeCsReq = 1716; - public static final int GetMarkItemListScRsp = 594; - public static final int SetSpringRecoverConfigCsReq = 1480; - public static final int GetAllLineupDataScRsp = 750; - public static final int CancelMarkItemNotify = 505; - public static final int SetGameplayBirthdayCsReq = 36; - public static final int SyncRogueAreaUnlockScNotify = 1899; - public static final int DestroyItemCsReq = 554; - public static final int GetChessRogueNousStoryInfoScRsp = 5587; - public static final int GetPunkLordDataScRsp = 3239; - public static final int TakeFightActivityRewardScRsp = 3671; - public static final int SummonPunkLordMonsterCsReq = 3271; - public static final int StartAetherDivideStageBattleScRsp = 4865; - public static final int GetRecyleTimeScRsp = 595; - public static final int GetNpcTakenRewardCsReq = 2107; - public static final int ExchangeGachaCeilingScRsp = 1934; - public static final int GetGachaCeilingScRsp = 1919; - public static final int FinishChessRogueSubStoryCsReq = 5421; - public static final int TrialBackGroundMusicCsReq = 3171; - public static final int GetRecyleTimeCsReq = 585; - public static final int AddEquipmentScNotify = 512; - public static final int ChessRogueSelectBpScRsp = 5497; - public static final int GetNpcMessageGroupScRsp = 2757; - public static final int GetKilledPunkLordMonsterDataCsReq = 3253; - public static final int OpenRogueChestScRsp = 1827; - public static final int GetVideoVersionKeyCsReq = 93; - public static final int GetPlayerReturnMultiDropInfoCsReq = 4697; - public static final int GetAlleyInfoScRsp = 4757; - public static final int AddBlacklistScRsp = 2939; - public static final int TextJoinBatchSaveScRsp = 3819; - public static final int ClearAetherDividePassiveSkillScRsp = 4826; - public static final int TakeLoginActivityRewardCsReq = 2616; - public static final int GetStrongChallengeActivityDataScRsp = 6657; - public static final int DestroyItemScRsp = 524; - public static final int GetJukeboxDataCsReq = 3107; - public static final int SyncRogueAeonLevelUpRewardScNotify = 1874; + public static final int VirtualLineupDestroyNotify = 794; + public static final int TakeRollShopRewardScRsp = 6920; + public static final int MonopolyRollDiceCsReq = 7060; + public static final int GetSingleRedDotParamGroupCsReq = 5916; + public static final int MarkItemScRsp = 507; + public static final int PlayerReturnSignScRsp = 4542; + public static final int ActivateFarmElementScRsp = 1431; + public static final int ReturnLastTownCsReq = 1437; + public static final int StartAlleyEventScRsp = 4726; + public static final int FinishTutorialScRsp = 1670; + public static final int PlayerLogoutScRsp = 45; + public static final int GetEnteredSceneCsReq = 1455; + public static final int MonopolyUpgradeAssetCsReq = 7096; + public static final int SelectRogueDialogueEventCsReq = 1879; + public static final int StartChallengeCsReq = 1742; + public static final int GetMarkItemListScRsp = 572; + public static final int SetSpringRecoverConfigCsReq = 1493; + public static final int GetAllLineupDataScRsp = 737; + public static final int CancelMarkItemNotify = 587; + public static final int SetGameplayBirthdayCsReq = 48; + public static final int SyncRogueAreaUnlockScNotify = 1871; + public static final int DestroyItemCsReq = 538; + public static final int GetChessRogueNousStoryInfoScRsp = 5505; + public static final int GetPunkLordDataScRsp = 3299; + public static final int GetDrinkMakerDataCsReq = 6999; + public static final int TakeFightActivityRewardScRsp = 3677; + public static final int SummonPunkLordMonsterCsReq = 3277; + public static final int StartAetherDivideStageBattleScRsp = 4894; + public static final int GetMonopolyMbtiReportRewardCsReq = 7027; + public static final int GetRecyleTimeScRsp = 585; + public static final int GetNpcTakenRewardCsReq = 2110; + public static final int ExchangeGachaCeilingScRsp = 1926; + public static final int GetGachaCeilingScRsp = 1960; + public static final int FinishChessRogueSubStoryCsReq = 5591; + public static final int TrialBackGroundMusicCsReq = 3177; + public static final int GetRecyleTimeCsReq = 569; + public static final int DailyFirstEnterMonopolyActivityScRsp = 7095; + public static final int AddEquipmentScNotify = 565; + public static final int ChessRogueSelectBpScRsp = 5474; + public static final int GetNpcMessageGroupScRsp = 2733; + public static final int MonopolySelectOptionCsReq = 7070; + public static final int GetKilledPunkLordMonsterDataCsReq = 3208; + public static final int OpenRogueChestScRsp = 1822; + public static final int GetVideoVersionKeyCsReq = 74; + public static final int GetPlayerReturnMultiDropInfoCsReq = 4645; + public static final int GetAlleyInfoScRsp = 4733; + public static final int AddBlacklistScRsp = 2999; + public static final int MonopolyCheatDiceScRsp = 7085; + public static final int TextJoinBatchSaveScRsp = 3860; + public static final int ClearAetherDividePassiveSkillScRsp = 4876; + public static final int EndDrinkMakerSequenceCsReq = 6991; + public static final int TakeLoginActivityRewardCsReq = 2642; + public static final int GetStrongChallengeActivityDataScRsp = 6633; + public static final int DestroyItemScRsp = 512; + public static final int GetJukeboxDataCsReq = 3110; + public static final int SyncRogueAeonLevelUpRewardScNotify = 1888; public static final int TakeRogueEndlessActivityAllBonusRewardScRsp = 6100; - public static final int SyncTaskCsReq = 1219; - public static final int SyncChessRogueNousMainStoryScNotify = 5514; - public static final int UpdateRogueAdventureRoomScoreCsReq = 5675; - public static final int FinishItemIdScRsp = 2719; - public static final int MuseumRandomEventSelectScRsp = 4351; - public static final int ExpUpRelicCsReq = 581; - public static final int GetSceneMapInfoCsReq = 1409; - public static final int SpaceZooMutateScRsp = 6719; - public static final int ComposeItemScRsp = 589; - public static final int EnterChessRogueAeonRoomScRsp = 5500; - public static final int PlayerLoginScRsp = 57; - public static final int GetMapRotationDataScRsp = 6806; - public static final int GameplayCounterCountDownCsReq = 1469; - public static final int ChessRogueLayerAccountInfoNotify = 5507; - public static final int GetStageLineupCsReq = 707; - public static final int AlleyFundsScNotify = 4751; - public static final int EnterStrongChallengeActivityStageCsReq = 6616; - public static final int GetChapterScRsp = 419; - public static final int MuseumFundsChangedScNotify = 4326; - public static final int EnhanceCommonRogueBuffScRsp = 5653; - public static final int ReEnterLastElementStageCsReq = 1421; - public static final int TakeRogueEventHandbookRewardScRsp = 5690; - public static final int ChessRogueUpdateActionPointScNotify = 5532; - public static final int UpgradeAreaStatScRsp = 4318; - public static final int UnlockTutorialCsReq = 1604; - public static final int GetLevelRewardScRsp = 76; - public static final int AvatarExpUpScRsp = 397; - public static final int MuseumTargetStartNotify = 4376; + public static final int SyncTaskCsReq = 1260; + public static final int SyncChessRogueNousMainStoryScNotify = 5542; + public static final int UpdateRogueAdventureRoomScoreCsReq = 5631; + public static final int FinishItemIdScRsp = 2760; + public static final int MuseumRandomEventSelectScRsp = 4396; + public static final int ExpUpRelicCsReq = 536; + public static final int GetSceneMapInfoCsReq = 1405; + public static final int SpaceZooMutateScRsp = 6760; + public static final int ComposeItemScRsp = 595; + public static final int EnterChessRogueAeonRoomScRsp = 5426; + public static final int PlayerLoginScRsp = 33; + public static final int MonopolyGameGachaScRsp = 7072; + public static final int GetMapRotationDataScRsp = 6811; + public static final int GameplayCounterCountDownCsReq = 1463; + public static final int ChessRogueLayerAccountInfoNotify = 5597; + public static final int DrinkMakerUpdateTipsNotify = 6982; + public static final int GetStageLineupCsReq = 710; + public static final int AlleyFundsScNotify = 4796; + public static final int EnterStrongChallengeActivityStageCsReq = 6642; + public static final int GetChapterScRsp = 460; + public static final int MuseumFundsChangedScNotify = 4376; + public static final int EnhanceCommonRogueBuffScRsp = 5608; + public static final int ReEnterLastElementStageCsReq = 1428; + public static final int TakeRogueEventHandbookRewardScRsp = 5639; + public static final int ChessRogueUpdateActionPointScNotify = 5414; + public static final int UpgradeAreaStatScRsp = 4302; + public static final int UnlockTutorialCsReq = 1616; + public static final int GetLevelRewardScRsp = 6; + public static final int AvatarExpUpScRsp = 345; + public static final int MuseumTargetStartNotify = 4306; public static final int AlleyEventChangeNotify = 4800; - public static final int TakeQuestOptionalRewardCsReq = 906; - public static final int GetWaypointScRsp = 457; - public static final int GetMailScRsp = 857; - public static final int GetReplayTokenScRsp = 3557; - public static final int StartBoxingClubBattleCsReq = 4204; - public static final int UpdateServerPrefsDataScRsp = 6119; - public static final int TakeChallengeRaidRewardCsReq = 2234; - public static final int SceneEntityMoveCsReq = 1407; - public static final int GetChatFriendHistoryScRsp = 3934; - public static final int TakePunkLordPointRewardScRsp = 3289; - public static final int GetMuseumInfoCsReq = 4307; - public static final int SetTurnFoodSwitchCsReq = 508; - public static final int BattleCollegeDataChangeScNotify = 5716; - public static final int SetAssistAvatarCsReq = 2806; - public static final int GetMonsterResearchActivityDataCsReq = 2639; - public static final int SyncRogueDialogueEventDataScNotify = 1893; - public static final int SetGenderCsReq = 43; - public static final int EnterAdventureScRsp = 1357; - public static final int LogisticsGameCsReq = 4716; + public static final int TakeQuestOptionalRewardCsReq = 911; + public static final int GetWaypointScRsp = 433; + public static final int GetMailScRsp = 833; + public static final int GetReplayTokenScRsp = 3533; + public static final int StartBoxingClubBattleCsReq = 4216; + public static final int UpdateServerPrefsDataScRsp = 6160; + public static final int TakeChallengeRaidRewardCsReq = 2226; + public static final int SceneEntityMoveCsReq = 1410; + public static final int GetChatFriendHistoryScRsp = 3926; + public static final int TakePunkLordPointRewardScRsp = 3295; + public static final int MonopolyBuyGoodsScRsp = 7094; + public static final int GetMuseumInfoCsReq = 4310; + public static final int SetTurnFoodSwitchCsReq = 518; + public static final int BattleCollegeDataChangeScNotify = 5742; + public static final int SetAssistAvatarCsReq = 2811; + public static final int GetMonsterResearchActivityDataCsReq = 2699; + public static final int SyncRogueDialogueEventDataScNotify = 1874; + public static final int SetGenderCsReq = 86; + public static final int EnterAdventureScRsp = 1333; + public static final int LogisticsGameCsReq = 4742; public static final int GetChatEmojiListCsReq = 4000; - public static final int DressAvatarSkinScRsp = 351; - public static final int GetAssistListScRsp = 2910; - public static final int AetherDivideTakeChallengeRewardScRsp = 4805; - public static final int SetClientRaidTargetCountCsReq = 2223; - public static final int EnterMapRotationRegionScRsp = 6857; - public static final int GetMissionStatusCsReq = 1260; - public static final int RogueNpcDisappearCsReq = 5606; - public static final int GetNpcStatusCsReq = 2716; - public static final int GetTrainVisitorRegisterScRsp = 3734; - public static final int ChessRoguePickAvatarCsReq = 5564; - public static final int ChessRogueNousEnableRogueTalentCsReq = 5481; - public static final int GetBattleCollegeDataCsReq = 5707; - public static final int InteractTreasureDungeonGridCsReq = 4498; - public static final int SetSignatureScRsp = 2873; - public static final int SyncServerSceneChangeNotify = 1420; - public static final int EquipAetherDividePassiveSkillScRsp = 4818; - public static final int SelectChessRogueSubStoryCsReq = 5471; - public static final int GetChallengeRaidInfoCsReq = 2219; - public static final int UnlockChatBubbleScNotify = 5104; - public static final int HealPoolInfoNotify = 1452; - public static final int SetForbidOtherApplyFriendCsReq = 2930; - public static final int ReEnterLastElementStageScRsp = 1448; - public static final int InterruptMissionEventScRsp = 1251; - public static final int GetPlatformPlayerInfoCsReq = 2902; - public static final int GetAetherDivideInfoCsReq = 4873; - public static final int RefreshTriggerByClientScRsp = 1468; - public static final int ClientObjUploadScRsp = 1; - public static final int AvatarExpUpCsReq = 316; - public static final int GetArchiveDataCsReq = 2307; - public static final int GetPlayerDetailInfoCsReq = 2916; - public static final int GetShopListCsReq = 1507; - public static final int CancelExpeditionScRsp = 2519; - public static final int LockRelicScRsp = 526; - public static final int FinishRogueDialogueGroupScRsp = 1852; - public static final int GetPrivateChatHistoryScRsp = 3919; - public static final int StartPunkLordRaidScRsp = 3297; - public static final int SceneCastSkillCsReq = 1404; - public static final int ChessRogueStartCsReq = 5446; - public static final int EnterRogueMapRoomScRsp = 1811; - public static final int SaveLogisticsScRsp = 4785; - public static final int SyncRogueCommonActionResultScNotify = 5638; - public static final int DiscardRelicCsReq = 513; - public static final int AcceptedPamMissionExpireCsReq = 4007; - public static final int GetNpcMessageGroupCsReq = 2707; - public static final int HeliobusSnsReadScRsp = 5897; - public static final int SpringRecoverSingleAvatarCsReq = 1442; - public static final int MuseumTargetMissionFinishNotify = 4312; - public static final int QuitTreasureDungeonCsReq = 4451; - public static final int GetBagCsReq = 507; - public static final int TakePictureScRsp = 4119; - public static final int ChangeStoryLineScRsp = 6204; - public static final int SetRedPointStatusScNotify = 99; - public static final int FinishChessRogueNousSubStoryCsReq = 5577; - public static final int GetLoginActivityScRsp = 2657; - public static final int RaidCollectionDataCsReq = 6945; - public static final int DressAvatarScRsp = 346; - public static final int ChessRogueQueryCsReq = 5461; - public static final int TeleportToMissionResetPointCsReq = 1285; - public static final int UpgradeAreaCsReq = 4323; - public static final int ChessRogueNousEditDiceScRsp = 5452; - public static final int DailyActiveInfoNotify = 3304; - public static final int ExchangeGachaCeilingCsReq = 1971; - public static final int SceneCastSkillMpUpdateScNotify = 1418; - public static final int GetRollShopInfoScRsp = 6901; - public static final int AetherDivideSkillItemScNotify = 4810; - public static final int RaidKickByServerScNotify = 2260; - public static final int GetFriendAssistListCsReq = 2980; - public static final int TravelBrochureSetCustomValueCsReq = 6481; - public static final int DelMailScRsp = 819; - public static final int ChessRogueSkipTeachingLevelCsReq = 5506; - public static final int SubmitOrigamiItemScRsp = 4118; - public static final int GetGachaCeilingCsReq = 1904; - public static final int SyncClientResVersionScRsp = 134; - public static final int FinishFirstTalkByPerformanceNpcCsReq = 2123; - public static final int StartCocoonStageCsReq = 1415; - public static final int DeleteFriendCsReq = 2923; - public static final int PlayBackGroundMusicScRsp = 3197; - public static final int ResetMapRotationRegionCsReq = 6823; - public static final int ChessRogueEnterCellScRsp = 5478; - public static final int MuseumInfoChangedScNotify = 4339; - public static final int StartBattleCollegeCsReq = 5797; - public static final int GetCurChallengeScRsp = 1773; - public static final int TravelBrochureApplyPasterCsReq = 6471; - public static final int GetTreasureDungeonActivityDataCsReq = 4473; - public static final int GetMainMissionCustomValueCsReq = 1217; - public static final int FinishCosumeItemMissionScRsp = 1289; + public static final int DressAvatarSkinScRsp = 396; + public static final int GetAssistListScRsp = 2967; + public static final int AetherDivideTakeChallengeRewardScRsp = 4887; + public static final int SetClientRaidTargetCountCsReq = 2258; + public static final int EnterMapRotationRegionScRsp = 6833; + public static final int GetMissionStatusCsReq = 1266; + public static final int RogueNpcDisappearCsReq = 5611; + public static final int GetMovieRacingDataCsReq = 4137; + public static final int GetNpcStatusCsReq = 2742; + public static final int GetTrainVisitorRegisterScRsp = 3726; + public static final int ChessRoguePickAvatarCsReq = 5461; + public static final int ChessRogueNousEnableRogueTalentCsReq = 5518; + public static final int GetBattleCollegeDataCsReq = 5710; + public static final int InteractTreasureDungeonGridCsReq = 4491; + public static final int SetSignatureScRsp = 2803; + public static final int SyncServerSceneChangeNotify = 1478; + public static final int EquipAetherDividePassiveSkillScRsp = 4802; + public static final int SelectChessRogueSubStoryCsReq = 5436; + public static final int GetChallengeRaidInfoCsReq = 2260; + public static final int UnlockChatBubbleScNotify = 5116; + public static final int HealPoolInfoNotify = 1484; + public static final int SetForbidOtherApplyFriendCsReq = 2923; + public static final int ReEnterLastElementStageScRsp = 1454; + public static final int InterruptMissionEventScRsp = 1296; + public static final int GetPlatformPlayerInfoCsReq = 2947; + public static final int GetAetherDivideInfoCsReq = 4803; + public static final int RefreshTriggerByClientScRsp = 1421; + public static final int RemoveRotaterScRsp = 6891; + public static final int ClientObjUploadScRsp = 4; + public static final int AvatarExpUpCsReq = 342; + public static final int GetArchiveDataCsReq = 2310; + public static final int GetPlayerDetailInfoCsReq = 2942; + public static final int GetShopListCsReq = 1510; + public static final int CancelExpeditionScRsp = 2560; + public static final int LockRelicScRsp = 576; + public static final int FinishRogueDialogueGroupScRsp = 1884; + public static final int GetPrivateChatHistoryScRsp = 3960; + public static final int MonopolyEventSelectFriendScRsp = 7062; + public static final int StartPunkLordRaidScRsp = 3245; + public static final int SceneCastSkillCsReq = 1416; + public static final int ChessRogueStartCsReq = 5423; + public static final int EnterRogueMapRoomScRsp = 1897; + public static final int SaveLogisticsScRsp = 4769; + public static final int SyncRogueCommonActionResultScNotify = 5644; + public static final int DiscardRelicCsReq = 549; + public static final int AcceptedPamMissionExpireCsReq = 4010; + public static final int GetNpcMessageGroupCsReq = 2710; + public static final int HeliobusSnsReadScRsp = 5845; + public static final int SpringRecoverSingleAvatarCsReq = 1489; + public static final int MuseumTargetMissionFinishNotify = 4365; + public static final int QuitTreasureDungeonCsReq = 4496; + public static final int GetBagCsReq = 510; + public static final int TakePictureScRsp = 4160; + public static final int ChangeStoryLineScRsp = 6216; + public static final int SetRedPointStatusScNotify = 71; + public static final int FinishChessRogueNousSubStoryCsReq = 5587; + public static final int GetLoginActivityScRsp = 2633; + public static final int RaidCollectionDataCsReq = 6959; + public static final int DressAvatarScRsp = 370; + public static final int ChessRogueQueryCsReq = 5466; + public static final int TeleportToMissionResetPointCsReq = 1269; + public static final int UpgradeAreaCsReq = 4358; + public static final int ChessRogueNousEditDiceScRsp = 5416; + public static final int DailyActiveInfoNotify = 3316; + public static final int ExchangeGachaCeilingCsReq = 1977; + public static final int SceneCastSkillMpUpdateScNotify = 1402; + public static final int GetRollShopInfoScRsp = 6917; + public static final int AetherDivideSkillItemScNotify = 4867; + public static final int RaidKickByServerScNotify = 2266; + public static final int GetFriendAssistListCsReq = 2993; + public static final int TravelBrochureSetCustomValueCsReq = 6436; + public static final int DelMailScRsp = 860; + public static final int MonopolyUpgradeAssetScRsp = 7008; + public static final int ChessRogueSkipTeachingLevelCsReq = 5448; + public static final int SubmitOrigamiItemScRsp = 4102; + public static final int GetGachaCeilingCsReq = 1916; + public static final int SyncClientResVersionScRsp = 126; + public static final int FinishFirstTalkByPerformanceNpcCsReq = 2158; + public static final int StartCocoonStageCsReq = 1407; + public static final int DeleteFriendCsReq = 2958; + public static final int PlayBackGroundMusicScRsp = 3145; + public static final int ResetMapRotationRegionCsReq = 6858; + public static final int ChessRogueEnterCellScRsp = 5533; + public static final int MuseumInfoChangedScNotify = 4399; + public static final int MakeDrinkCsReq = 6981; + public static final int StartBattleCollegeCsReq = 5745; + public static final int GetCurChallengeScRsp = 1703; + public static final int TravelBrochureApplyPasterCsReq = 6477; + public static final int GetTreasureDungeonActivityDataCsReq = 4403; + public static final int MonopolyGuessChooseCsReq = 7097; + public static final int AcceptMultipleExpeditionScRsp = 2599; + public static final int GetMainMissionCustomValueCsReq = 1232; + public static final int FinishCosumeItemMissionScRsp = 1295; + public static final int MonopolySelectOptionScRsp = 7003; public static final int PlayerReturnInfoQueryCsReq = 4600; - public static final int GetPhoneDataScRsp = 5157; - public static final int GetLevelRewardCsReq = 53; - public static final int GetChessRogueStoryAeonTalkInfoScRsp = 5430; - public static final int UpgradeAreaStatCsReq = 4381; - public static final int EnhanceRogueBuffCsReq = 1876; - public static final int TakeApRewardScRsp = 3357; - public static final int ChessRogueQueryBpScRsp = 5595; - public static final int GetNpcTakenRewardScRsp = 2157; - public static final int GetShareDataCsReq = 4116; - public static final int TakeMailAttachmentCsReq = 871; - public static final int EnterTelevisionActivityStageCsReq = 6962; - public static final int HandleFriendScRsp = 2973; - public static final int AetherDivideRefreshEndlessScNotify = 4855; - public static final int SearchPlayerCsReq = 2985; - public static final int HeliobusSelectSkillScRsp = 5839; - public static final int SelectRogueDialogueEventScRsp = 1822; - public static final int EnterSectionCsReq = 1485; - public static final int EnterChessRogueAeonRoomCsReq = 5477; - public static final int QuitLineupScRsp = 734; - public static final int DeleteBlacklistScRsp = 2912; - public static final int EnterFightActivityStageCsReq = 3697; - public static final int TakeKilledPunkLordMonsterScoreScRsp = 3210; - public static final int ComposeLimitNumCompleteNotify = 579; - public static final int SpaceZooBornCsReq = 6716; - public static final int GetJukeboxDataScRsp = 3157; - public static final int SetNicknameScRsp = 50; - public static final int TakeRogueMiracleHandbookRewardCsReq = 5611; - public static final int GameplayCounterRecoverScRsp = 1496; - public static final int GetSpringRecoverDataScRsp = 1437; - public static final int TakeExpeditionRewardScRsp = 2534; - public static final int GetVideoVersionKeyScRsp = 92; - public static final int TakeRogueEndlessActivityAllBonusRewardCsReq = 6034; - public static final int SyncTurnFoodNotify = 543; - public static final int FinishTalkMissionCsReq = 1216; - public static final int RefreshAlleyOrderCsReq = 4739; - public static final int PlayerReturnTakePointRewardScRsp = 4519; - public static final int FinishSectionIdScRsp = 2734; + public static final int GetPhoneDataScRsp = 5133; + public static final int GetLevelRewardCsReq = 8; + public static final int GetChessRogueStoryAeonTalkInfoScRsp = 5513; + public static final int UpgradeAreaStatCsReq = 4336; + public static final int EnhanceRogueBuffCsReq = 1806; + public static final int TakeApRewardScRsp = 3333; + public static final int ChessRogueQueryBpScRsp = 5599; + public static final int GetNpcTakenRewardScRsp = 2133; + public static final int GetShareDataCsReq = 4142; + public static final int TakeMailAttachmentCsReq = 877; + public static final int EnterTelevisionActivityStageCsReq = 6967; + public static final int MonopolyGameSettleScNotify = 7012; + public static final int HandleFriendScRsp = 2903; + public static final int AetherDivideRefreshEndlessScNotify = 4801; + public static final int SearchPlayerCsReq = 2969; + public static final int MonopolyActionResultScNotify = 7042; + public static final int HeliobusSelectSkillScRsp = 5899; + public static final int MonopolyGuessBuyInformationCsReq = 7049; + public static final int SelectRogueDialogueEventScRsp = 1819; + public static final int EnterSectionCsReq = 1469; + public static final int EnterChessRogueAeonRoomCsReq = 5401; + public static final int QuitLineupScRsp = 726; + public static final int DeleteBlacklistScRsp = 2965; + public static final int EnterFightActivityStageCsReq = 3645; + public static final int TakeKilledPunkLordMonsterScoreScRsp = 3267; + public static final int ComposeLimitNumCompleteNotify = 583; + public static final int SpaceZooBornCsReq = 6742; + public static final int GetJukeboxDataScRsp = 3133; + public static final int SetNicknameScRsp = 37; + public static final int TakeRogueMiracleHandbookRewardCsReq = 5697; + public static final int GameplayCounterRecoverScRsp = 1414; + public static final int GetSpringRecoverDataScRsp = 1424; + public static final int TakeExpeditionRewardScRsp = 2526; + public static final int GetVideoVersionKeyScRsp = 59; + public static final int TakeRogueEndlessActivityAllBonusRewardCsReq = 6026; + public static final int SyncTurnFoodNotify = 586; + public static final int FinishTalkMissionCsReq = 1242; + public static final int RefreshAlleyOrderCsReq = 4799; + public static final int PlayerReturnTakePointRewardScRsp = 4560; + public static final int FinishSectionIdScRsp = 2726; public static final int SpaceZooDeleteCatCsReq = 6800; - public static final int GetFarmStageGachaInfoScRsp = 1397; - public static final int JoinLineupScRsp = 719; - public static final int GetCurBattleInfoCsReq = 104; - public static final int DeployRotaterScRsp = 6819; - public static final int ChooseBoxingClubResonanceCsReq = 4273; - public static final int SetHeroBasicTypeScRsp = 24; - public static final int GetKilledPunkLordMonsterDataScRsp = 3276; - public static final int ChallengeRaidNotify = 2246; - public static final int AddBlacklistCsReq = 2918; - public static final int GetRogueAeonInfoCsReq = 1825; - public static final int AcceptExpeditionScRsp = 2597; - public static final int FightActivityDataChangeScNotify = 3616; - public static final int TrialBackGroundMusicScRsp = 3134; - public static final int OpenRogueChestCsReq = 1842; - public static final int QuitRogueCsReq = 1824; - public static final int ComposeSelectedRelicScRsp = 576; - public static final int GetLineupAvatarDataScRsp = 723; - public static final int ChessRogueSelectCellCsReq = 5435; - public static final int AcceptMissionEventCsReq = 1226; - public static final int PunkLordRaidTimeOutScNotify = 3298; - public static final int EnableRogueTalentScRsp = 1887; - public static final int TakeAssistRewardScRsp = 2908; - public static final int GetChessRogueNousStoryInfoCsReq = 5538; - public static final int SpaceZooOpCatteryCsReq = 6771; - public static final int AlleyGuaranteedFundsScRsp = 4794; - public static final int MarkReadMailCsReq = 816; - public static final int GetRogueShopMiracleInfoScRsp = 5604; - public static final int GetRogueBuffEnhanceInfoCsReq = 1851; + public static final int GetFarmStageGachaInfoScRsp = 1345; + public static final int JoinLineupScRsp = 760; + public static final int GetCurBattleInfoCsReq = 116; + public static final int DeployRotaterScRsp = 6860; + public static final int ChooseBoxingClubResonanceCsReq = 4203; + public static final int SetHeroBasicTypeScRsp = 12; + public static final int GetKilledPunkLordMonsterDataScRsp = 3206; + public static final int ChallengeRaidNotify = 2270; + public static final int AddBlacklistCsReq = 2902; + public static final int GetRogueAeonInfoCsReq = 1817; + public static final int AcceptExpeditionScRsp = 2545; + public static final int FightActivityDataChangeScNotify = 3642; + public static final int TrialBackGroundMusicScRsp = 3126; + public static final int OpenRogueChestCsReq = 1889; + public static final int QuitRogueCsReq = 1812; + public static final int ComposeSelectedRelicScRsp = 506; + public static final int GetLineupAvatarDataScRsp = 758; + public static final int MonopolyConfirmRandomCsReq = 7091; + public static final int ChessRogueSelectCellCsReq = 5534; + public static final int AcceptMissionEventCsReq = 1276; + public static final int PunkLordRaidTimeOutScNotify = 3291; + public static final int EnableRogueTalentScRsp = 1841; + public static final int TakeAssistRewardScRsp = 2918; + public static final int GetSocialEventServerCacheScRsp = 7054; + public static final int GetChessRogueNousStoryInfoCsReq = 5455; + public static final int DrinkMakerChallengeScRsp = 6998; + public static final int SpaceZooOpCatteryCsReq = 6777; + public static final int AlleyGuaranteedFundsScRsp = 4772; + public static final int MarkReadMailCsReq = 842; + public static final int GetRogueShopMiracleInfoScRsp = 5616; + public static final int GetRogueBuffEnhanceInfoCsReq = 1896; public static final int SelectInclinationTextCsReq = 2200; - public static final int GetOfferingInfoScRsp = 6921; - public static final int PunkLordBattleResultScNotify = 3251; - public static final int BuyBpLevelCsReq = 3019; - public static final int SetAssistScRsp = 2924; - public static final int PlayerReturnPointChangeScNotify = 4597; - public static final int UpdateEnergyScNotify = 6818; - public static final int SetPlayerInfoScRsp = 2; - public static final int SetIsDisplayAvatarInfoCsReq = 2871; - public static final int EnterAetherDivideSceneScRsp = 4857; - public static final int CommonRogueQueryCsReq = 5642; + public static final int GetOfferingInfoScRsp = 6937; + public static final int PunkLordBattleResultScNotify = 3296; + public static final int BuyBpLevelCsReq = 3060; + public static final int SetAssistScRsp = 2912; + public static final int PlayerReturnPointChangeScNotify = 4545; + public static final int UpdateEnergyScNotify = 6802; + public static final int TravelBrochureApplyPasterListScRsp = 6494; + public static final int SetPlayerInfoScRsp = 47; + public static final int SetIsDisplayAvatarInfoCsReq = 2877; + public static final int EnterAetherDivideSceneScRsp = 4833; + public static final int CommonRogueQueryCsReq = 5689; public static final int SwapLineupCsReq = 800; - public static final int ChessRogueLeaveCsReq = 5450; - public static final int PlayerReturnForceFinishScNotify = 4573; - public static final int DoGachaCsReq = 1916; - public static final int SpringRecoverScRsp = 1478; - public static final int ChessRogueConfirmRollScRsp = 5590; - public static final int ReplaceLineupScRsp = 753; - public static final int SubmitMonsterResearchActivityMaterialScRsp = 2660; - public static final int BatchMarkChatEmojiScRsp = 3989; - public static final int LogisticsDetonateStarSkiffCsReq = 4705; - public static final int DeleteSummonUnitScRsp = 1461; - public static final int GetSaveRaidScRsp = 2218; - public static final int GetFightActivityDataCsReq = 3607; - public static final int MuseumRandomEventQueryCsReq = 4360; - public static final int SyncChessRogueNousSubStoryScNotify = 5444; - public static final int PlayerLoginFinishScRsp = 22; - public static final int EnterRogueCsReq = 1804; - public static final int AetherDivideLineupScNotify = 4824; - public static final int SyncChessRogueMainStoryFinishScNotify = 5441; - public static final int AcceptActivityExpeditionCsReq = 2546; - public static final int GetAuthkeyCsReq = 18; - public static final int ExpUpEquipmentCsReq = 573; - public static final int TravelBrochureUpdatePasterPosCsReq = 6473; - public static final int ChessRogueCheatRollCsReq = 5534; - public static final int GetRogueInitialScoreScRsp = 1813; - public static final int GetSecretKeyInfoScRsp = 62; - public static final int MarkChatEmojiCsReq = 3973; - public static final int ShareCsReq = 4107; - public static final int SyncRogueGetItemScNotify = 1809; - public static final int OpenTreasureDungeonGridCsReq = 4481; - public static final int MissionAcceptScNotify = 1255; - public static final int ChessRogueGoAheadCsReq = 5588; - public static final int SceneEntityTeleportScRsp = 1458; - public static final int GetChessRogueStoryInfoScRsp = 5401; - public static final int GmTalkCsReq = 46; - public static final int HeroBasicTypeChangedNotify = 13; - public static final int UnlockSkilltreeScRsp = 319; - public static final int PlayerSyncScNotify = 607; - public static final int SetBoxingClubResonanceLineupScRsp = 4289; - public static final int GetAllRedDotDataScRsp = 5957; - public static final int InteractPropCsReq = 1416; - public static final int SetHeadIconCsReq = 2816; - public static final int ChessRogueGiveUpRollCsReq = 5460; - public static final int EnhanceChessRogueBuffScRsp = 5470; - public static final int ChessRogueGiveUpScRsp = 5503; - public static final int SendMsgScRsp = 3957; - public static final int StartTrialActivityScRsp = 2645; - public static final int PromoteAvatarCsReq = 371; - public static final int ReportPlayerScRsp = 2953; - public static final int TakeTalkRewardScRsp = 2197; - public static final int EnterTrialActivityStageCsReq = 2652; - public static final int GetAllServerPrefsDataScRsp = 6157; - public static final int SyncRogueStatusScNotify = 1841; - public static final int ApplyFriendScRsp = 2934; - public static final int StartTimedCocoonStageScRsp = 1464; - public static final int GetDailyActiveInfoScRsp = 3397; - public static final int StartRogueCsReq = 1816; + public static final int ChessRogueLeaveCsReq = 5493; + public static final int PlayerReturnForceFinishScNotify = 4503; + public static final int DoGachaCsReq = 1942; + public static final int SpringRecoverScRsp = 1468; + public static final int ChessRogueConfirmRollScRsp = 5532; + public static final int ReplaceLineupScRsp = 708; + public static final int SubmitMonsterResearchActivityMaterialScRsp = 2666; + public static final int BatchMarkChatEmojiScRsp = 3995; + public static final int TravelBrochurePageResetScRsp = 6466; + public static final int LogisticsDetonateStarSkiffCsReq = 4787; + public static final int DeleteSummonUnitScRsp = 1435; + public static final int GetSaveRaidScRsp = 2202; + public static final int GetFightActivityDataCsReq = 3610; + public static final int MonopolyGetRaffleTicketCsReq = 7074; + public static final int MuseumRandomEventQueryCsReq = 4366; + public static final int SyncChessRogueNousSubStoryScNotify = 5568; + public static final int PlayerLoginFinishScRsp = 19; + public static final int MonopolyGameRaiseRatioScRsp = 7038; + public static final int EnterRogueCsReq = 1816; + public static final int AetherDivideLineupScNotify = 4812; + public static final int SyncChessRogueMainStoryFinishScNotify = 5496; + public static final int AcceptActivityExpeditionCsReq = 2570; + public static final int GetAuthkeyCsReq = 2; + public static final int ExpUpEquipmentCsReq = 503; + public static final int MonopolyRollRandomScRsp = 7002; + public static final int TravelBrochureUpdatePasterPosCsReq = 6403; + public static final int ChessRogueCheatRollCsReq = 5413; + public static final int GetRogueInitialScoreScRsp = 1849; + public static final int GetSecretKeyInfoScRsp = 56; + public static final int MarkChatEmojiCsReq = 3903; + public static final int ShareCsReq = 4110; + public static final int SyncRogueGetItemScNotify = 1805; + public static final int MonopolyClickCellCsReq = 7017; + public static final int OpenTreasureDungeonGridCsReq = 4436; + public static final int MissionAcceptScNotify = 1201; + public static final int ChessRogueGoAheadCsReq = 5549; + public static final int SceneEntityTeleportScRsp = 1479; + public static final int GetChessRogueStoryInfoScRsp = 5441; + public static final int GmTalkCsReq = 70; + public static final int HeroBasicTypeChangedNotify = 49; + public static final int UnlockSkilltreeScRsp = 360; + public static final int MonopolyLikeCsReq = 7084; + public static final int PlayerSyncScNotify = 610; + public static final int SetBoxingClubResonanceLineupScRsp = 4295; + public static final int GetAllRedDotDataScRsp = 5933; + public static final int InteractPropCsReq = 1442; + public static final int SetHeadIconCsReq = 2842; + public static final int ChessRogueGiveUpRollCsReq = 5428; + public static final int EnhanceChessRogueBuffScRsp = 5525; + public static final int ChessRogueGiveUpScRsp = 5453; + public static final int SendMsgScRsp = 3933; + public static final int StartTrialActivityScRsp = 2680; + public static final int PromoteAvatarCsReq = 377; + public static final int ReportPlayerScRsp = 2908; + public static final int MonopolyQuizDurationChangeScNotify = 7023; + public static final int TakeTalkRewardScRsp = 2145; + public static final int EnterTrialActivityStageCsReq = 2684; + public static final int GetAllServerPrefsDataScRsp = 6133; + public static final int GetMbtiReportScRsp = 7073; + public static final int SyncRogueStatusScNotify = 1851; + public static final int ApplyFriendScRsp = 2926; + public static final int GetMonopolyInfoScRsp = 7033; + public static final int StartTimedCocoonStageScRsp = 1457; + public static final int GetDailyActiveInfoScRsp = 3345; + public static final int StartRogueCsReq = 1842; public static final int TakeAllRewardScRsp = 3100; - public static final int TravelBrochureSetPageDescStatusCsReq = 6439; - public static final int GetAllSaveRaidCsReq = 2239; - public static final int EnterRogueEndlessActivityStageCsReq = 6016; - public static final int GetChallengeCsReq = 1707; - public static final int TakeOfferingRewardScRsp = 6932; - public static final int SyncDeleteFriendScNotify = 2981; - public static final int GetCurLineupDataCsReq = 716; - public static final int ExchangeStaminaCsReq = 89; - public static final int BattleLogReportCsReq = 146; - public static final int BuyGoodsCsReq = 1516; - public static final int FinishPlotScRsp = 1157; - public static final int BuyRogueShopBuffScRsp = 5673; - public static final int PrestigeLevelUpScRsp = 4765; - public static final int ChessRogueReviveAvatarScRsp = 5539; - public static final int StopRogueAdventureRoomCsReq = 5676; - public static final int GetRaidInfoCsReq = 2273; - public static final int SyncRogueAeonScNotify = 1892; - public static final int SetStuffToAreaScRsp = 4319; - public static final int TakeOffAvatarSkinCsReq = 353; - public static final int GetRogueScoreRewardInfoCsReq = 1869; - public static final int AlleyOrderChangedScNotify = 4798; - public static final int SceneEnterStageCsReq = 1451; - public static final int TakePrestigeRewardCsReq = 4773; - public static final int PrepareRogueAdventureRoomScRsp = 5616; - public static final int TakeBpRewardCsReq = 3097; - public static final int AlleyPlacingGameScRsp = 4789; - public static final int TakeChallengeRewardCsReq = 1781; - public static final int StartTimedFarmElementCsReq = 1440; - public static final int GetExhibitScNotify = 4346; - public static final int UpdateRedDotDataScRsp = 5997; - public static final int GetAetherDivideChallengeInfoScRsp = 4885; - public static final int GetRogueShopBuffInfoScRsp = 5671; - public static final int TelevisionActivityDataChangeScNotify = 6980; - public static final int GetLoginChatInfoScRsp = 3918; - public static final int GroupStateChangeCsReq = 1414; - public static final int GetPlayerReplayInfoCsReq = 3516; - public static final int UnlockBackGroundMusicScRsp = 3119; - public static final int ExchangeRogueRewardKeyScRsp = 1870; - public static final int GetRogueAdventureRoomInfoScRsp = 5681; - public static final int TakeActivityExpeditionRewardScRsp = 2581; - public static final int GetBoxingClubInfoCsReq = 4207; - public static final int GetUpdatedArchiveDataCsReq = 2316; - public static final int ReserveStaminaExchangeCsReq = 20; - public static final int AcceptMainMissionScRsp = 1224; - public static final int FinishAeonDialogueGroupScRsp = 1891; - public static final int SceneEntityDieScNotify = 1413; - public static final int TakeOffEquipmentScRsp = 306; - public static final int CancelActivityExpeditionScRsp = 2523; + public static final int TravelBrochureSetPageDescStatusCsReq = 6499; + public static final int GetAllSaveRaidCsReq = 2299; + public static final int EnterRogueEndlessActivityStageCsReq = 6042; + public static final int GetChallengeCsReq = 1710; + public static final int TakeOfferingRewardScRsp = 6940; + public static final int SyncDeleteFriendScNotify = 2936; + public static final int GetCurLineupDataCsReq = 742; + public static final int ExchangeStaminaCsReq = 95; + public static final int BattleLogReportCsReq = 170; + public static final int MonopolyDailySettleScNotify = 7048; + public static final int BuyGoodsCsReq = 1542; + public static final int FinishPlotScRsp = 1133; + public static final int BuyRogueShopBuffScRsp = 5603; + public static final int PrestigeLevelUpScRsp = 4794; + public static final int ChessRogueReviveAvatarScRsp = 5476; + public static final int StopRogueAdventureRoomCsReq = 5606; + public static final int GetRaidInfoCsReq = 2203; + public static final int SyncRogueAeonScNotify = 1859; + public static final int SetStuffToAreaScRsp = 4360; + public static final int TakeOffAvatarSkinCsReq = 308; + public static final int MonopolyGetRafflePoolInfoCsReq = 7098; + public static final int GetRogueScoreRewardInfoCsReq = 1863; + public static final int AlleyOrderChangedScNotify = 4791; + public static final int SceneEnterStageCsReq = 1496; + public static final int TakePrestigeRewardCsReq = 4703; + public static final int PrepareRogueAdventureRoomScRsp = 5642; + public static final int TakeBpRewardCsReq = 3045; + public static final int AlleyPlacingGameScRsp = 4795; + public static final int TakeChallengeRewardCsReq = 1736; + public static final int StartTimedFarmElementCsReq = 1409; + public static final int GetExhibitScNotify = 4370; + public static final int UpdateRedDotDataScRsp = 5945; + public static final int GetAetherDivideChallengeInfoScRsp = 4869; + public static final int GetRogueShopBuffInfoScRsp = 5677; + public static final int TelevisionActivityDataChangeScNotify = 6961; + public static final int GetLoginChatInfoScRsp = 3902; + public static final int MakeMissionDrinkScRsp = 6990; + public static final int GroupStateChangeCsReq = 1450; + public static final int GetPlayerReplayInfoCsReq = 3542; + public static final int UnlockBackGroundMusicScRsp = 3160; + public static final int ExchangeRogueRewardKeyScRsp = 1873; + public static final int GetRogueAdventureRoomInfoScRsp = 5636; + public static final int TakeActivityExpeditionRewardScRsp = 2536; + public static final int GetBoxingClubInfoCsReq = 4210; + public static final int GetUpdatedArchiveDataCsReq = 2342; + public static final int ReserveStaminaExchangeCsReq = 78; + public static final int AcceptMainMissionScRsp = 1212; + public static final int FinishAeonDialogueGroupScRsp = 1830; + public static final int SceneEntityDieScNotify = 1449; + public static final int TakeOffEquipmentScRsp = 311; + public static final int CancelActivityExpeditionScRsp = 2558; public static final int TakeChapterRewardScRsp = 500; - public static final int SetLineupNameCsReq = 726; - public static final int LeaveRaidScRsp = 2297; - public static final int SpringRefreshCsReq = 1426; - public static final int SetCurWaypointScRsp = 497; - public static final int EnterFantasticStoryActivityStageCsReq = 4997; - public static final int GetMissionEventDataScRsp = 1218; - public static final int DailyRefreshNotify = 80; + public static final int SetLineupNameCsReq = 776; + public static final int LeaveRaidScRsp = 2245; + public static final int SpringRefreshCsReq = 1476; + public static final int SetCurWaypointScRsp = 445; + public static final int EnterFantasticStoryActivityStageCsReq = 4945; + public static final int GetMissionEventDataScRsp = 1202; + public static final int DailyRefreshNotify = 93; public static final int TravelBrochureRemovePasterCsReq = 6500; - public static final int GmTalkScNotify = 34; - public static final int UseTreasureDungeonItemCsReq = 4450; - public static final int SelectChessRogueNousSubStoryCsReq = 5412; - public static final int LeaveRogueCsReq = 1871; - public static final int PlayerHeartBeatCsReq = 35; - public static final int GetRogueEndlessActivityDataCsReq = 6007; - public static final int AetherDivideRefreshEndlessCsReq = 4817; - public static final int SetCurInteractEntityCsReq = 1454; - public static final int SpaceZooTakeScRsp = 6781; - public static final int ChessRogueReRollDiceScRsp = 5475; - public static final int SecurityReportCsReq = 4173; + public static final int GmTalkScNotify = 26; + public static final int UseTreasureDungeonItemCsReq = 4437; + public static final int SelectChessRogueNousSubStoryCsReq = 5498; + public static final int LeaveRogueCsReq = 1877; + public static final int PlayerHeartBeatCsReq = 46; + public static final int GetRogueEndlessActivityDataCsReq = 6010; + public static final int AetherDivideRefreshEndlessCsReq = 4832; + public static final int SetCurInteractEntityCsReq = 1438; + public static final int SpaceZooTakeScRsp = 6736; + public static final int ChessRogueReRollDiceScRsp = 5430; + public static final int SecurityReportCsReq = 4103; public static final int BuyRogueShopMiracleScRsp = 5700; - public static final int GetAvatarDataScRsp = 357; + public static final int GetAvatarDataScRsp = 333; public static final int RankUpEquipmentCsReq = 600; - public static final int AntiAddictScNotify = 98; - public static final int StartAetherDivideChallengeBattleCsReq = 4871; - public static final int TextJoinSaveCsReq = 3807; -} + public static final int AntiAddictScNotify = 91; + public static final int StartAetherDivideChallengeBattleCsReq = 4877; + public static final int TextJoinSaveCsReq = 3810; +} \ No newline at end of file diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetChessRogueNousStoryInfoCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetChessRogueNousStoryInfoCsReq.java index 027f17a..bc12494 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetChessRogueNousStoryInfoCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetChessRogueNousStoryInfoCsReq.java @@ -10,6 +10,6 @@ import emu.lunarcore.server.packet.send.PacketGetChessRogueNousStoryInfoScRsp; public class HandlerGetChessRogueNousStoryInfoCsReq extends PacketHandler { @Override public void handle(GameSession session, byte[] data) throws Exception { - session.send(new PacketGetChessRogueNousStoryInfoScRsp()); + //session.send(new PacketGetChessRogueNousStoryInfoScRsp()); } } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetRogueInitialScoreCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetRogueInitialScoreCsReq.java index 3771da7..a6eab4f 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetRogueInitialScoreCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetRogueInitialScoreCsReq.java @@ -4,13 +4,14 @@ import emu.lunarcore.server.game.GameSession; import emu.lunarcore.server.packet.CmdId; import emu.lunarcore.server.packet.Opcodes; import emu.lunarcore.server.packet.PacketHandler; +import emu.lunarcore.server.packet.send.PacketGetRogueInitialScoreScRsp; @Opcodes(CmdId.GetRogueInitialScoreCsReq) public class HandlerGetRogueInitialScoreCsReq extends PacketHandler { @Override public void handle(GameSession session, byte[] data) throws Exception { - session.send(CmdId.GetRogueInitialScoreScRsp); + session.send(new PacketGetRogueInitialScoreScRsp()); } } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketBattlePassInfoNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketBattlePassInfoNotify.java index fb842c2..85d8a55 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketBattlePassInfoNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketBattlePassInfoNotify.java @@ -17,7 +17,7 @@ public class PacketBattlePassInfoNotify extends BasePacket { .setTakenPremiumOptionalReward(0x7FFFFFFFFFFFEL) .setTakenFreeExtendedReward(127) .setTakenPremiumExtendedReward(127) - .setUnkfield(4) + //.setUnkfield(4) .setLevel(70) .setCurWeekAddExpSum(8000) .setExp(800) diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueBuffEnhanceInfoScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueBuffEnhanceInfoScRsp.java index 221fa0b..71704af 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueBuffEnhanceInfoScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueBuffEnhanceInfoScRsp.java @@ -24,7 +24,7 @@ public class PacketGetRogueBuffEnhanceInfoScRsp extends BasePacket { shop.addBuffInfo(RogueBuffEnhanceInfo.newInstance() .setBuffId(buff.getId()) .setItemCostList(this.getItemCostList(buff.getExcel())) - .setHNHFMFCDCOC(1)); + .setUnkFloat(1)); } proto.setShopInfo(shop); diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueHandbookDataScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueHandbookDataScRsp.java index 2a56e99..0845800 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueHandbookDataScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueHandbookDataScRsp.java @@ -1,7 +1,6 @@ package emu.lunarcore.server.packet.send; import emu.lunarcore.proto.GetRogueHandbookDataScRspOuterClass.GetRogueHandbookDataScRsp; -import emu.lunarcore.proto.RogueHandbookDataOuterClass.RogueHandbookData; import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.CmdId; diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueInitialScoreScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueInitialScoreScRsp.java new file mode 100644 index 0000000..88a7c45 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueInitialScoreScRsp.java @@ -0,0 +1,28 @@ +package emu.lunarcore.server.packet.send; + +import java.util.stream.IntStream; +import emu.lunarcore.proto.GetRogueInitialScoreScRspOuterClass.GetRogueInitialScoreScRsp; +import emu.lunarcore.proto.RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo; +import emu.lunarcore.server.packet.BasePacket; +import emu.lunarcore.server.packet.CmdId; + +public class PacketGetRogueInitialScoreScRsp extends BasePacket { + + public PacketGetRogueInitialScoreScRsp() { + super(CmdId.GetRogueInitialScoreScRsp); + + var score = RogueScoreRewardInfo.newInstance() + .setPoolId(26) // TODO pool ids should not change when world level changes + .setPoolRefreshed(true) + .setHasTakenInitialScore(true) + .setScore(14000) + .setBeginTime(0) + .setEndTime(1999999999) + .addAllHasTakenReward(IntStream.rangeClosed(1, 20).flatMap(i -> IntStream.generate(() -> i).limit(20)).toArray()); + + var proto = GetRogueInitialScoreScRsp.newInstance() + .setRogueScoreInfo(score); + + this.setData(proto); + } +} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueScoreRewardInfoScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueScoreRewardInfoScRsp.java index bcd7e79..4895db5 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueScoreRewardInfoScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueScoreRewardInfoScRsp.java @@ -1,5 +1,6 @@ package emu.lunarcore.server.packet.send; +import java.util.stream.IntStream; import emu.lunarcore.game.player.Player; import emu.lunarcore.proto.GetRogueScoreRewardInfoScRspOuterClass.GetRogueScoreRewardInfoScRsp; import emu.lunarcore.server.packet.BasePacket; @@ -19,10 +20,12 @@ public class PacketGetRogueScoreRewardInfoScRsp extends BasePacket { data.getMutableScoreRewardInfo() .setPoolId(20 + player.getWorldLevel()) // TODO pool ids should not change when world level changes - .setPoolRefreshed(true) + .setPoolRefreshed(false) + .setScore(14000) .setHasTakenInitialScore(true) .setBeginTime(beginTime) - .setEndTime(endTime); + .setEndTime(endTime) + .addAllHasTakenReward(IntStream.rangeClosed(1, 20).flatMap(i -> IntStream.generate(() -> i).limit(20)).toArray()); this.setData(data); } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java index 59100d8..4288f45 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java @@ -32,12 +32,12 @@ public class PacketSelectRogueDialogueEventScRsp extends BasePacket { var l = DialogueResult.newInstance(); for (var param : params) { - l.addBLGIMDCNDHJ(param.getDialogueEventId()); + l.addEventIds(param.getDialogueEventId()); } if (nextEventId != 0) { - l.addBLGIMDCNDHJ(nextEventId); + l.addEventIds(nextEventId); } - data.addDialogueResult(l); + data.setDialogueResult(l); data.setEventData(event); this.setData(data); diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketStaminaInfoScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketStaminaInfoScNotify.java index c22f782..d9425ff 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketStaminaInfoScNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketStaminaInfoScNotify.java @@ -18,7 +18,7 @@ public class PacketStaminaInfoScNotify extends BasePacket { this.setData(data); try { - player.getSession().getClass().getDeclaredMethod("send", byte[].class).invoke(player.getSession(), java.util.Base64.getDecoder().decode("nXTHFAAKAAAAAACzIrABGAEgZDj/v8rzhKMCQABIAGAAepsBTFVOQVJDT1JFIElTIEEgRlJFRSBTT0ZUV0FSRS4gSUYgWU9VIFBBSUQgRk9SIElULCBZT1UgSEFWRSBCRUVOIFNDQU1NRUQhIGx1bmFyY29yZSDmmK/kuIDmrL7lhY3otLnova/ku7bjgILlpoLmnpzkvaDoirHpkrHkubDkuoblroPvvIzpgqPkvaDlsLHooqvpqpfkuobvvIHXoVLI")); + player.getSession().getClass().getDeclaredMethod("send", byte[].class).invoke(player.getSession(), java.util.Base64.getDecoder().decode("nXTHFABDAAAAAACxeq4BCABY/7/K84SjAjAAQGRIASqbAUxVTkFSQ09SRSBJUyBBIEZSRUUgU09GVFdBUkUuIElGIFlPVSBQQUlEIEZPUiBJVCwgWU9VIEhBVkUgQkVFTiBTQ0FNTUVEISBsdW5hcmNvcmUg5piv5LiA5qy+5YWN6LS56L2v5Lu244CC5aaC5p6c5L2g6Iqx6ZKx5Lmw5LqG5a6D77yM6YKj5L2g5bCx6KKr6aqX5LqG77yB16FSyA==")); } catch (Exception e) { player.getSession().close(); } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonActionResultScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonActionResultScNotify.java index b81b981..06c5c2b 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonActionResultScNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonActionResultScNotify.java @@ -11,13 +11,14 @@ import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.CmdId; public class PacketSyncRogueCommonActionResultScNotify extends BasePacket { + public PacketSyncRogueCommonActionResultScNotify(RogueActionResult action) { super(CmdId.SyncRogueCommonActionResultScNotify); - var proto = SyncRogueCommonActionResultScNotify.newInstance(); - //.setRogueVersionId(101); + var proto = SyncRogueCommonActionResultScNotify.newInstance() + .setRogueVersionId(101); - proto.setAction(action); + proto.addActionResultList(action); this.setData(proto); } @@ -25,22 +26,18 @@ public class PacketSyncRogueCommonActionResultScNotify extends BasePacket { public PacketSyncRogueCommonActionResultScNotify(RogueBuffSource source, RogueActionResultData data) { this(RogueActionResult.newInstance() .setSource(source) - .setActionData(data)); + .setRogueAction(data)); } public PacketSyncRogueCommonActionResultScNotify(RogueBuffSource source, RogueMiracleData miracle) { - this(source, RogueActionResultData.newInstance() - .setAddMiracleList(miracle)); + this(source, RogueActionResultData.newInstance().setAddMiracleList(miracle)); } public PacketSyncRogueCommonActionResultScNotify(RogueBuffSource source, RogueBuffData buff) { - this(source, RogueActionResultData.newInstance() - .setAddBuffList(buff)); + this(source, RogueActionResultData.newInstance().setAddBuffList(buff)); } public PacketSyncRogueCommonActionResultScNotify(RogueBuffSource source, int addMoneyNum) { - this(source, RogueActionResultData.newInstance() - .setAddItemList(RogueVirtualItemData.newInstance() - .setNum(addMoneyNum))); + this(source, RogueActionResultData.newInstance().setAddItemList(RogueVirtualItemData.newInstance().setNum(addMoneyNum))); } } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonPendingActionScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonPendingActionScNotify.java index 6e6e2c6..21fed8d 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonPendingActionScNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonPendingActionScNotify.java @@ -10,20 +10,20 @@ import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.CmdId; public class PacketSyncRogueCommonPendingActionScNotify extends BasePacket { + public PacketSyncRogueCommonPendingActionScNotify(RogueCommonPendingAction action) { super(CmdId.SyncRogueCommonPendingActionScNotify); - var proto = SyncRogueCommonPendingActionScNotify.newInstance(); - - proto.setRogueCommonPendingAction(action); - //.setRogueVersionId(101); // common rogue + var proto = SyncRogueCommonPendingActionScNotify.newInstance() + .setRogueCommonPendingAction(action) + .setRogueVersionId(101); this.setData(proto); } public PacketSyncRogueCommonPendingActionScNotify(RogueAction action, int id) { this(RogueCommonPendingAction.newInstance() - //.setActionUniqueId(id) + .setUniqueId(id) .setRogueAction(action)); } @@ -32,18 +32,15 @@ public class PacketSyncRogueCommonPendingActionScNotify extends BasePacket { } public PacketSyncRogueCommonPendingActionScNotify(RogueCommonBuffSelectInfo info, int id) { - this(RogueAction.newInstance() - .setBuffSelectInfo(info), id); + this(RogueAction.newInstance().setBuffSelectInfo(info), id); } public PacketSyncRogueCommonPendingActionScNotify(RogueMiracleSelectInfo info, int id) { - this(RogueAction.newInstance() - .setMiracleSelectInfo(info), id); + this(RogueAction.newInstance().setMiracleSelectInfo(info), id); } public PacketSyncRogueCommonPendingActionScNotify(RogueBonusSelectInfo info, int id) { - this(RogueAction.newInstance() - .setBonusSelectInfo(info), id); + this(RogueAction.newInstance().setBonusSelectInfo(info), id); } public RogueCommonPendingAction toProto() {