diff --git a/README.md b/README.md index 50e7505..4f44ee0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Lunar Rail -A WIP server emulator for version 1.3.0 of a certain turn based anime game. +A WIP server emulator for version 1.4.0 of a certain turn based anime game. # 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 717c78b..433167d 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java @@ -19,15 +19,15 @@ public final class ActivateFarmElementCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 world_level = 5; - */ - private int worldLevel; - - /** - * optional uint32 entity_id = 9; + * optional uint32 entity_id = 6; */ private int entityId; + /** + * optional uint32 world_level = 12; + */ + private int worldLevel; + private ActivateFarmElementCsReq() { } @@ -39,62 +39,25 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 world_level = 5; - * @return whether the worldLevel field is set + * optional uint32 entity_id = 6; + * @return whether the entityId field is set */ - public boolean hasWorldLevel() { + public boolean hasEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 world_level = 5; - * @return this - */ - public ActivateFarmElementCsReq clearWorldLevel() { - bitField0_ &= ~0x00000001; - worldLevel = 0; - return this; - } - - /** - * optional uint32 world_level = 5; - * @return the worldLevel - */ - public int getWorldLevel() { - return worldLevel; - } - - /** - * optional uint32 world_level = 5; - * @param value the worldLevel to set - * @return this - */ - public ActivateFarmElementCsReq setWorldLevel(final int value) { - bitField0_ |= 0x00000001; - worldLevel = value; - return this; - } - - /** - * optional uint32 entity_id = 9; - * @return whether the entityId field is set - */ - public boolean hasEntityId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 entity_id = 9; + * optional uint32 entity_id = 6; * @return this */ public ActivateFarmElementCsReq clearEntityId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; entityId = 0; return this; } /** - * optional uint32 entity_id = 9; + * optional uint32 entity_id = 6; * @return the entityId */ public int getEntityId() { @@ -102,23 +65,60 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 9; + * optional uint32 entity_id = 6; * @param value the entityId to set * @return this */ public ActivateFarmElementCsReq setEntityId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; entityId = value; return this; } + /** + * optional uint32 world_level = 12; + * @return whether the worldLevel field is set + */ + public boolean hasWorldLevel() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 world_level = 12; + * @return this + */ + public ActivateFarmElementCsReq clearWorldLevel() { + bitField0_ &= ~0x00000002; + 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 ActivateFarmElementCsReq setWorldLevel(final int value) { + bitField0_ |= 0x00000002; + worldLevel = value; + return this; + } + @Override public ActivateFarmElementCsReq copyFrom(final ActivateFarmElementCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - worldLevel = other.worldLevel; entityId = other.entityId; + worldLevel = other.worldLevel; } return this; } @@ -129,12 +129,12 @@ public final class ActivateFarmElementCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasWorldLevel()) { - setWorldLevel(other.worldLevel); - } if (other.hasEntityId()) { setEntityId(other.entityId); } + if (other.hasWorldLevel()) { + setWorldLevel(other.worldLevel); + } return this; } @@ -145,8 +145,8 @@ public final class ActivateFarmElementCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - worldLevel = 0; entityId = 0; + worldLevel = 0; return this; } @@ -170,19 +170,19 @@ public final class ActivateFarmElementCsReqOuterClass { } ActivateFarmElementCsReq other = (ActivateFarmElementCsReq) o; return bitField0_ == other.bitField0_ - && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasEntityId() || entityId == other.entityId); + && (!hasEntityId() || entityId == other.entityId) + && (!hasWorldLevel() || worldLevel == other.worldLevel); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(worldLevel); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(entityId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(worldLevel); } } @@ -190,10 +190,10 @@ public final class ActivateFarmElementCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } return size; } @@ -205,18 +205,18 @@ public final class ActivateFarmElementCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // worldLevel - worldLevel = input.readUInt32(); + case 48: { + // entityId + entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 96) { break; } } - case 72: { - // entityId - entityId = input.readUInt32(); + case 96: { + // worldLevel + worldLevel = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class ActivateFarmElementCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } output.endObject(); } @@ -256,11 +256,11 @@ public final class ActivateFarmElementCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); + entityId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class ActivateFarmElementCsReqOuterClass { } break; } - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); + worldLevel = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class ActivateFarmElementCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); + + static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java index 8773ed3..9329342 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java @@ -19,20 +19,20 @@ public final class ActivateFarmElementScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entity_id = 11; - */ - private int entityId; - - /** - * optional uint32 world_level = 12; + * optional uint32 world_level = 3; */ private int worldLevel; /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 4; */ private int retcode; + /** + * optional uint32 entity_id = 7; + */ + private int entityId; + private ActivateFarmElementScRsp() { } @@ -44,62 +44,25 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 entity_id = 11; - * @return whether the entityId field is set + * optional uint32 world_level = 3; + * @return whether the worldLevel field is set */ - public boolean hasEntityId() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entity_id = 11; - * @return this - */ - public ActivateFarmElementScRsp 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 ActivateFarmElementScRsp setEntityId(final int value) { - bitField0_ |= 0x00000001; - entityId = value; - return this; - } - - /** - * optional uint32 world_level = 12; - * @return whether the worldLevel field is set - */ - public boolean hasWorldLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 world_level = 12; + * optional uint32 world_level = 3; * @return this */ public ActivateFarmElementScRsp clearWorldLevel() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; worldLevel = 0; return this; } /** - * optional uint32 world_level = 12; + * optional uint32 world_level = 3; * @return the worldLevel */ public int getWorldLevel() { @@ -107,36 +70,36 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 world_level = 12; + * optional uint32 world_level = 3; * @param value the worldLevel to set * @return this */ public ActivateFarmElementScRsp setWorldLevel(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; worldLevel = value; return this; } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 4; * @return this */ public ActivateFarmElementScRsp clearRetcode() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; retcode = 0; return this; } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -144,24 +107,61 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 4; * @param value the retcode to set * @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_; - entityId = other.entityId; worldLevel = other.worldLevel; retcode = other.retcode; + entityId = other.entityId; } return this; } @@ -172,15 +172,15 @@ public final class ActivateFarmElementScRspOuterClass { return this; } cachedSize = -1; - if (other.hasEntityId()) { - setEntityId(other.entityId); - } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasEntityId()) { + setEntityId(other.entityId); + } return this; } @@ -191,9 +191,9 @@ public final class ActivateFarmElementScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - entityId = 0; worldLevel = 0; retcode = 0; + entityId = 0; return this; } @@ -217,39 +217,39 @@ public final class ActivateFarmElementScRspOuterClass { } ActivateFarmElementScRsp other = (ActivateFarmElementScRsp) o; return bitField0_ == other.bitField0_ - && (!hasEntityId() || entityId == other.entityId) && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!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) 88); - output.writeUInt32NoTag(entityId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(worldLevel); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(entityId); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + } return size; } @@ -260,27 +260,27 @@ public final class ActivateFarmElementScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { - // entityId - entityId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 24: { // worldLevel worldLevel = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 32) { break; } } - case 104: { + case 32: { // 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) { @@ -305,14 +305,14 @@ public final class ActivateFarmElementScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.worldLevel, worldLevel); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.entityId, entityId); + } output.endObject(); } @@ -323,24 +323,12 @@ public final class ActivateFarmElementScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { - if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 440007442: case 1305257111: { if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { worldLevel = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -351,6 +339,18 @@ public final class ActivateFarmElementScRspOuterClass { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { + if (!input.trySkipNullValue()) { + entityId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -411,11 +411,11 @@ public final class ActivateFarmElementScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); 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/AvatarExpUpCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java index 3e37041..49f05bb 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 = 1; + * optional uint32 base_avatar_id = 3; */ private int baseAvatarId; /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 5; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 1; + * optional uint32 base_avatar_id = 3; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -47,7 +47,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 1; + * optional uint32 base_avatar_id = 3; * @return this */ public AvatarExpUpCsReq clearBaseAvatarId() { @@ -57,7 +57,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 1; + * optional uint32 base_avatar_id = 3; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -65,7 +65,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 1; + * optional uint32 base_avatar_id = 3; * @param value the baseAvatarId to set * @return this */ @@ -76,7 +76,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 5; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 5; * @return this */ public AvatarExpUpCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * 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 AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * 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 AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 5; * @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) 8); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 42); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class AvatarExpUpCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 24: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 42) { break; } } - case 66: { + case 42: { // 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 e09acee..a9113e6 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 = 7; + * optional uint32 retcode = 6; */ private int retcode; /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 1; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; * @return this */ public AvatarExpUpScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 1; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 1; * @return this */ public AvatarExpUpScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem 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. @@ -109,7 +109,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem 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 @@ -123,7 +123,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 1; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 1; * @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) 56); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 10); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public final class AvatarExpUpScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 10) { break; } } - case 98: { + case 10: { // 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 6e7086d..8e590d8 100644 --- a/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java @@ -21,52 +21,52 @@ public final class AvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 first_met_timestamp = 9; + * optional uint64 first_met_timestamp = 15; */ private long firstMetTimestamp; /** - * optional uint32 exp = 2; - */ - private int exp; - - /** - * optional uint32 level = 6; - */ - private int level; - - /** - * optional uint32 rank = 7; - */ - private int rank; - - /** - * optional uint32 promotion = 8; - */ - private int promotion; - - /** - * optional uint32 base_avatar_id = 11; - */ - private int baseAvatarId; - - /** - * optional uint32 equipment_unique_id = 12; + * optional uint32 equipment_unique_id = 3; */ private int equipmentUniqueId; /** - * repeated uint32 taken_rewards = 13; + * optional uint32 exp = 5; + */ + private int exp; + + /** + * optional uint32 level = 8; + */ + private int level; + + /** + * optional uint32 base_avatar_id = 9; + */ + private int baseAvatarId; + + /** + * optional uint32 promotion = 11; + */ + private int promotion; + + /** + * optional uint32 rank = 13; + */ + private int rank; + + /** + * repeated uint32 taken_rewards = 1; */ private final RepeatedInt takenRewards = RepeatedInt.newEmptyInstance(); /** - * repeated .AvatarSkillTree skilltree_list = 3; + * repeated .AvatarSkillTree skilltree_list = 6; */ private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); /** - * repeated .EquipRelic equip_relic_list = 14; + * repeated .EquipRelic equip_relic_list = 7; */ private final RepeatedMessage equipRelicList = RepeatedMessage.newEmptyInstance(EquipRelicOuterClass.EquipRelic.getFactory()); @@ -81,7 +81,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 9; + * optional uint64 first_met_timestamp = 15; * @return whether the firstMetTimestamp field is set */ public boolean hasFirstMetTimestamp() { @@ -89,7 +89,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 9; + * optional uint64 first_met_timestamp = 15; * @return this */ public Avatar clearFirstMetTimestamp() { @@ -99,7 +99,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 9; + * optional uint64 first_met_timestamp = 15; * @return the firstMetTimestamp */ public long getFirstMetTimestamp() { @@ -107,7 +107,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 9; + * optional uint64 first_met_timestamp = 15; * @param value the firstMetTimestamp to set * @return this */ @@ -118,210 +118,25 @@ public final class AvatarOuterClass { } /** - * optional uint32 exp = 2; - * @return whether the exp field is set + * optional uint32 equipment_unique_id = 3; + * @return whether the equipmentUniqueId field is set */ - public boolean hasExp() { + public boolean hasEquipmentUniqueId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 exp = 2; - * @return this - */ - public Avatar clearExp() { - bitField0_ &= ~0x00000002; - 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_ |= 0x00000002; - exp = value; - return this; - } - - /** - * optional uint32 level = 6; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 level = 6; - * @return this - */ - public Avatar clearLevel() { - bitField0_ &= ~0x00000004; - level = 0; - return this; - } - - /** - * optional uint32 level = 6; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 6; - * @param value the level to set - * @return this - */ - public Avatar setLevel(final int value) { - bitField0_ |= 0x00000004; - level = value; - return this; - } - - /** - * optional uint32 rank = 7; - * @return whether the rank field is set - */ - public boolean hasRank() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 rank = 7; - * @return this - */ - public Avatar clearRank() { - bitField0_ &= ~0x00000008; - rank = 0; - return this; - } - - /** - * optional uint32 rank = 7; - * @return the rank - */ - public int getRank() { - return rank; - } - - /** - * optional uint32 rank = 7; - * @param value the rank to set - * @return this - */ - public Avatar setRank(final int value) { - bitField0_ |= 0x00000008; - rank = value; - return this; - } - - /** - * optional uint32 promotion = 8; - * @return whether the promotion field is set - */ - public boolean hasPromotion() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 promotion = 8; - * @return this - */ - public Avatar clearPromotion() { - bitField0_ &= ~0x00000010; - promotion = 0; - return this; - } - - /** - * optional uint32 promotion = 8; - * @return the promotion - */ - public int getPromotion() { - return promotion; - } - - /** - * optional uint32 promotion = 8; - * @param value the promotion to set - * @return this - */ - public Avatar setPromotion(final int value) { - bitField0_ |= 0x00000010; - promotion = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 11; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 base_avatar_id = 11; - * @return this - */ - public Avatar clearBaseAvatarId() { - bitField0_ &= ~0x00000020; - 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 Avatar setBaseAvatarId(final int value) { - bitField0_ |= 0x00000020; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 equipment_unique_id = 12; - * @return whether the equipmentUniqueId field is set - */ - public boolean hasEquipmentUniqueId() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional uint32 equipment_unique_id = 12; + * optional uint32 equipment_unique_id = 3; * @return this */ public Avatar clearEquipmentUniqueId() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000002; equipmentUniqueId = 0; return this; } /** - * optional uint32 equipment_unique_id = 12; + * optional uint32 equipment_unique_id = 3; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -329,18 +144,203 @@ public final class AvatarOuterClass { } /** - * optional uint32 equipment_unique_id = 12; + * optional uint32 equipment_unique_id = 3; * @param value the equipmentUniqueId to set * @return this */ public Avatar setEquipmentUniqueId(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000002; equipmentUniqueId = value; return this; } /** - * repeated uint32 taken_rewards = 13; + * optional uint32 exp = 5; + * @return whether the exp field is set + */ + public boolean hasExp() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 exp = 5; + * @return this + */ + public Avatar clearExp() { + bitField0_ &= ~0x00000004; + exp = 0; + return this; + } + + /** + * optional uint32 exp = 5; + * @return the exp + */ + public int getExp() { + return exp; + } + + /** + * optional uint32 exp = 5; + * @param value the exp to set + * @return this + */ + public Avatar setExp(final int value) { + bitField0_ |= 0x00000004; + exp = value; + return this; + } + + /** + * optional uint32 level = 8; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 level = 8; + * @return this + */ + public Avatar clearLevel() { + bitField0_ &= ~0x00000008; + level = 0; + return this; + } + + /** + * optional uint32 level = 8; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 8; + * @param value the level to set + * @return this + */ + public Avatar setLevel(final int value) { + bitField0_ |= 0x00000008; + level = value; + return this; + } + + /** + * optional uint32 base_avatar_id = 9; + * @return whether the baseAvatarId field is set + */ + public boolean hasBaseAvatarId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 base_avatar_id = 9; + * @return this + */ + public Avatar clearBaseAvatarId() { + bitField0_ &= ~0x00000010; + 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_ |= 0x00000010; + baseAvatarId = value; + return this; + } + + /** + * optional uint32 promotion = 11; + * @return whether the promotion field is set + */ + public boolean hasPromotion() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 promotion = 11; + * @return this + */ + public Avatar clearPromotion() { + bitField0_ &= ~0x00000020; + promotion = 0; + return this; + } + + /** + * optional uint32 promotion = 11; + * @return the promotion + */ + public int getPromotion() { + return promotion; + } + + /** + * optional uint32 promotion = 11; + * @param value the promotion to set + * @return this + */ + public Avatar setPromotion(final int value) { + bitField0_ |= 0x00000020; + promotion = value; + return this; + } + + /** + * optional uint32 rank = 13; + * @return whether the rank field is set + */ + public boolean hasRank() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional uint32 rank = 13; + * @return this + */ + public Avatar clearRank() { + bitField0_ &= ~0x00000040; + rank = 0; + return this; + } + + /** + * optional uint32 rank = 13; + * @return the rank + */ + public int getRank() { + return rank; + } + + /** + * optional uint32 rank = 13; + * @param value the rank to set + * @return this + */ + public Avatar setRank(final int value) { + bitField0_ |= 0x00000040; + rank = value; + return this; + } + + /** + * repeated uint32 taken_rewards = 1; * @return whether the takenRewards field is set */ public boolean hasTakenRewards() { @@ -348,7 +348,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 13; + * repeated uint32 taken_rewards = 1; * @return this */ public Avatar clearTakenRewards() { @@ -358,7 +358,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 13; + * repeated uint32 taken_rewards = 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. @@ -372,7 +372,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 13; + * repeated uint32 taken_rewards = 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 @@ -386,7 +386,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 13; + * repeated uint32 taken_rewards = 1; * @param value the takenRewards to add * @return this */ @@ -397,7 +397,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 13; + * repeated uint32 taken_rewards = 1; * @param values the takenRewards to add * @return this */ @@ -408,7 +408,7 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 3; + * repeated .AvatarSkillTree skilltree_list = 6; * @return whether the skilltreeList field is set */ public boolean hasSkilltreeList() { @@ -416,7 +416,7 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 3; + * repeated .AvatarSkillTree skilltree_list = 6; * @return this */ public Avatar clearSkilltreeList() { @@ -426,7 +426,7 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 3; + * repeated .AvatarSkillTree skilltree_list = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -440,7 +440,7 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 3; + * repeated .AvatarSkillTree skilltree_list = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -454,7 +454,7 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 3; + * repeated .AvatarSkillTree skilltree_list = 6; * @param value the skilltreeList to add * @return this */ @@ -465,7 +465,7 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 3; + * repeated .AvatarSkillTree skilltree_list = 6; * @param values the skilltreeList to add * @return this */ @@ -476,7 +476,7 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 14; + * repeated .EquipRelic equip_relic_list = 7; * @return whether the equipRelicList field is set */ public boolean hasEquipRelicList() { @@ -484,7 +484,7 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 14; + * repeated .EquipRelic equip_relic_list = 7; * @return this */ public Avatar clearEquipRelicList() { @@ -494,7 +494,7 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 14; + * repeated .EquipRelic equip_relic_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -508,7 +508,7 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 14; + * repeated .EquipRelic equip_relic_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -522,7 +522,7 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 14; + * repeated .EquipRelic equip_relic_list = 7; * @param value the equipRelicList to add * @return this */ @@ -533,7 +533,7 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 14; + * repeated .EquipRelic equip_relic_list = 7; * @param values the equipRelicList to add * @return this */ @@ -549,12 +549,12 @@ public final class AvatarOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; firstMetTimestamp = other.firstMetTimestamp; + equipmentUniqueId = other.equipmentUniqueId; exp = other.exp; level = other.level; - rank = other.rank; - promotion = other.promotion; baseAvatarId = other.baseAvatarId; - equipmentUniqueId = other.equipmentUniqueId; + promotion = other.promotion; + rank = other.rank; takenRewards.copyFrom(other.takenRewards); skilltreeList.copyFrom(other.skilltreeList); equipRelicList.copyFrom(other.equipRelicList); @@ -571,23 +571,23 @@ public final class AvatarOuterClass { if (other.hasFirstMetTimestamp()) { setFirstMetTimestamp(other.firstMetTimestamp); } + if (other.hasEquipmentUniqueId()) { + setEquipmentUniqueId(other.equipmentUniqueId); + } if (other.hasExp()) { setExp(other.exp); } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasRank()) { - setRank(other.rank); + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); } if (other.hasPromotion()) { setPromotion(other.promotion); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); - } - if (other.hasEquipmentUniqueId()) { - setEquipmentUniqueId(other.equipmentUniqueId); + if (other.hasRank()) { + setRank(other.rank); } if (other.hasTakenRewards()) { getMutableTakenRewards().addAll(other.takenRewards); @@ -609,12 +609,12 @@ public final class AvatarOuterClass { cachedSize = -1; bitField0_ = 0; firstMetTimestamp = 0L; + equipmentUniqueId = 0; exp = 0; level = 0; - rank = 0; - promotion = 0; baseAvatarId = 0; - equipmentUniqueId = 0; + promotion = 0; + rank = 0; takenRewards.clear(); skilltreeList.clear(); equipRelicList.clear(); @@ -645,12 +645,12 @@ public final class AvatarOuterClass { Avatar other = (Avatar) o; return bitField0_ == other.bitField0_ && (!hasFirstMetTimestamp() || firstMetTimestamp == other.firstMetTimestamp) + && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) && (!hasExp() || exp == other.exp) && (!hasLevel() || level == other.level) - && (!hasRank() || rank == other.rank) - && (!hasPromotion() || promotion == other.promotion) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) + && (!hasPromotion() || promotion == other.promotion) + && (!hasRank() || rank == other.rank) && (!hasTakenRewards() || takenRewards.equals(other.takenRewards)) && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList)) && (!hasEquipRelicList() || equipRelicList.equals(other.equipRelicList)); @@ -659,48 +659,48 @@ public final class AvatarOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 120); output.writeUInt64NoTag(firstMetTimestamp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(exp); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(rank); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(promotion); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 88); - output.writeUInt32NoTag(baseAvatarId); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(equipmentUniqueId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000080) != 0) { for (int i = 0; i < takenRewards.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(takenRewards.array()[i]); } } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < skilltreeList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 50); output.writeMessageNoTag(skilltreeList.get(i)); } } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < equipRelicList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 58); output.writeMessageNoTag(equipRelicList.get(i)); } } @@ -713,22 +713,22 @@ public final class AvatarOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(firstMetTimestamp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); - } - if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } if ((bitField0_ & 0x00000080) != 0) { size += (1 * takenRewards.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(takenRewards); @@ -749,45 +749,45 @@ public final class AvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 120: { // firstMetTimestamp firstMetTimestamp = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 24) { break; } } - case 16: { - // exp - exp = input.readUInt32(); + case 24: { + // equipmentUniqueId + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 40) { break; } } - case 48: { - // level - level = input.readUInt32(); + case 40: { + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // rank - rank = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); if (tag != 64) { break; } } case 64: { - // promotion - promotion = input.readUInt32(); + // level + level = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 88) { @@ -795,41 +795,41 @@ public final class AvatarOuterClass { } } case 88: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 96) { + if (tag != 104) { break; } } - case 96: { - // equipmentUniqueId - equipmentUniqueId = input.readUInt32(); + case 104: { + // rank + rank = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 106) { + if (tag != 10) { break; } } - case 106: { + case 10: { // takenRewards [packed=true] input.readPackedUInt32(takenRewards, tag); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 26) { + if (tag != 50) { break; } } - case 26: { + case 50: { // skilltreeList tag = input.readRepeatedMessage(skilltreeList, tag); bitField0_ |= 0x00000100; - if (tag != 114) { + if (tag != 58) { break; } } - case 114: { + case 58: { // equipRelicList tag = input.readRepeatedMessage(equipRelicList, tag); bitField0_ |= 0x00000200; @@ -847,7 +847,7 @@ public final class AvatarOuterClass { tag = input.readTag(); break; } - case 104: { + case 8: { // takenRewards [packed=false] tag = input.readRepeatedUInt32(takenRewards, tag); bitField0_ |= 0x00000080; @@ -864,22 +864,22 @@ public final class AvatarOuterClass { output.writeUInt64(FieldNames.firstMetTimestamp, firstMetTimestamp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.exp, exp); + output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.exp, exp); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.rank, rank); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.promotion, promotion); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); + output.writeUInt32(FieldNames.rank, rank); } if ((bitField0_ & 0x00000080) != 0) { output.writeRepeatedUInt32(FieldNames.takenRewards, takenRewards); @@ -912,11 +912,23 @@ public final class AvatarOuterClass { } break; } + case -1867136902: + case 760467160: { + if (input.isAtField(FieldNames.equipmentUniqueId)) { + if (!input.trySkipNullValue()) { + equipmentUniqueId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 100893: { if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { exp = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -927,17 +939,6 @@ public final class AvatarOuterClass { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 3492908: { - if (input.isAtField(FieldNames.rank)) { - if (!input.trySkipNullValue()) { - rank = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -945,22 +946,22 @@ public final class AvatarOuterClass { } break; } - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { - if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } case 118022725: case -1756826157: { if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { baseAvatarId = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { + if (!input.trySkipNullValue()) { + promotion = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -968,11 +969,10 @@ public final class AvatarOuterClass { } break; } - case -1867136902: - case 760467160: { - if (input.isAtField(FieldNames.equipmentUniqueId)) { + case 3492908: { + if (input.isAtField(FieldNames.rank)) { if (!input.trySkipNullValue()) { - equipmentUniqueId = input.readUInt32(); + rank = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -1070,17 +1070,17 @@ public final class AvatarOuterClass { static class FieldNames { static final FieldName firstMetTimestamp = FieldName.forField("firstMetTimestamp", "first_met_timestamp"); + static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); + static final FieldName exp = FieldName.forField("exp"); static final FieldName level = FieldName.forField("level"); - static final FieldName rank = FieldName.forField("rank"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName promotion = FieldName.forField("promotion"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - - static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); + static final FieldName rank = FieldName.forField("rank"); static final FieldName takenRewards = FieldName.forField("takenRewards", "taken_rewards"); diff --git a/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java index b4f1afc..f40be9d 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 = 14; + * repeated .Avatar avatar_list = 2; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory()); @@ -35,7 +35,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 14; + * repeated .Avatar avatar_list = 2; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -43,7 +43,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 14; + * repeated .Avatar avatar_list = 2; * @return this */ public AvatarSync clearAvatarList() { @@ -53,7 +53,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 14; + * repeated .Avatar avatar_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 14; + * repeated .Avatar avatar_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 14; + * repeated .Avatar avatar_list = 2; * @param value the avatarList to add * @return this */ @@ -92,7 +92,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 14; + * repeated .Avatar avatar_list = 2; * @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) 114); + output.writeRawByte((byte) 18); output.writeMessageNoTag(avatarList.get(i)); } } @@ -185,7 +185,7 @@ public final class AvatarSyncOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 18: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java index 1baa7b8..b61bc72 100644 --- a/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java @@ -21,17 +21,12 @@ public final class BoardDataSyncOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool PFFKMBMFBCN = 3; - */ - private boolean pFFKMBMFBCN; - - /** - * optional string signature = 6; + * optional string signature = 14; */ private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * repeated .HeadIcon unlocked_head_icon_list = 7; + * repeated .HeadIcon unlocked_head_icon_list = 8; */ private final RepeatedMessage unlockedHeadIconList = RepeatedMessage.newEmptyInstance(HeadIconOuterClass.HeadIcon.getFactory()); @@ -46,62 +41,25 @@ public final class BoardDataSyncOuterClass { } /** - * optional bool PFFKMBMFBCN = 3; - * @return whether the pFFKMBMFBCN field is set + * optional string signature = 14; + * @return whether the signature field is set */ - public boolean hasPFFKMBMFBCN() { + public boolean hasSignature() { return (bitField0_ & 0x00000001) != 0; } /** - * optional bool PFFKMBMFBCN = 3; - * @return this - */ - public BoardDataSync clearPFFKMBMFBCN() { - bitField0_ &= ~0x00000001; - pFFKMBMFBCN = false; - return this; - } - - /** - * optional bool PFFKMBMFBCN = 3; - * @return the pFFKMBMFBCN - */ - public boolean getPFFKMBMFBCN() { - return pFFKMBMFBCN; - } - - /** - * optional bool PFFKMBMFBCN = 3; - * @param value the pFFKMBMFBCN to set - * @return this - */ - public BoardDataSync setPFFKMBMFBCN(final boolean value) { - bitField0_ |= 0x00000001; - pFFKMBMFBCN = value; - return this; - } - - /** - * optional string signature = 6; - * @return whether the signature field is set - */ - public boolean hasSignature() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional string signature = 6; + * optional string signature = 14; * @return this */ public BoardDataSync clearSignature() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; signature.clear(); return this; } /** - * optional string signature = 6; + * optional string signature = 14; * @return the signature */ public String getSignature() { @@ -109,7 +67,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 6; + * optional string signature = 14; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -117,56 +75,56 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 6; + * optional string signature = 14; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return this.signature; } /** - * optional string signature = 6; + * optional string signature = 14; * @param value the signature to set * @return this */ public BoardDataSync setSignature(final CharSequence value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; signature.copyFrom(value); return this; } /** - * optional string signature = 6; + * optional string signature = 14; * @param value the signature to set * @return this */ public BoardDataSync setSignature(final Utf8String value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; signature.copyFrom(value); return this; } /** - * repeated .HeadIcon unlocked_head_icon_list = 7; + * repeated .HeadIcon unlocked_head_icon_list = 8; * @return whether the unlockedHeadIconList field is set */ public boolean hasUnlockedHeadIconList() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * repeated .HeadIcon unlocked_head_icon_list = 7; + * repeated .HeadIcon unlocked_head_icon_list = 8; * @return this */ public BoardDataSync clearUnlockedHeadIconList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; unlockedHeadIconList.clear(); return this; } /** - * repeated .HeadIcon unlocked_head_icon_list = 7; + * repeated .HeadIcon unlocked_head_icon_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. @@ -180,7 +138,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 7; + * repeated .HeadIcon unlocked_head_icon_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 @@ -189,28 +147,28 @@ public final class BoardDataSyncOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableUnlockedHeadIconList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return unlockedHeadIconList; } /** - * repeated .HeadIcon unlocked_head_icon_list = 7; + * repeated .HeadIcon unlocked_head_icon_list = 8; * @param value the unlockedHeadIconList to add * @return this */ public BoardDataSync addUnlockedHeadIconList(final HeadIconOuterClass.HeadIcon value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; unlockedHeadIconList.add(value); return this; } /** - * repeated .HeadIcon unlocked_head_icon_list = 7; + * repeated .HeadIcon unlocked_head_icon_list = 8; * @param values the unlockedHeadIconList to add * @return this */ public BoardDataSync addAllUnlockedHeadIconList(final HeadIconOuterClass.HeadIcon... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; unlockedHeadIconList.addAll(values); return this; } @@ -220,7 +178,6 @@ public final class BoardDataSyncOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - pFFKMBMFBCN = other.pFFKMBMFBCN; signature.copyFrom(other.signature); unlockedHeadIconList.copyFrom(other.unlockedHeadIconList); } @@ -233,9 +190,6 @@ public final class BoardDataSyncOuterClass { return this; } cachedSize = -1; - if (other.hasPFFKMBMFBCN()) { - setPFFKMBMFBCN(other.pFFKMBMFBCN); - } if (other.hasSignature()) { getMutableSignatureBytes().copyFrom(other.signature); } @@ -252,7 +206,6 @@ public final class BoardDataSyncOuterClass { } cachedSize = -1; bitField0_ = 0; - pFFKMBMFBCN = false; signature.clear(); unlockedHeadIconList.clear(); return this; @@ -280,7 +233,6 @@ public final class BoardDataSyncOuterClass { } BoardDataSync other = (BoardDataSync) o; return bitField0_ == other.bitField0_ - && (!hasPFFKMBMFBCN() || pFFKMBMFBCN == other.pFFKMBMFBCN) && (!hasSignature() || signature.equals(other.signature)) && (!hasUnlockedHeadIconList() || unlockedHeadIconList.equals(other.unlockedHeadIconList)); } @@ -288,16 +240,12 @@ public final class BoardDataSyncOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeBoolNoTag(pFFKMBMFBCN); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 114); output.writeStringNoTag(signature); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unlockedHeadIconList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 66); output.writeMessageNoTag(unlockedHeadIconList.get(i)); } } @@ -307,12 +255,9 @@ public final class BoardDataSyncOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 2; - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(signature); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += (1 * unlockedHeadIconList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedHeadIconList); } return size; @@ -325,28 +270,19 @@ public final class BoardDataSyncOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // pFFKMBMFBCN - pFFKMBMFBCN = input.readBool(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { + case 114: { // signature input.readString(signature); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 66) { break; } } - case 58: { + case 66: { // unlockedHeadIconList tag = input.readRepeatedMessage(unlockedHeadIconList, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; if (tag != 0) { break; } @@ -369,12 +305,9 @@ public final class BoardDataSyncOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeBool(FieldNames.pFFKMBMFBCN, pFFKMBMFBCN); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeString(FieldNames.signature, signature); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedMessage(FieldNames.unlockedHeadIconList, unlockedHeadIconList); } output.endObject(); @@ -387,22 +320,11 @@ public final class BoardDataSyncOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1418143260: { - if (input.isAtField(FieldNames.pFFKMBMFBCN)) { - if (!input.trySkipNullValue()) { - pFFKMBMFBCN = input.readBool(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 1073584312: { if (input.isAtField(FieldNames.signature)) { if (!input.trySkipNullValue()) { input.readString(signature); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -414,7 +336,7 @@ public final class BoardDataSyncOuterClass { if (input.isAtField(FieldNames.unlockedHeadIconList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(unlockedHeadIconList); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -473,8 +395,6 @@ public final class BoardDataSyncOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName pFFKMBMFBCN = FieldName.forField("PFFKMBMFBCN"); - static final FieldName signature = FieldName.forField("signature"); static final FieldName unlockedHeadIconList = FieldName.forField("unlockedHeadIconList", "unlocked_head_icon_list"); diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java index ea60bfd..6c77d4b 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java @@ -19,25 +19,20 @@ public final class ChallengeInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 EAPKGFJDABE = 6; - */ - private int eAPKGFJDABE; - - /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 1; */ private int challengeId; /** - * optional .ExtraLineupType extra_lineup_type = 5; - */ - private int extraLineupType; - - /** - * optional .ChallengeStatus status = 8; + * optional .ChallengeStatus status = 4; */ private int status; + /** + * optional .ExtraLineupType extra_lineup_type = 10; + */ + private int extraLineupType; + private ChallengeInfo() { } @@ -49,62 +44,25 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 EAPKGFJDABE = 6; - * @return whether the eAPKGFJDABE field is set + * optional uint32 challenge_id = 1; + * @return whether the challengeId field is set */ - public boolean hasEAPKGFJDABE() { + public boolean hasChallengeId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 EAPKGFJDABE = 6; - * @return this - */ - public ChallengeInfo clearEAPKGFJDABE() { - bitField0_ &= ~0x00000001; - eAPKGFJDABE = 0; - return this; - } - - /** - * optional uint32 EAPKGFJDABE = 6; - * @return the eAPKGFJDABE - */ - public int getEAPKGFJDABE() { - return eAPKGFJDABE; - } - - /** - * optional uint32 EAPKGFJDABE = 6; - * @param value the eAPKGFJDABE to set - * @return this - */ - public ChallengeInfo setEAPKGFJDABE(final int value) { - bitField0_ |= 0x00000001; - eAPKGFJDABE = value; - return this; - } - - /** - * optional uint32 challenge_id = 14; - * @return whether the challengeId field is set - */ - public boolean hasChallengeId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 1; * @return this */ public ChallengeInfo clearChallengeId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; challengeId = 0; return this; } /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 1; * @return the challengeId */ public int getChallengeId() { @@ -112,18 +70,80 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 1; * @param value the challengeId to set * @return this */ public ChallengeInfo setChallengeId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; challengeId = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 5; + * optional .ChallengeStatus status = 4; + * @return whether the status field is set + */ + public boolean hasStatus() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .ChallengeStatus status = 4; + * @return this + */ + public ChallengeInfo clearStatus() { + bitField0_ &= ~0x00000002; + status = 0; + return this; + } + + /** + * optional .ChallengeStatus status = 4; + * @return the status + */ + public ChallengeStatusOuterClass.ChallengeStatus getStatus() { + return ChallengeStatusOuterClass.ChallengeStatus.forNumber(status); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link ChallengeInfo#getStatus()}.getNumber(). + * + * @return numeric wire representation + */ + public int getStatusValue() { + return status; + } + + /** + * Sets the value of the internal enum store. This does not + * do any validity checks, so be sure to use appropriate value + * constants from {@link ChallengeStatusOuterClass.ChallengeStatus}. Setting an invalid value + * can cause {@link ChallengeInfo#getStatus()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public ChallengeInfo setStatusValue(final int value) { + bitField0_ |= 0x00000002; + status = value; + return this; + } + + /** + * optional .ChallengeStatus status = 4; + * @param value the status to set + * @return this + */ + public ChallengeInfo setStatus(final ChallengeStatusOuterClass.ChallengeStatus value) { + bitField0_ |= 0x00000002; + status = value.getNumber(); + return this; + } + + /** + * optional .ExtraLineupType extra_lineup_type = 10; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -131,7 +151,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 5; + * optional .ExtraLineupType extra_lineup_type = 10; * @return this */ public ChallengeInfo clearExtraLineupType() { @@ -141,7 +161,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 5; + * optional .ExtraLineupType extra_lineup_type = 10; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -174,7 +194,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 5; + * optional .ExtraLineupType extra_lineup_type = 10; * @param value the extraLineupType to set * @return this */ @@ -184,77 +204,14 @@ public final class ChallengeInfoOuterClass { return this; } - /** - * optional .ChallengeStatus status = 8; - * @return whether the status field is set - */ - public boolean hasStatus() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .ChallengeStatus status = 8; - * @return this - */ - public ChallengeInfo clearStatus() { - bitField0_ &= ~0x00000008; - status = 0; - return this; - } - - /** - * optional .ChallengeStatus status = 8; - * @return the status - */ - public ChallengeStatusOuterClass.ChallengeStatus getStatus() { - return ChallengeStatusOuterClass.ChallengeStatus.forNumber(status); - } - - /** - * Gets the value of the internal enum store. The result is - * equivalent to {@link ChallengeInfo#getStatus()}.getNumber(). - * - * @return numeric wire representation - */ - public int getStatusValue() { - return status; - } - - /** - * Sets the value of the internal enum store. This does not - * do any validity checks, so be sure to use appropriate value - * constants from {@link ChallengeStatusOuterClass.ChallengeStatus}. Setting an invalid value - * can cause {@link ChallengeInfo#getStatus()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public ChallengeInfo setStatusValue(final int value) { - bitField0_ |= 0x00000008; - status = value; - return this; - } - - /** - * optional .ChallengeStatus status = 8; - * @param value the status to set - * @return this - */ - public ChallengeInfo setStatus(final ChallengeStatusOuterClass.ChallengeStatus value) { - bitField0_ |= 0x00000008; - status = value.getNumber(); - return this; - } - @Override public ChallengeInfo copyFrom(final ChallengeInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - eAPKGFJDABE = other.eAPKGFJDABE; challengeId = other.challengeId; - extraLineupType = other.extraLineupType; status = other.status; + extraLineupType = other.extraLineupType; } return this; } @@ -265,18 +222,15 @@ public final class ChallengeInfoOuterClass { return this; } cachedSize = -1; - if (other.hasEAPKGFJDABE()) { - setEAPKGFJDABE(other.eAPKGFJDABE); - } if (other.hasChallengeId()) { setChallengeId(other.challengeId); } - if (other.hasExtraLineupType()) { - setExtraLineupTypeValue(other.extraLineupType); - } if (other.hasStatus()) { setStatusValue(other.status); } + if (other.hasExtraLineupType()) { + setExtraLineupTypeValue(other.extraLineupType); + } return this; } @@ -287,10 +241,9 @@ public final class ChallengeInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - eAPKGFJDABE = 0; challengeId = 0; - extraLineupType = 0; status = 0; + extraLineupType = 0; return this; } @@ -314,47 +267,39 @@ public final class ChallengeInfoOuterClass { } ChallengeInfo other = (ChallengeInfo) o; return bitField0_ == other.bitField0_ - && (!hasEAPKGFJDABE() || eAPKGFJDABE == other.eAPKGFJDABE) && (!hasChallengeId() || challengeId == other.challengeId) - && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) - && (!hasStatus() || status == other.status); + && (!hasStatus() || status == other.status) + && (!hasExtraLineupType() || extraLineupType == other.extraLineupType); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(eAPKGFJDABE); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(challengeId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeEnumNoTag(extraLineupType); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 32); output.writeEnumNoTag(status); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 80); + output.writeEnumNoTag(extraLineupType); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eAPKGFJDABE); + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); + size += 1 + ProtoSink.computeEnumSizeNoTag(status); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(status); - } return size; } @@ -365,25 +310,28 @@ public final class ChallengeInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // eAPKGFJDABE - eAPKGFJDABE = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 8: { // challengeId challengeId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 32) { break; } } - case 40: { + case 32: { + // status + final int value = input.readInt32(); + if (ChallengeStatusOuterClass.ChallengeStatus.forNumber(value) != null) { + status = value; + bitField0_ |= 0x00000002; + } + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { @@ -391,18 +339,6 @@ public final class ChallengeInfoOuterClass { bitField0_ |= 0x00000004; } tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { - // status - final int value = input.readInt32(); - if (ChallengeStatusOuterClass.ChallengeStatus.forNumber(value) != null) { - status = value; - bitField0_ |= 0x00000008; - } - tag = input.readTag(); if (tag != 0) { break; } @@ -425,17 +361,14 @@ public final class ChallengeInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.eAPKGFJDABE, eAPKGFJDABE); + output.writeUInt32(FieldNames.challengeId, challengeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.challengeId, challengeId); + output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter()); } if ((bitField0_ & 0x00000004) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter()); - } output.endObject(); } @@ -446,10 +379,11 @@ public final class ChallengeInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 337975252: { - if (input.isAtField(FieldNames.eAPKGFJDABE)) { + case -689112866: + case 112359031: { + if (input.isAtField(FieldNames.challengeId)) { if (!input.trySkipNullValue()) { - eAPKGFJDABE = input.readUInt32(); + challengeId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -457,12 +391,16 @@ public final class ChallengeInfoOuterClass { } break; } - case -689112866: - case 112359031: { - if (input.isAtField(FieldNames.challengeId)) { + case -892481550: { + if (input.isAtField(FieldNames.status)) { if (!input.trySkipNullValue()) { - challengeId = input.readUInt32(); - bitField0_ |= 0x00000002; + final ChallengeStatusOuterClass.ChallengeStatus value = input.readEnum(ChallengeStatusOuterClass.ChallengeStatus.converter()); + if (value != null) { + status = value.getNumber(); + bitField0_ |= 0x00000002; + } else { + input.skipUnknownEnumValue(); + } } } else { input.skipUnknownField(); @@ -486,22 +424,6 @@ public final class ChallengeInfoOuterClass { } break; } - case -892481550: { - if (input.isAtField(FieldNames.status)) { - if (!input.trySkipNullValue()) { - final ChallengeStatusOuterClass.ChallengeStatus value = input.readEnum(ChallengeStatusOuterClass.ChallengeStatus.converter()); - if (value != null) { - status = value.getNumber(); - bitField0_ |= 0x00000008; - } else { - input.skipUnknownEnumValue(); - } - } - } else { - input.skipUnknownField(); - } - break; - } default: { input.skipUnknownField(); break; @@ -554,13 +476,11 @@ public final class ChallengeInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName eAPKGFJDABE = FieldName.forField("EAPKGFJDABE"); - static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); - static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); - static final FieldName status = FieldName.forField("status"); + + static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java index 36c4d26..28b113f 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java @@ -19,7 +19,7 @@ public final class ChallengeLineupNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .ExtraLineupType extra_lineup_type = 11; + * optional .ExtraLineupType extra_lineup_type = 2; */ private int extraLineupType; @@ -34,7 +34,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 11; + * optional .ExtraLineupType extra_lineup_type = 2; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -42,7 +42,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 11; + * optional .ExtraLineupType extra_lineup_type = 2; * @return this */ public ChallengeLineupNotify clearExtraLineupType() { @@ -52,7 +52,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 11; + * optional .ExtraLineupType extra_lineup_type = 2; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -85,7 +85,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 11; + * optional .ExtraLineupType extra_lineup_type = 2; * @param value the extraLineupType to set * @return this */ @@ -155,7 +155,7 @@ public final class ChallengeLineupNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 16); output.writeEnumNoTag(extraLineupType); } } @@ -176,7 +176,7 @@ public final class ChallengeLineupNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 16: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java index f8c71cb..324f072 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java @@ -19,20 +19,20 @@ public final class ChallengeOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 stars = 2; - */ - private int stars; - - /** - * optional uint32 taken_reward = 5; + * optional uint32 taken_reward = 8; */ private int takenReward; /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 9; */ private int challengeId; + /** + * optional uint32 stars = 10; + */ + private int stars; + private Challenge() { } @@ -44,62 +44,25 @@ public final class ChallengeOuterClass { } /** - * optional uint32 stars = 2; - * @return whether the stars field is set + * optional uint32 taken_reward = 8; + * @return whether the takenReward field is set */ - public boolean hasStars() { + public boolean hasTakenReward() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 stars = 2; - * @return this - */ - public Challenge clearStars() { - bitField0_ &= ~0x00000001; - stars = 0; - return this; - } - - /** - * optional uint32 stars = 2; - * @return the stars - */ - public int getStars() { - return stars; - } - - /** - * optional uint32 stars = 2; - * @param value the stars to set - * @return this - */ - public Challenge setStars(final int value) { - bitField0_ |= 0x00000001; - stars = value; - return this; - } - - /** - * optional uint32 taken_reward = 5; - * @return whether the takenReward field is set - */ - public boolean hasTakenReward() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 taken_reward = 5; + * optional uint32 taken_reward = 8; * @return this */ public Challenge clearTakenReward() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; takenReward = 0; return this; } /** - * optional uint32 taken_reward = 5; + * optional uint32 taken_reward = 8; * @return the takenReward */ public int getTakenReward() { @@ -107,36 +70,36 @@ public final class ChallengeOuterClass { } /** - * optional uint32 taken_reward = 5; + * optional uint32 taken_reward = 8; * @param value the takenReward to set * @return this */ public Challenge setTakenReward(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; takenReward = value; return this; } /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 9; * @return whether the challengeId field is set */ public boolean hasChallengeId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 9; * @return this */ public Challenge clearChallengeId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; challengeId = 0; return this; } /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 9; * @return the challengeId */ public int getChallengeId() { @@ -144,24 +107,61 @@ public final class ChallengeOuterClass { } /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 9; * @param value the challengeId to set * @return this */ public Challenge setChallengeId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; challengeId = value; return this; } + /** + * optional uint32 stars = 10; + * @return whether the stars field is set + */ + public boolean hasStars() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 stars = 10; + * @return this + */ + public Challenge clearStars() { + bitField0_ &= ~0x00000004; + stars = 0; + return this; + } + + /** + * optional uint32 stars = 10; + * @return the stars + */ + public int getStars() { + return stars; + } + + /** + * optional uint32 stars = 10; + * @param value the stars to set + * @return this + */ + public Challenge setStars(final int value) { + bitField0_ |= 0x00000004; + stars = value; + return this; + } + @Override public Challenge copyFrom(final Challenge other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - stars = other.stars; takenReward = other.takenReward; challengeId = other.challengeId; + stars = other.stars; } return this; } @@ -172,15 +172,15 @@ public final class ChallengeOuterClass { return this; } cachedSize = -1; - if (other.hasStars()) { - setStars(other.stars); - } if (other.hasTakenReward()) { setTakenReward(other.takenReward); } if (other.hasChallengeId()) { setChallengeId(other.challengeId); } + if (other.hasStars()) { + setStars(other.stars); + } return this; } @@ -191,9 +191,9 @@ public final class ChallengeOuterClass { } cachedSize = -1; bitField0_ = 0; - stars = 0; takenReward = 0; challengeId = 0; + stars = 0; return this; } @@ -217,39 +217,39 @@ public final class ChallengeOuterClass { } Challenge other = (Challenge) o; return bitField0_ == other.bitField0_ - && (!hasStars() || stars == other.stars) && (!hasTakenReward() || takenReward == other.takenReward) - && (!hasChallengeId() || challengeId == other.challengeId); + && (!hasChallengeId() || challengeId == other.challengeId) + && (!hasStars() || stars == other.stars); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(stars); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(takenReward); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 72); output.writeUInt32NoTag(challengeId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(stars); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(takenReward); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); + } return size; } @@ -260,27 +260,27 @@ public final class ChallengeOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // stars - stars = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { + case 64: { // takenReward takenReward = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { + case 72: { // challengeId challengeId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // stars + stars = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,14 +305,14 @@ public final class ChallengeOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.stars, stars); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.takenReward, takenReward); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.challengeId, challengeId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.stars, stars); + } output.endObject(); } @@ -323,23 +323,12 @@ public final class ChallengeOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 109757537: { - if (input.isAtField(FieldNames.stars)) { - if (!input.trySkipNullValue()) { - stars = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 1216849622: case -1923526233: { if (input.isAtField(FieldNames.takenReward)) { if (!input.trySkipNullValue()) { takenReward = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -351,6 +340,17 @@ public final class ChallengeOuterClass { if (input.isAtField(FieldNames.challengeId)) { if (!input.trySkipNullValue()) { challengeId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 109757537: { + if (input.isAtField(FieldNames.stars)) { + if (!input.trySkipNullValue()) { + stars = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -410,11 +410,11 @@ public final class ChallengeOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName stars = FieldName.forField("stars"); - static final FieldName takenReward = FieldName.forField("takenReward", "taken_reward"); static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + + static final FieldName stars = FieldName.forField("stars"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java index 4cffacb..17cac9d 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java @@ -19,22 +19,22 @@ public final class ChallengeSettleNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 challenge_id = 3; + * optional uint32 challenge_id = 11; */ private int challengeId; /** - * optional uint32 stars = 6; + * optional uint32 stars = 13; */ private int stars; /** - * optional bool is_win = 7; + * optional bool is_win = 4; */ private boolean isWin; /** - * optional .ItemList reward = 4; + * optional .ItemList reward = 10; */ private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance(); @@ -49,7 +49,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 challenge_id = 3; + * optional uint32 challenge_id = 11; * @return whether the challengeId field is set */ public boolean hasChallengeId() { @@ -57,7 +57,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 challenge_id = 3; + * optional uint32 challenge_id = 11; * @return this */ public ChallengeSettleNotify clearChallengeId() { @@ -67,7 +67,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 challenge_id = 3; + * optional uint32 challenge_id = 11; * @return the challengeId */ public int getChallengeId() { @@ -75,7 +75,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 challenge_id = 3; + * optional uint32 challenge_id = 11; * @param value the challengeId to set * @return this */ @@ -86,7 +86,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 stars = 6; + * optional uint32 stars = 13; * @return whether the stars field is set */ public boolean hasStars() { @@ -94,7 +94,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 stars = 6; + * optional uint32 stars = 13; * @return this */ public ChallengeSettleNotify clearStars() { @@ -104,7 +104,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 stars = 6; + * optional uint32 stars = 13; * @return the stars */ public int getStars() { @@ -112,7 +112,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 stars = 6; + * optional uint32 stars = 13; * @param value the stars to set * @return this */ @@ -123,7 +123,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 7; + * optional bool is_win = 4; * @return whether the isWin field is set */ public boolean hasIsWin() { @@ -131,7 +131,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 7; + * optional bool is_win = 4; * @return this */ public ChallengeSettleNotify clearIsWin() { @@ -141,7 +141,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 7; + * optional bool is_win = 4; * @return the isWin */ public boolean getIsWin() { @@ -149,7 +149,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 7; + * optional bool is_win = 4; * @param value the isWin to set * @return this */ @@ -160,7 +160,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 4; + * optional .ItemList reward = 10; * @return whether the reward field is set */ public boolean hasReward() { @@ -168,7 +168,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 4; + * optional .ItemList reward = 10; * @return this */ public ChallengeSettleNotify clearReward() { @@ -178,7 +178,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 4; + * optional .ItemList reward = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -192,7 +192,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 4; + * optional .ItemList reward = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -206,7 +206,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 4; + * optional .ItemList reward = 10; * @param value the reward to set * @return this */ @@ -294,19 +294,19 @@ public final class ChallengeSettleNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(stars); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 32); output.writeBoolNoTag(isWin); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 82); output.writeMessageNoTag(reward); } } @@ -336,34 +336,34 @@ public final class ChallengeSettleNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 88: { // challengeId challengeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 104) { break; } } - case 48: { + case 104: { // stars stars = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 56) { + if (tag != 32) { break; } } - case 56: { + case 32: { // isWin isWin = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 34) { + if (tag != 82) { break; } } - case 34: { + case 82: { // reward input.readMessage(reward); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java index 723b166..f60d92a 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 = 12; */ private int slot; @@ -34,7 +34,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 9; + * optional uint32 slot = 12; * @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 = 12; * @return this */ public ChangeLineupLeaderCsReq clearSlot() { @@ -52,7 +52,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 9; + * optional uint32 slot = 12; * @return the slot */ public int getSlot() { @@ -60,7 +60,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 9; + * optional uint32 slot = 12; * @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) 96); output.writeUInt32NoTag(slot); } } @@ -150,7 +150,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 96: { // 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 81efd82..9764837 100644 --- a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java @@ -19,12 +19,12 @@ public final class ChangeLineupLeaderScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 slot = 7; + * optional uint32 slot = 2; */ private int slot; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; */ private int retcode; @@ -39,7 +39,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 slot = 7; + * optional uint32 slot = 2; * @return whether the slot field is set */ public boolean hasSlot() { @@ -47,7 +47,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 slot = 7; + * optional uint32 slot = 2; * @return this */ public ChangeLineupLeaderScRsp clearSlot() { @@ -57,7 +57,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 slot = 7; + * optional uint32 slot = 2; * @return the slot */ public int getSlot() { @@ -65,7 +65,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 slot = 7; + * optional uint32 slot = 2; * @param value the slot to set * @return this */ @@ -76,7 +76,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -84,7 +84,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return this */ public ChangeLineupLeaderScRsp clearRetcode() { @@ -94,7 +94,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -102,7 +102,7 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -177,11 +177,11 @@ public final class ChangeLineupLeaderScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } } @@ -205,16 +205,16 @@ public final class ChangeLineupLeaderScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 16: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 48) { break; } } - case 80: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java index b44dfed..e697651 100644 --- a/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java @@ -19,25 +19,25 @@ public final class DoGachaCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 gacha_num = 6; + * optional uint32 gacha_num = 2; */ private int gachaNum; + /** + * optional uint32 gacha_id = 7; + */ + private int gachaId; + + /** + * optional uint32 simulate_magic = 8; + */ + private int simulateMagic; + /** * optional uint32 gacha_random = 9; */ private int gachaRandom; - /** - * optional uint32 gacha_id = 10; - */ - private int gachaId; - - /** - * optional uint32 simulate_magic = 15; - */ - private int simulateMagic; - private DoGachaCsReq() { } @@ -49,7 +49,7 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 gacha_num = 6; + * optional uint32 gacha_num = 2; * @return whether the gachaNum field is set */ public boolean hasGachaNum() { @@ -57,7 +57,7 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 gacha_num = 6; + * optional uint32 gacha_num = 2; * @return this */ public DoGachaCsReq clearGachaNum() { @@ -67,7 +67,7 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 gacha_num = 6; + * optional uint32 gacha_num = 2; * @return the gachaNum */ public int getGachaNum() { @@ -75,7 +75,7 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 gacha_num = 6; + * optional uint32 gacha_num = 2; * @param value the gachaNum to set * @return this */ @@ -85,12 +85,86 @@ public final class DoGachaCsReqOuterClass { return this; } + /** + * optional uint32 gacha_id = 7; + * @return whether the gachaId field is set + */ + public boolean hasGachaId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 gacha_id = 7; + * @return this + */ + public DoGachaCsReq clearGachaId() { + bitField0_ &= ~0x00000002; + gachaId = 0; + return this; + } + + /** + * optional uint32 gacha_id = 7; + * @return the gachaId + */ + public int getGachaId() { + return gachaId; + } + + /** + * optional uint32 gacha_id = 7; + * @param value the gachaId to set + * @return this + */ + public DoGachaCsReq setGachaId(final int value) { + bitField0_ |= 0x00000002; + gachaId = value; + return this; + } + + /** + * optional uint32 simulate_magic = 8; + * @return whether the simulateMagic field is set + */ + public boolean hasSimulateMagic() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 simulate_magic = 8; + * @return this + */ + public DoGachaCsReq clearSimulateMagic() { + bitField0_ &= ~0x00000004; + simulateMagic = 0; + return this; + } + + /** + * optional uint32 simulate_magic = 8; + * @return the simulateMagic + */ + public int getSimulateMagic() { + return simulateMagic; + } + + /** + * optional uint32 simulate_magic = 8; + * @param value the simulateMagic to set + * @return this + */ + public DoGachaCsReq setSimulateMagic(final int value) { + bitField0_ |= 0x00000004; + simulateMagic = value; + return this; + } + /** * optional uint32 gacha_random = 9; * @return whether the gachaRandom field is set */ public boolean hasGachaRandom() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -98,7 +172,7 @@ public final class DoGachaCsReqOuterClass { * @return this */ public DoGachaCsReq clearGachaRandom() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000008; gachaRandom = 0; return this; } @@ -117,82 +191,8 @@ public final class DoGachaCsReqOuterClass { * @return this */ public DoGachaCsReq setGachaRandom(final int value) { - bitField0_ |= 0x00000002; - gachaRandom = value; - return this; - } - - /** - * optional uint32 gacha_id = 10; - * @return whether the gachaId field is set - */ - public boolean hasGachaId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 gacha_id = 10; - * @return this - */ - public DoGachaCsReq clearGachaId() { - bitField0_ &= ~0x00000004; - gachaId = 0; - return this; - } - - /** - * optional uint32 gacha_id = 10; - * @return the gachaId - */ - public int getGachaId() { - return gachaId; - } - - /** - * optional uint32 gacha_id = 10; - * @param value the gachaId to set - * @return this - */ - public DoGachaCsReq setGachaId(final int value) { - bitField0_ |= 0x00000004; - gachaId = value; - return this; - } - - /** - * optional uint32 simulate_magic = 15; - * @return whether the simulateMagic field is set - */ - public boolean hasSimulateMagic() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 simulate_magic = 15; - * @return this - */ - public DoGachaCsReq clearSimulateMagic() { - bitField0_ &= ~0x00000008; - simulateMagic = 0; - return this; - } - - /** - * optional uint32 simulate_magic = 15; - * @return the simulateMagic - */ - public int getSimulateMagic() { - return simulateMagic; - } - - /** - * optional uint32 simulate_magic = 15; - * @param value the simulateMagic to set - * @return this - */ - public DoGachaCsReq setSimulateMagic(final int value) { bitField0_ |= 0x00000008; - simulateMagic = value; + gachaRandom = value; return this; } @@ -202,9 +202,9 @@ public final class DoGachaCsReqOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; gachaNum = other.gachaNum; - gachaRandom = other.gachaRandom; gachaId = other.gachaId; simulateMagic = other.simulateMagic; + gachaRandom = other.gachaRandom; } return this; } @@ -218,15 +218,15 @@ public final class DoGachaCsReqOuterClass { if (other.hasGachaNum()) { setGachaNum(other.gachaNum); } - if (other.hasGachaRandom()) { - setGachaRandom(other.gachaRandom); - } if (other.hasGachaId()) { setGachaId(other.gachaId); } if (other.hasSimulateMagic()) { setSimulateMagic(other.simulateMagic); } + if (other.hasGachaRandom()) { + setGachaRandom(other.gachaRandom); + } return this; } @@ -238,9 +238,9 @@ public final class DoGachaCsReqOuterClass { cachedSize = -1; bitField0_ = 0; gachaNum = 0; - gachaRandom = 0; gachaId = 0; simulateMagic = 0; + gachaRandom = 0; return this; } @@ -265,29 +265,29 @@ public final class DoGachaCsReqOuterClass { DoGachaCsReq other = (DoGachaCsReq) o; return bitField0_ == other.bitField0_ && (!hasGachaNum() || gachaNum == other.gachaNum) - && (!hasGachaRandom() || gachaRandom == other.gachaRandom) && (!hasGachaId() || gachaId == other.gachaId) - && (!hasSimulateMagic() || simulateMagic == other.simulateMagic); + && (!hasSimulateMagic() || simulateMagic == other.simulateMagic) + && (!hasGachaRandom() || gachaRandom == other.gachaRandom); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(gachaNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(gachaRandom); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(gachaId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 64); output.writeUInt32NoTag(simulateMagic); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(gachaRandom); + } } @Override @@ -297,14 +297,14 @@ public final class DoGachaCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(simulateMagic); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); + } return size; } @@ -315,11 +315,29 @@ public final class DoGachaCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 16: { // gachaNum gachaNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // gachaId + gachaId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // simulateMagic + simulateMagic = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 72) { break; } @@ -327,24 +345,6 @@ public final class DoGachaCsReqOuterClass { case 72: { // gachaRandom gachaRandom = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // gachaId - gachaId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // simulateMagic - simulateMagic = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -372,14 +372,14 @@ public final class DoGachaCsReqOuterClass { output.writeUInt32(FieldNames.gachaNum, gachaNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.gachaRandom, gachaRandom); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.gachaId, gachaId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.simulateMagic, simulateMagic); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.gachaRandom, gachaRandom); + } output.endObject(); } @@ -402,24 +402,12 @@ public final class DoGachaCsReqOuterClass { } break; } - case -1635961627: - case -47579616: { - if (input.isAtField(FieldNames.gachaRandom)) { - if (!input.trySkipNullValue()) { - gachaRandom = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -204751299: case -2052301576: { if (input.isAtField(FieldNames.gachaId)) { if (!input.trySkipNullValue()) { gachaId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -431,6 +419,18 @@ public final class DoGachaCsReqOuterClass { if (input.isAtField(FieldNames.simulateMagic)) { if (!input.trySkipNullValue()) { simulateMagic = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1635961627: + case -47579616: { + if (input.isAtField(FieldNames.gachaRandom)) { + if (!input.trySkipNullValue()) { + gachaRandom = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -492,11 +492,11 @@ public final class DoGachaCsReqOuterClass { static class FieldNames { static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num"); - static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); - static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); static final FieldName simulateMagic = FieldName.forField("simulateMagic", "simulate_magic"); + + static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java index 67bb737..3d2d12b 100644 --- a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java @@ -25,42 +25,21 @@ public final class DoGachaScRspOuterClass { private int gachaId; /** - * optional uint32 MNPCOHFBLFD = 8; - */ - private int mNPCOHFBLFD; - - /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 4; */ private int retcode; /** - * optional uint32 gacha_random = 10; - */ - private int gachaRandom; - - /** - * optional uint32 NMAOJEIEDAK = 11; - */ - private int nMAOJEIEDAK; - - /** - * optional uint32 LAHIAEICENE = 12; - */ - private int lAHIAEICENE; - - /** - * optional uint32 MNDHFONAGNL = 13; - */ - private int mNDHFONAGNL; - - /** - * optional uint32 gacha_num = 14; + * optional uint32 gacha_num = 5; */ private int gachaNum; /** - * repeated .GachaItem gacha_item_list = 1; + * 
+     *  IMLHGEIOOHE
+     *
+ * + * repeated .GachaItem gacha_item_list = 9; */ private final RepeatedMessage gachaItemList = RepeatedMessage.newEmptyInstance(GachaItemOuterClass.GachaItem.getFactory()); @@ -112,62 +91,25 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 MNPCOHFBLFD = 8; - * @return whether the mNPCOHFBLFD field is set + * optional uint32 retcode = 4; + * @return whether the retcode field is set */ - public boolean hasMNPCOHFBLFD() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 MNPCOHFBLFD = 8; - * @return this - */ - public DoGachaScRsp clearMNPCOHFBLFD() { - bitField0_ &= ~0x00000002; - mNPCOHFBLFD = 0; - return this; - } - - /** - * optional uint32 MNPCOHFBLFD = 8; - * @return the mNPCOHFBLFD - */ - public int getMNPCOHFBLFD() { - return mNPCOHFBLFD; - } - - /** - * optional uint32 MNPCOHFBLFD = 8; - * @param value the mNPCOHFBLFD to set - * @return this - */ - public DoGachaScRsp setMNPCOHFBLFD(final int value) { - bitField0_ |= 0x00000002; - mNPCOHFBLFD = value; - return this; - } - - /** - * optional uint32 retcode = 9; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 4; * @return this */ public DoGachaScRsp clearRetcode() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; retcode = 0; return this; } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -175,184 +117,36 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ public DoGachaScRsp setRetcode(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; retcode = value; return this; } /** - * optional uint32 gacha_random = 10; - * @return whether the gachaRandom field is set - */ - public boolean hasGachaRandom() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 gacha_random = 10; - * @return this - */ - public DoGachaScRsp clearGachaRandom() { - bitField0_ &= ~0x00000008; - gachaRandom = 0; - return this; - } - - /** - * optional uint32 gacha_random = 10; - * @return the gachaRandom - */ - public int getGachaRandom() { - return gachaRandom; - } - - /** - * optional uint32 gacha_random = 10; - * @param value the gachaRandom to set - * @return this - */ - public DoGachaScRsp setGachaRandom(final int value) { - bitField0_ |= 0x00000008; - gachaRandom = value; - return this; - } - - /** - * optional uint32 NMAOJEIEDAK = 11; - * @return whether the nMAOJEIEDAK field is set - */ - public boolean hasNMAOJEIEDAK() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 NMAOJEIEDAK = 11; - * @return this - */ - public DoGachaScRsp clearNMAOJEIEDAK() { - bitField0_ &= ~0x00000010; - nMAOJEIEDAK = 0; - return this; - } - - /** - * optional uint32 NMAOJEIEDAK = 11; - * @return the nMAOJEIEDAK - */ - public int getNMAOJEIEDAK() { - return nMAOJEIEDAK; - } - - /** - * optional uint32 NMAOJEIEDAK = 11; - * @param value the nMAOJEIEDAK to set - * @return this - */ - public DoGachaScRsp setNMAOJEIEDAK(final int value) { - bitField0_ |= 0x00000010; - nMAOJEIEDAK = value; - return this; - } - - /** - * optional uint32 LAHIAEICENE = 12; - * @return whether the lAHIAEICENE field is set - */ - public boolean hasLAHIAEICENE() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 LAHIAEICENE = 12; - * @return this - */ - public DoGachaScRsp clearLAHIAEICENE() { - bitField0_ &= ~0x00000020; - lAHIAEICENE = 0; - return this; - } - - /** - * optional uint32 LAHIAEICENE = 12; - * @return the lAHIAEICENE - */ - public int getLAHIAEICENE() { - return lAHIAEICENE; - } - - /** - * optional uint32 LAHIAEICENE = 12; - * @param value the lAHIAEICENE to set - * @return this - */ - public DoGachaScRsp setLAHIAEICENE(final int value) { - bitField0_ |= 0x00000020; - lAHIAEICENE = value; - return this; - } - - /** - * optional uint32 MNDHFONAGNL = 13; - * @return whether the mNDHFONAGNL field is set - */ - public boolean hasMNDHFONAGNL() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional uint32 MNDHFONAGNL = 13; - * @return this - */ - public DoGachaScRsp clearMNDHFONAGNL() { - bitField0_ &= ~0x00000040; - mNDHFONAGNL = 0; - return this; - } - - /** - * optional uint32 MNDHFONAGNL = 13; - * @return the mNDHFONAGNL - */ - public int getMNDHFONAGNL() { - return mNDHFONAGNL; - } - - /** - * optional uint32 MNDHFONAGNL = 13; - * @param value the mNDHFONAGNL to set - * @return this - */ - public DoGachaScRsp setMNDHFONAGNL(final int value) { - bitField0_ |= 0x00000040; - mNDHFONAGNL = value; - return this; - } - - /** - * optional uint32 gacha_num = 14; + * optional uint32 gacha_num = 5; * @return whether the gachaNum field is set */ public boolean hasGachaNum() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 gacha_num = 14; + * optional uint32 gacha_num = 5; * @return this */ public DoGachaScRsp clearGachaNum() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000004; gachaNum = 0; return this; } /** - * optional uint32 gacha_num = 14; + * optional uint32 gacha_num = 5; * @return the gachaNum */ public int getGachaNum() { @@ -360,36 +154,48 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 gacha_num = 14; + * optional uint32 gacha_num = 5; * @param value the gachaNum to set * @return this */ public DoGachaScRsp setGachaNum(final int value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000004; gachaNum = value; return this; } /** - * repeated .GachaItem gacha_item_list = 1; + * 
+     *  IMLHGEIOOHE
+     *
+ * + * repeated .GachaItem gacha_item_list = 9; * @return whether the gachaItemList field is set */ public boolean hasGachaItemList() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * repeated .GachaItem gacha_item_list = 1; + * 
+     *  IMLHGEIOOHE
+     *
+ * + * repeated .GachaItem gacha_item_list = 9; * @return this */ public DoGachaScRsp clearGachaItemList() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000008; gachaItemList.clear(); return this; } /** - * repeated .GachaItem gacha_item_list = 1; + * 
+     *  IMLHGEIOOHE
+     *
+ * + * repeated .GachaItem gacha_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. @@ -403,7 +209,11 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 1; + * 
+     *  IMLHGEIOOHE
+     *
+ * + * repeated .GachaItem gacha_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 @@ -412,28 +222,36 @@ public final class DoGachaScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableGachaItemList() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000008; return gachaItemList; } /** - * repeated .GachaItem gacha_item_list = 1; + * 
+     *  IMLHGEIOOHE
+     *
+ * + * repeated .GachaItem gacha_item_list = 9; * @param value the gachaItemList to add * @return this */ public DoGachaScRsp addGachaItemList(final GachaItemOuterClass.GachaItem value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000008; gachaItemList.add(value); return this; } /** - * repeated .GachaItem gacha_item_list = 1; + * 
+     *  IMLHGEIOOHE
+     *
+ * + * repeated .GachaItem gacha_item_list = 9; * @param values the gachaItemList to add * @return this */ public DoGachaScRsp addAllGachaItemList(final GachaItemOuterClass.GachaItem... values) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000008; gachaItemList.addAll(values); return this; } @@ -444,12 +262,7 @@ public final class DoGachaScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; gachaId = other.gachaId; - mNPCOHFBLFD = other.mNPCOHFBLFD; retcode = other.retcode; - gachaRandom = other.gachaRandom; - nMAOJEIEDAK = other.nMAOJEIEDAK; - lAHIAEICENE = other.lAHIAEICENE; - mNDHFONAGNL = other.mNDHFONAGNL; gachaNum = other.gachaNum; gachaItemList.copyFrom(other.gachaItemList); } @@ -465,24 +278,9 @@ public final class DoGachaScRspOuterClass { if (other.hasGachaId()) { setGachaId(other.gachaId); } - if (other.hasMNPCOHFBLFD()) { - setMNPCOHFBLFD(other.mNPCOHFBLFD); - } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasGachaRandom()) { - setGachaRandom(other.gachaRandom); - } - if (other.hasNMAOJEIEDAK()) { - setNMAOJEIEDAK(other.nMAOJEIEDAK); - } - if (other.hasLAHIAEICENE()) { - setLAHIAEICENE(other.lAHIAEICENE); - } - if (other.hasMNDHFONAGNL()) { - setMNDHFONAGNL(other.mNDHFONAGNL); - } if (other.hasGachaNum()) { setGachaNum(other.gachaNum); } @@ -500,12 +298,7 @@ public final class DoGachaScRspOuterClass { cachedSize = -1; bitField0_ = 0; gachaId = 0; - mNPCOHFBLFD = 0; retcode = 0; - gachaRandom = 0; - nMAOJEIEDAK = 0; - lAHIAEICENE = 0; - mNDHFONAGNL = 0; gachaNum = 0; gachaItemList.clear(); return this; @@ -533,12 +326,7 @@ public final class DoGachaScRspOuterClass { DoGachaScRsp other = (DoGachaScRsp) o; return bitField0_ == other.bitField0_ && (!hasGachaId() || gachaId == other.gachaId) - && (!hasMNPCOHFBLFD() || mNPCOHFBLFD == other.mNPCOHFBLFD) && (!hasRetcode() || retcode == other.retcode) - && (!hasGachaRandom() || gachaRandom == other.gachaRandom) - && (!hasNMAOJEIEDAK() || nMAOJEIEDAK == other.nMAOJEIEDAK) - && (!hasLAHIAEICENE() || lAHIAEICENE == other.lAHIAEICENE) - && (!hasMNDHFONAGNL() || mNDHFONAGNL == other.mNDHFONAGNL) && (!hasGachaNum() || gachaNum == other.gachaNum) && (!hasGachaItemList() || gachaItemList.equals(other.gachaItemList)); } @@ -550,36 +338,16 @@ public final class DoGachaScRspOuterClass { output.writeUInt32NoTag(gachaId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(mNPCOHFBLFD); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(gachaRandom); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(nMAOJEIEDAK); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(lAHIAEICENE); - } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(mNDHFONAGNL); - } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 112); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 40); output.writeUInt32NoTag(gachaNum); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < gachaItemList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 74); output.writeMessageNoTag(gachaItemList.get(i)); } } @@ -592,27 +360,12 @@ public final class DoGachaScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mNPCOHFBLFD); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); - } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(nMAOJEIEDAK); - } - if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lAHIAEICENE); - } - if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mNDHFONAGNL); - } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += (1 * gachaItemList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(gachaItemList); } return size; @@ -630,77 +383,32 @@ public final class DoGachaScRspOuterClass { gachaId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 32) { break; } } - case 64: { - // mNPCOHFBLFD - mNPCOHFBLFD = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 32: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 40) { break; } } - case 80: { - // gachaRandom - gachaRandom = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // nMAOJEIEDAK - nMAOJEIEDAK = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // lAHIAEICENE - lAHIAEICENE = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // mNDHFONAGNL - mNDHFONAGNL = input.readUInt32(); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 40: { // gachaNum gachaNum = input.readUInt32(); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 10) { + if (tag != 74) { break; } } - case 10: { + case 74: { // gachaItemList tag = input.readRepeatedMessage(gachaItemList, tag); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000008; if (tag != 0) { break; } @@ -726,27 +434,12 @@ public final class DoGachaScRspOuterClass { output.writeUInt32(FieldNames.gachaId, gachaId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.mNPCOHFBLFD, mNPCOHFBLFD); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.gachaRandom, gachaRandom); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.nMAOJEIEDAK, nMAOJEIEDAK); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.lAHIAEICENE, lAHIAEICENE); - } - if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.mNDHFONAGNL, mNDHFONAGNL); - } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.gachaNum, gachaNum); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.gachaItemList, gachaItemList); } output.endObject(); @@ -771,67 +464,11 @@ public final class DoGachaScRspOuterClass { } break; } - case -1906412607: { - if (input.isAtField(FieldNames.mNPCOHFBLFD)) { - if (!input.trySkipNullValue()) { - mNPCOHFBLFD = 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 -1635961627: - case -47579616: { - if (input.isAtField(FieldNames.gachaRandom)) { - if (!input.trySkipNullValue()) { - gachaRandom = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1343431082: { - if (input.isAtField(FieldNames.nMAOJEIEDAK)) { - if (!input.trySkipNullValue()) { - nMAOJEIEDAK = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1968665032: { - if (input.isAtField(FieldNames.lAHIAEICENE)) { - if (!input.trySkipNullValue()) { - lAHIAEICENE = input.readUInt32(); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } - case -757519100: { - if (input.isAtField(FieldNames.mNDHFONAGNL)) { - if (!input.trySkipNullValue()) { - mNDHFONAGNL = input.readUInt32(); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -843,7 +480,7 @@ public final class DoGachaScRspOuterClass { if (input.isAtField(FieldNames.gachaNum)) { if (!input.trySkipNullValue()) { gachaNum = input.readUInt32(); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -855,7 +492,7 @@ public final class DoGachaScRspOuterClass { if (input.isAtField(FieldNames.gachaItemList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(gachaItemList); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -916,18 +553,8 @@ public final class DoGachaScRspOuterClass { static class FieldNames { static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); - static final FieldName mNPCOHFBLFD = FieldName.forField("MNPCOHFBLFD"); - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); - - static final FieldName nMAOJEIEDAK = FieldName.forField("NMAOJEIEDAK"); - - static final FieldName lAHIAEICENE = FieldName.forField("LAHIAEICENE"); - - static final FieldName mNDHFONAGNL = FieldName.forField("MNDHFONAGNL"); - static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num"); static final FieldName gachaItemList = FieldName.forField("gachaItemList", "gacha_item_list"); diff --git a/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java index d792820..f256b59 100644 --- a/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java @@ -24,7 +24,7 @@ public final class DressAvatarCsReqOuterClass { private int equipmentUniqueId; /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 15; */ private int baseAvatarId; @@ -76,7 +76,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 15; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -84,7 +84,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 15; * @return this */ public DressAvatarCsReq clearBaseAvatarId() { @@ -94,7 +94,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 15; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -102,7 +102,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 15; * @param value the baseAvatarId to set * @return this */ @@ -181,7 +181,7 @@ public final class DressAvatarCsReqOuterClass { output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(baseAvatarId); } } @@ -210,11 +210,11 @@ public final class DressAvatarCsReqOuterClass { equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 120) { break; } } - case 96: { + case 120: { // 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 084946b..5f3d582 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 = 10; + * optional uint32 base_avatar_id = 6; */ private int baseAvatarId; /** - * repeated .RelicParam param_list = 15; + * repeated .RelicParam param_list = 12; */ private final RepeatedMessage paramList = RepeatedMessage.newEmptyInstance(RelicParamOuterClass.RelicParam.getFactory()); @@ -40,7 +40,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 6; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -48,7 +48,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 6; * @return this */ public DressRelicAvatarCsReq clearBaseAvatarId() { @@ -58,7 +58,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 6; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -66,7 +66,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 6; * @param value the baseAvatarId to set * @return this */ @@ -77,7 +77,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 15; + * repeated .RelicParam param_list = 12; * @return whether the paramList field is set */ public boolean hasParamList() { @@ -85,7 +85,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 15; + * repeated .RelicParam param_list = 12; * @return this */ public DressRelicAvatarCsReq clearParamList() { @@ -95,7 +95,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 15; + * repeated .RelicParam param_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 DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 15; + * repeated .RelicParam param_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 DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 15; + * repeated .RelicParam param_list = 12; * @param value the paramList to add * @return this */ @@ -134,7 +134,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 15; + * repeated .RelicParam param_list = 12; * @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) 80); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < paramList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 98); output.writeMessageNoTag(paramList.get(i)); } } @@ -240,16 +240,16 @@ public final class DressRelicAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 48: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 98) { break; } } - case 122: { + case 98: { // paramList tag = input.readRepeatedMessage(paramList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java index 730c7d0..5020d97 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java @@ -19,20 +19,20 @@ public final class EnterSceneByServerScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .EnterSceneReason reason = 5; + * optional .EnterSceneReason reason = 3; */ private int reason; /** - * optional .LineupInfo lineup = 14; - */ - private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); - - /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 8; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); + /** + * optional .LineupInfo lineup = 12; + */ + private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); + private EnterSceneByServerScNotify() { } @@ -44,7 +44,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 5; + * optional .EnterSceneReason reason = 3; * @return whether the reason field is set */ public boolean hasReason() { @@ -52,7 +52,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 5; + * optional .EnterSceneReason reason = 3; * @return this */ public EnterSceneByServerScNotify clearReason() { @@ -62,7 +62,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 5; + * optional .EnterSceneReason reason = 3; * @return the reason */ public EnterSceneReasonOuterClass.EnterSceneReason getReason() { @@ -95,7 +95,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 5; + * optional .EnterSceneReason reason = 3; * @param value the reason to set * @return this */ @@ -107,82 +107,25 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 14; - * @return whether the lineup field is set + * optional .SceneInfo scene = 8; + * @return whether the scene field is set */ - public boolean hasLineup() { + public boolean hasScene() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .LineupInfo lineup = 14; - * @return this - */ - public EnterSceneByServerScNotify clearLineup() { - bitField0_ &= ~0x00000002; - lineup.clear(); - return this; - } - - /** - * optional .LineupInfo lineup = 14; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableLineup()} if you want to modify it. - * - * @return internal storage object for reading - */ - public LineupInfoOuterClass.LineupInfo getLineup() { - return lineup; - } - - /** - * optional .LineupInfo lineup = 14; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public LineupInfoOuterClass.LineupInfo getMutableLineup() { - bitField0_ |= 0x00000002; - return lineup; - } - - /** - * optional .LineupInfo lineup = 14; - * @param value the lineup to set - * @return this - */ - public EnterSceneByServerScNotify setLineup(final LineupInfoOuterClass.LineupInfo value) { - bitField0_ |= 0x00000002; - lineup.copyFrom(value); - return this; - } - - /** - * optional .SceneInfo scene = 15; - * @return whether the scene field is set - */ - public boolean hasScene() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 8; * @return this */ public EnterSceneByServerScNotify clearScene() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; scene.clear(); return this; } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -196,7 +139,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -205,29 +148,86 @@ public final class EnterSceneByServerScNotifyOuterClass { * @return internal storage object for modifications */ public SceneInfoOuterClass.SceneInfo getMutableScene() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return scene; } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 8; * @param value the scene to set * @return this */ public EnterSceneByServerScNotify setScene(final SceneInfoOuterClass.SceneInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; scene.copyFrom(value); return this; } + /** + * optional .LineupInfo lineup = 12; + * @return whether the lineup field is set + */ + public boolean hasLineup() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .LineupInfo lineup = 12; + * @return this + */ + public EnterSceneByServerScNotify 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 EnterSceneByServerScNotify setLineup(final LineupInfoOuterClass.LineupInfo value) { + bitField0_ |= 0x00000004; + lineup.copyFrom(value); + return this; + } + @Override public EnterSceneByServerScNotify copyFrom(final EnterSceneByServerScNotify other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; reason = other.reason; - lineup.copyFrom(other.lineup); scene.copyFrom(other.scene); + lineup.copyFrom(other.lineup); } return this; } @@ -241,12 +241,12 @@ public final class EnterSceneByServerScNotifyOuterClass { if (other.hasReason()) { setReasonValue(other.reason); } - if (other.hasLineup()) { - getMutableLineup().mergeFrom(other.lineup); - } if (other.hasScene()) { getMutableScene().mergeFrom(other.scene); } + if (other.hasLineup()) { + getMutableLineup().mergeFrom(other.lineup); + } return this; } @@ -258,8 +258,8 @@ public final class EnterSceneByServerScNotifyOuterClass { cachedSize = -1; bitField0_ = 0; reason = 0; - lineup.clear(); scene.clear(); + lineup.clear(); return this; } @@ -270,8 +270,8 @@ public final class EnterSceneByServerScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - lineup.clearQuick(); scene.clearQuick(); + lineup.clearQuick(); return this; } @@ -286,23 +286,23 @@ public final class EnterSceneByServerScNotifyOuterClass { EnterSceneByServerScNotify other = (EnterSceneByServerScNotify) o; return bitField0_ == other.bitField0_ && (!hasReason() || reason == other.reason) - && (!hasLineup() || lineup.equals(other.lineup)) - && (!hasScene() || scene.equals(other.scene)); + && (!hasScene() || scene.equals(other.scene)) + && (!hasLineup() || lineup.equals(other.lineup)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 24); output.writeEnumNoTag(reason); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(lineup); + output.writeRawByte((byte) 66); + output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(scene); + output.writeRawByte((byte) 98); + output.writeMessageNoTag(lineup); } } @@ -313,10 +313,10 @@ public final class EnterSceneByServerScNotifyOuterClass { size += 1 + ProtoSink.computeEnumSizeNoTag(reason); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); + size += 1 + ProtoSink.computeMessageSizeNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(scene); + size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); } return size; } @@ -328,7 +328,7 @@ public final class EnterSceneByServerScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 24: { // reason final int value = input.readInt32(); if (EnterSceneReasonOuterClass.EnterSceneReason.forNumber(value) != null) { @@ -336,22 +336,22 @@ public final class EnterSceneByServerScNotifyOuterClass { bitField0_ |= 0x00000001; } tag = input.readTag(); - if (tag != 114) { + if (tag != 66) { break; } } - case 114: { - // lineup - input.readMessage(lineup); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { + case 66: { // scene input.readMessage(scene); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // lineup + input.readMessage(lineup); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -379,10 +379,10 @@ public final class EnterSceneByServerScNotifyOuterClass { output.writeEnum(FieldNames.reason, reason, EnterSceneReasonOuterClass.EnterSceneReason.converter()); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.lineup, lineup); + output.writeMessage(FieldNames.scene, scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.scene, scene); + output.writeMessage(FieldNames.lineup, lineup); } output.endObject(); } @@ -410,10 +410,10 @@ public final class EnterSceneByServerScNotifyOuterClass { } break; } - case -1102671473: { - if (input.isAtField(FieldNames.lineup)) { + case 109254796: { + if (input.isAtField(FieldNames.scene)) { if (!input.trySkipNullValue()) { - input.readMessage(lineup); + input.readMessage(scene); bitField0_ |= 0x00000002; } } else { @@ -421,10 +421,10 @@ public final class EnterSceneByServerScNotifyOuterClass { } break; } - case 109254796: { - if (input.isAtField(FieldNames.scene)) { + case -1102671473: { + if (input.isAtField(FieldNames.lineup)) { if (!input.trySkipNullValue()) { - input.readMessage(scene); + input.readMessage(lineup); bitField0_ |= 0x00000004; } } else { @@ -487,9 +487,9 @@ public final class EnterSceneByServerScNotifyOuterClass { static class FieldNames { static final FieldName reason = FieldName.forField("reason"); - static final FieldName lineup = FieldName.forField("lineup"); - static final FieldName scene = FieldName.forField("scene"); + + static final FieldName lineup = FieldName.forField("lineup"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java index 66722e8..c1c5acc 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java @@ -19,15 +19,15 @@ public final class EnterSceneCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entry_id = 4; - */ - private int entryId; - - /** - * optional uint32 teleport_id = 9; + * optional uint32 teleport_id = 3; */ private int teleportId; + /** + * optional uint32 entry_id = 5; + */ + private int entryId; + private EnterSceneCsReq() { } @@ -39,62 +39,25 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 entry_id = 4; - * @return whether the entryId field is set + * optional uint32 teleport_id = 3; + * @return whether the teleportId field is set */ - public boolean hasEntryId() { + public boolean hasTeleportId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entry_id = 4; - * @return this - */ - public EnterSceneCsReq clearEntryId() { - bitField0_ &= ~0x00000001; - entryId = 0; - return this; - } - - /** - * optional uint32 entry_id = 4; - * @return the entryId - */ - public int getEntryId() { - return entryId; - } - - /** - * optional uint32 entry_id = 4; - * @param value the entryId to set - * @return this - */ - public EnterSceneCsReq setEntryId(final int value) { - bitField0_ |= 0x00000001; - entryId = value; - return this; - } - - /** - * optional uint32 teleport_id = 9; - * @return whether the teleportId field is set - */ - public boolean hasTeleportId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 teleport_id = 9; + * optional uint32 teleport_id = 3; * @return this */ public EnterSceneCsReq clearTeleportId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; teleportId = 0; return this; } /** - * optional uint32 teleport_id = 9; + * optional uint32 teleport_id = 3; * @return the teleportId */ public int getTeleportId() { @@ -102,23 +65,60 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 teleport_id = 9; + * optional uint32 teleport_id = 3; * @param value the teleportId to set * @return this */ public EnterSceneCsReq setTeleportId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; teleportId = value; return this; } + /** + * optional uint32 entry_id = 5; + * @return whether the entryId field is set + */ + public boolean hasEntryId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 entry_id = 5; + * @return this + */ + public EnterSceneCsReq clearEntryId() { + bitField0_ &= ~0x00000002; + entryId = 0; + return this; + } + + /** + * optional uint32 entry_id = 5; + * @return the entryId + */ + public int getEntryId() { + return entryId; + } + + /** + * optional uint32 entry_id = 5; + * @param value the entryId to set + * @return this + */ + public EnterSceneCsReq setEntryId(final int value) { + bitField0_ |= 0x00000002; + entryId = value; + return this; + } + @Override public EnterSceneCsReq copyFrom(final EnterSceneCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - entryId = other.entryId; teleportId = other.teleportId; + entryId = other.entryId; } return this; } @@ -129,12 +129,12 @@ public final class EnterSceneCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasEntryId()) { - setEntryId(other.entryId); - } if (other.hasTeleportId()) { setTeleportId(other.teleportId); } + if (other.hasEntryId()) { + setEntryId(other.entryId); + } return this; } @@ -145,8 +145,8 @@ public final class EnterSceneCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - entryId = 0; teleportId = 0; + entryId = 0; return this; } @@ -170,19 +170,19 @@ public final class EnterSceneCsReqOuterClass { } EnterSceneCsReq other = (EnterSceneCsReq) o; return bitField0_ == other.bitField0_ - && (!hasEntryId() || entryId == other.entryId) - && (!hasTeleportId() || teleportId == other.teleportId); + && (!hasTeleportId() || teleportId == other.teleportId) + && (!hasEntryId() || entryId == other.entryId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(entryId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(teleportId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(teleportId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(entryId); } } @@ -190,10 +190,10 @@ public final class EnterSceneCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(teleportId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(teleportId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } return size; } @@ -205,18 +205,18 @@ public final class EnterSceneCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // entryId - entryId = input.readUInt32(); + case 24: { + // teleportId + teleportId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 40) { break; } } - case 72: { - // teleportId - teleportId = input.readUInt32(); + case 40: { + // entryId + entryId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class EnterSceneCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); + output.writeUInt32(FieldNames.teleportId, teleportId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.teleportId, teleportId); + output.writeUInt32(FieldNames.entryId, entryId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class EnterSceneCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1591558867: - case -2093663224: { - if (input.isAtField(FieldNames.entryId)) { + case -1484004954: + case 1240508079: { + if (input.isAtField(FieldNames.teleportId)) { if (!input.trySkipNullValue()) { - entryId = input.readUInt32(); + teleportId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class EnterSceneCsReqOuterClass { } break; } - case -1484004954: - case 1240508079: { - if (input.isAtField(FieldNames.teleportId)) { + case -1591558867: + case -2093663224: { + if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { - teleportId = input.readUInt32(); + entryId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class EnterSceneCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - static final FieldName teleportId = FieldName.forField("teleportId", "teleport_id"); + + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java index a4e417a..d8c200b 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 = 2; + * optional uint32 entity_id = 8; */ private int entityId; /** - * optional uint32 map_layer = 6; + * optional uint32 map_layer = 9; */ private int mapLayer; /** - * optional .MotionInfo motion = 9; + * optional .MotionInfo motion = 3; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -44,7 +44,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 entity_id = 2; + * optional uint32 entity_id = 8; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -52,7 +52,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 entity_id = 2; + * optional uint32 entity_id = 8; * @return this */ public EntityMotion clearEntityId() { @@ -62,7 +62,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 entity_id = 2; + * optional uint32 entity_id = 8; * @return the entityId */ public int getEntityId() { @@ -70,7 +70,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 entity_id = 2; + * optional uint32 entity_id = 8; * @param value the entityId to set * @return this */ @@ -81,7 +81,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 map_layer = 6; + * optional uint32 map_layer = 9; * @return whether the mapLayer field is set */ public boolean hasMapLayer() { @@ -89,7 +89,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 map_layer = 6; + * optional uint32 map_layer = 9; * @return this */ public EntityMotion clearMapLayer() { @@ -99,7 +99,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 map_layer = 6; + * optional uint32 map_layer = 9; * @return the mapLayer */ public int getMapLayer() { @@ -107,7 +107,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 map_layer = 6; + * optional uint32 map_layer = 9; * @param value the mapLayer to set * @return this */ @@ -118,7 +118,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 9; + * optional .MotionInfo motion = 3; * @return whether the motion field is set */ public boolean hasMotion() { @@ -126,7 +126,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 9; + * optional .MotionInfo motion = 3; * @return this */ public EntityMotion clearMotion() { @@ -136,7 +136,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 9; + * optional .MotionInfo motion = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 9; + * optional .MotionInfo motion = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 9; + * optional .MotionInfo motion = 3; * @param value the motion to set * @return this */ @@ -246,15 +246,15 @@ public final class EntityMotionOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(mapLayer); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 26); output.writeMessageNoTag(motion); } } @@ -281,25 +281,25 @@ public final class EntityMotionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 64: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 72) { break; } } - case 48: { + case 72: { // mapLayer mapLayer = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 74) { + if (tag != 26) { break; } } - case 74: { + case 26: { // motion input.readMessage(motion); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java b/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java index fe29c00..56347bf 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 = 4; + * optional uint32 slot = 12; */ private int slot; /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 13; */ private int relicUniqueId; @@ -39,7 +39,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 slot = 4; + * optional uint32 slot = 12; * @return whether the slot field is set */ public boolean hasSlot() { @@ -47,7 +47,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 slot = 4; + * optional uint32 slot = 12; * @return this */ public EquipRelic clearSlot() { @@ -57,7 +57,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 slot = 4; + * optional uint32 slot = 12; * @return the slot */ public int getSlot() { @@ -65,7 +65,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 slot = 4; + * optional uint32 slot = 12; * @param value the slot to set * @return this */ @@ -76,7 +76,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 13; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -84,7 +84,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 13; * @return this */ public EquipRelic clearRelicUniqueId() { @@ -94,7 +94,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 13; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -102,7 +102,7 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 13; * @param value the relicUniqueId to set * @return this */ @@ -177,11 +177,11 @@ public final class EquipRelicOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(relicUniqueId); } } @@ -205,16 +205,16 @@ public final class EquipRelicOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 96: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { + case 104: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java b/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java index 831b5d8..5fb70b0 100644 --- a/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java @@ -19,42 +19,42 @@ public final class EquipmentOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 promotion = 2; - */ - private int promotion; - - /** - * optional uint32 unique_id = 4; - */ - private int uniqueId; - - /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 1; */ private int baseAvatarId; /** - * optional uint32 tid = 6; - */ - private int tid; - - /** - * optional uint32 exp = 7; - */ - private int exp; - - /** - * optional uint32 level = 9; - */ - private int level; - - /** - * optional uint32 rank = 11; + * optional uint32 rank = 2; */ private int rank; /** - * optional bool is_protected = 12; + * optional uint32 level = 4; + */ + private int level; + + /** + * optional uint32 exp = 6; + */ + private int exp; + + /** + * optional uint32 tid = 7; + */ + private int tid; + + /** + * optional uint32 unique_id = 10; + */ + private int uniqueId; + + /** + * optional uint32 promotion = 15; + */ + private int promotion; + + /** + * optional bool is_protected = 5; */ private boolean isProtected; @@ -69,99 +69,25 @@ public final class EquipmentOuterClass { } /** - * optional uint32 promotion = 2; - * @return whether the promotion field is set + * optional uint32 base_avatar_id = 1; + * @return whether the baseAvatarId field is set */ - public boolean hasPromotion() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 promotion = 2; - * @return this - */ - public Equipment clearPromotion() { - bitField0_ &= ~0x00000001; - promotion = 0; - return this; - } - - /** - * optional uint32 promotion = 2; - * @return the promotion - */ - public int getPromotion() { - return promotion; - } - - /** - * optional uint32 promotion = 2; - * @param value the promotion to set - * @return this - */ - public Equipment setPromotion(final int value) { - bitField0_ |= 0x00000001; - promotion = value; - return this; - } - - /** - * optional uint32 unique_id = 4; - * @return whether the uniqueId field is set - */ - public boolean hasUniqueId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 unique_id = 4; - * @return this - */ - public Equipment clearUniqueId() { - bitField0_ &= ~0x00000002; - uniqueId = 0; - return this; - } - - /** - * optional uint32 unique_id = 4; - * @return the uniqueId - */ - public int getUniqueId() { - return uniqueId; - } - - /** - * optional uint32 unique_id = 4; - * @param value the uniqueId to set - * @return this - */ - public Equipment setUniqueId(final int value) { - bitField0_ |= 0x00000002; - uniqueId = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 5; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 1; * @return this */ public Equipment clearBaseAvatarId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; baseAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 1; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -169,147 +95,36 @@ public final class EquipmentOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 1; * @param value the baseAvatarId to set * @return this */ public Equipment setBaseAvatarId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; baseAvatarId = value; return this; } /** - * optional uint32 tid = 6; - * @return whether the tid field is set - */ - public boolean hasTid() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 tid = 6; - * @return this - */ - public Equipment clearTid() { - bitField0_ &= ~0x00000008; - tid = 0; - return this; - } - - /** - * optional uint32 tid = 6; - * @return the tid - */ - public int getTid() { - return tid; - } - - /** - * optional uint32 tid = 6; - * @param value the tid to set - * @return this - */ - public Equipment setTid(final int value) { - bitField0_ |= 0x00000008; - tid = value; - return this; - } - - /** - * optional uint32 exp = 7; - * @return whether the exp field is set - */ - public boolean hasExp() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 exp = 7; - * @return this - */ - public Equipment clearExp() { - bitField0_ &= ~0x00000010; - exp = 0; - return this; - } - - /** - * optional uint32 exp = 7; - * @return the exp - */ - public int getExp() { - return exp; - } - - /** - * optional uint32 exp = 7; - * @param value the exp to set - * @return this - */ - public Equipment setExp(final int value) { - bitField0_ |= 0x00000010; - exp = value; - return this; - } - - /** - * optional uint32 level = 9; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 level = 9; - * @return this - */ - public Equipment clearLevel() { - bitField0_ &= ~0x00000020; - level = 0; - return this; - } - - /** - * optional uint32 level = 9; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 9; - * @param value the level to set - * @return this - */ - public Equipment setLevel(final int value) { - bitField0_ |= 0x00000020; - level = value; - return this; - } - - /** - * optional uint32 rank = 11; + * optional uint32 rank = 2; * @return whether the rank field is set */ public boolean hasRank() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 rank = 11; + * optional uint32 rank = 2; * @return this */ public Equipment clearRank() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000002; rank = 0; return this; } /** - * optional uint32 rank = 11; + * optional uint32 rank = 2; * @return the rank */ public int getRank() { @@ -317,18 +132,203 @@ public final class EquipmentOuterClass { } /** - * optional uint32 rank = 11; + * optional uint32 rank = 2; * @param value the rank to set * @return this */ public Equipment setRank(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000002; rank = value; return this; } /** - * optional bool is_protected = 12; + * optional uint32 level = 4; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 level = 4; + * @return this + */ + public Equipment clearLevel() { + bitField0_ &= ~0x00000004; + 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 Equipment setLevel(final int value) { + bitField0_ |= 0x00000004; + level = value; + return this; + } + + /** + * optional uint32 exp = 6; + * @return whether the exp field is set + */ + public boolean hasExp() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 exp = 6; + * @return this + */ + public Equipment clearExp() { + bitField0_ &= ~0x00000008; + 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_ |= 0x00000008; + exp = value; + return this; + } + + /** + * optional uint32 tid = 7; + * @return whether the tid field is set + */ + public boolean hasTid() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 tid = 7; + * @return this + */ + public Equipment clearTid() { + bitField0_ &= ~0x00000010; + tid = 0; + return this; + } + + /** + * optional uint32 tid = 7; + * @return the tid + */ + public int getTid() { + return tid; + } + + /** + * optional uint32 tid = 7; + * @param value the tid to set + * @return this + */ + public Equipment setTid(final int value) { + bitField0_ |= 0x00000010; + tid = value; + return this; + } + + /** + * optional uint32 unique_id = 10; + * @return whether the uniqueId field is set + */ + public boolean hasUniqueId() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 unique_id = 10; + * @return this + */ + public Equipment clearUniqueId() { + bitField0_ &= ~0x00000020; + uniqueId = 0; + return this; + } + + /** + * optional uint32 unique_id = 10; + * @return the uniqueId + */ + public int getUniqueId() { + return uniqueId; + } + + /** + * optional uint32 unique_id = 10; + * @param value the uniqueId to set + * @return this + */ + public Equipment setUniqueId(final int value) { + bitField0_ |= 0x00000020; + uniqueId = 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 = 5; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -336,7 +336,7 @@ public final class EquipmentOuterClass { } /** - * optional bool is_protected = 12; + * optional bool is_protected = 5; * @return this */ public Equipment clearIsProtected() { @@ -346,7 +346,7 @@ public final class EquipmentOuterClass { } /** - * optional bool is_protected = 12; + * optional bool is_protected = 5; * @return the isProtected */ public boolean getIsProtected() { @@ -354,7 +354,7 @@ public final class EquipmentOuterClass { } /** - * optional bool is_protected = 12; + * optional bool is_protected = 5; * @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_; - promotion = other.promotion; - uniqueId = other.uniqueId; baseAvatarId = other.baseAvatarId; - tid = other.tid; - exp = other.exp; - level = other.level; rank = other.rank; + level = other.level; + exp = other.exp; + tid = other.tid; + uniqueId = other.uniqueId; + promotion = other.promotion; isProtected = other.isProtected; } return this; @@ -387,26 +387,26 @@ public final class EquipmentOuterClass { return this; } cachedSize = -1; - if (other.hasPromotion()) { - setPromotion(other.promotion); - } - if (other.hasUniqueId()) { - setUniqueId(other.uniqueId); - } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } - if (other.hasTid()) { - setTid(other.tid); - } - if (other.hasExp()) { - setExp(other.exp); + if (other.hasRank()) { + setRank(other.rank); } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasRank()) { - setRank(other.rank); + if (other.hasExp()) { + setExp(other.exp); + } + if (other.hasTid()) { + setTid(other.tid); + } + if (other.hasUniqueId()) { + setUniqueId(other.uniqueId); + } + if (other.hasPromotion()) { + setPromotion(other.promotion); } if (other.hasIsProtected()) { setIsProtected(other.isProtected); @@ -421,13 +421,13 @@ public final class EquipmentOuterClass { } cachedSize = -1; bitField0_ = 0; - promotion = 0; - uniqueId = 0; baseAvatarId = 0; - tid = 0; - exp = 0; - level = 0; rank = 0; + level = 0; + exp = 0; + tid = 0; + uniqueId = 0; + promotion = 0; isProtected = false; return this; } @@ -452,48 +452,48 @@ public final class EquipmentOuterClass { } Equipment other = (Equipment) o; return bitField0_ == other.bitField0_ - && (!hasPromotion() || promotion == other.promotion) - && (!hasUniqueId() || uniqueId == other.uniqueId) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasTid() || tid == other.tid) - && (!hasExp() || exp == other.exp) - && (!hasLevel() || level == other.level) && (!hasRank() || rank == other.rank) + && (!hasLevel() || level == other.level) + && (!hasExp() || exp == other.exp) + && (!hasTid() || tid == other.tid) + && (!hasUniqueId() || uniqueId == other.uniqueId) + && (!hasPromotion() || promotion == other.promotion) && (!hasIsProtected() || isProtected == other.isProtected); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(promotion); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(uniqueId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 48); - output.writeUInt32NoTag(tid); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 56); - output.writeUInt32NoTag(exp); + output.writeUInt32NoTag(tid); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(uniqueId); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(rank); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 40); 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(promotion); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); + } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } if ((bitField0_ & 0x00000080) != 0) { size += 2; @@ -535,27 +535,27 @@ public final class EquipmentOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // promotion - promotion = input.readUInt32(); + case 8: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { + // rank + rank = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 32) { break; } } case 32: { - // uniqueId - uniqueId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + // level + level = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 48) { @@ -563,8 +563,8 @@ public final class EquipmentOuterClass { } } case 48: { - // tid - tid = input.readUInt32(); + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 56) { @@ -572,33 +572,33 @@ public final class EquipmentOuterClass { } } case 56: { - // exp - exp = input.readUInt32(); + // tid + tid = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 72) { + if (tag != 80) { break; } } - case 72: { - // level - level = input.readUInt32(); + case 80: { + // uniqueId + uniqueId = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 88) { + if (tag != 120) { break; } } - case 88: { - // rank - rank = input.readUInt32(); + case 120: { + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 96) { + if (tag != 40) { break; } } - case 96: { + case 40: { // 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.promotion, promotion); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.uniqueId, uniqueId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.tid, tid); + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.rank, rank); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.exp, exp); - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.level, level); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.exp, exp); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.tid, tid); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.uniqueId, uniqueId); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.rank, rank); + output.writeUInt32(FieldNames.promotion, promotion); } if ((bitField0_ & 0x00000080) != 0) { output.writeBool(FieldNames.isProtected, isProtected); @@ -658,10 +658,11 @@ public final class EquipmentOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -669,56 +670,55 @@ public final class EquipmentOuterClass { } break; } + case 3492908: { + if (input.isAtField(FieldNames.rank)) { + if (!input.trySkipNullValue()) { + rank = 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 100893: { + if (input.isAtField(FieldNames.exp)) { + if (!input.trySkipNullValue()) { + exp = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 114831: { + if (input.isAtField(FieldNames.tid)) { + if (!input.trySkipNullValue()) { + tid = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } case -294460212: case -538310583: { if (input.isAtField(FieldNames.uniqueId)) { if (!input.trySkipNullValue()) { uniqueId = 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; - } - } else { - input.skipUnknownField(); - } - break; - } - case 114831: { - if (input.isAtField(FieldNames.tid)) { - if (!input.trySkipNullValue()) { - tid = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 100893: { - if (input.isAtField(FieldNames.exp)) { - if (!input.trySkipNullValue()) { - exp = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -726,10 +726,10 @@ public final class EquipmentOuterClass { } break; } - case 3492908: { - if (input.isAtField(FieldNames.rank)) { + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { if (!input.trySkipNullValue()) { - rank = input.readUInt32(); + 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 promotion = FieldName.forField("promotion"); - - static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - static final FieldName tid = FieldName.forField("tid"); - - static final FieldName exp = FieldName.forField("exp"); + static final FieldName rank = FieldName.forField("rank"); static final FieldName level = FieldName.forField("level"); - static final FieldName rank = FieldName.forField("rank"); + static final FieldName exp = FieldName.forField("exp"); + + static final FieldName tid = FieldName.forField("tid"); + + static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); + + 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/ExpUpEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java index 29fce20..f6a10f1 100644 --- a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java @@ -19,12 +19,16 @@ public final class ExpUpEquipmentCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 7; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 3; + * 
+     *  CJAFGLDKEHD
+     *
+ * + * optional .ItemCostList item_cost_list = 9; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +43,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 7; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +51,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 7; * @return this */ public ExpUpEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +61,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 7; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +69,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 7; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +80,11 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * 
+     *  CJAFGLDKEHD
+     *
+ * + * optional .ItemCostList item_cost_list = 9; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +92,11 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * 
+     *  CJAFGLDKEHD
+     *
+ * + * optional .ItemCostList item_cost_list = 9; * @return this */ public ExpUpEquipmentCsReq clearItemCostList() { @@ -94,7 +106,11 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * 
+     *  CJAFGLDKEHD
+     *
+ * + * 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 +124,11 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * 
+     *  CJAFGLDKEHD
+     *
+ * + * 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 +142,11 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * 
+     *  CJAFGLDKEHD
+     *
+ * + * optional .ItemCostList item_cost_list = 9; * @param value the itemCostList to set * @return this */ @@ -198,11 +222,11 @@ public final class ExpUpEquipmentCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 74); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +250,16 @@ public final class ExpUpEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 56: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 74) { break; } } - case 26: { + case 74: { // 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 18910bd..4e76608 100644 --- a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java @@ -20,12 +20,12 @@ public final class ExpUpEquipmentScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 4; */ private int retcode; /** - * repeated .PileItem return_item_list = 11; + * repeated .PileItem return_item_list = 2; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 4; * @return this */ public ExpUpEquipmentScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 11; + * repeated .PileItem return_item_list = 2; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 11; + * repeated .PileItem return_item_list = 2; * @return this */ public ExpUpEquipmentScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 11; + * repeated .PileItem return_item_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 11; + * repeated .PileItem return_item_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 11; + * repeated .PileItem return_item_list = 2; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 11; + * repeated .PileItem return_item_list = 2; * @param values the returnItemList to add * @return this */ @@ -210,12 +210,12 @@ public final class ExpUpEquipmentScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 18); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public final class ExpUpEquipmentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 18) { break; } } - case 90: { + case 18: { // 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 7485fc2..df5383e 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 = 6; + * optional uint32 relic_unique_id = 7; */ private int relicUniqueId; /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 8; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 6; + * optional uint32 relic_unique_id = 7; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -47,7 +47,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 6; + * optional uint32 relic_unique_id = 7; * @return this */ public ExpUpRelicCsReq clearRelicUniqueId() { @@ -57,7 +57,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 6; + * optional uint32 relic_unique_id = 7; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -65,7 +65,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 6; + * optional uint32 relic_unique_id = 7; * @param value the relicUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 8; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 8; * @return this */ public ExpUpRelicCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 8; * @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) 48); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 66); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class ExpUpRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 56: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 66) { break; } } - case 10: { + case 66: { // 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 5b0de43..1cedb90 100644 --- a/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java @@ -20,12 +20,12 @@ public final class ExpUpRelicScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 5; */ private int retcode; /** - * repeated .PileItem return_item_list = 3; + * repeated .PileItem return_item_list = 8; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 5; * @return this */ public ExpUpRelicScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 3; + * repeated .PileItem return_item_list = 8; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 3; + * repeated .PileItem return_item_list = 8; * @return this */ public ExpUpRelicScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 3; + * repeated .PileItem return_item_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 3; + * repeated .PileItem return_item_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 3; + * repeated .PileItem return_item_list = 8; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 3; + * repeated .PileItem return_item_list = 8; * @param values the returnItemList to add * @return this */ @@ -210,12 +210,12 @@ public final class ExpUpRelicScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 66); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public final class ExpUpRelicScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 66) { break; } } - case 26: { + case 66: { // returnItemList tag = input.readRepeatedMessage(returnItemList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/FriendAvatarInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendAvatarInfoOuterClass.java index e6c6d39..ae1ddb8 100644 --- a/src/generated/main/emu/lunarcore/proto/FriendAvatarInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FriendAvatarInfoOuterClass.java @@ -19,15 +19,20 @@ public final class FriendAvatarInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 level = 8; + * optional uint32 equipment_unique_id = 3; */ - private int level; + private int equipmentUniqueId; /** - * optional uint32 avatar_id = 13; + * optional uint32 avatar_id = 6; */ private int avatarId; + /** + * optional uint32 level = 10; + */ + private int level; + private FriendAvatarInfo() { } @@ -39,44 +44,44 @@ public final class FriendAvatarInfoOuterClass { } /** - * optional uint32 level = 8; - * @return whether the level field is set + * optional uint32 equipment_unique_id = 3; + * @return whether the equipmentUniqueId field is set */ - public boolean hasLevel() { + public boolean hasEquipmentUniqueId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 level = 8; + * optional uint32 equipment_unique_id = 3; * @return this */ - public FriendAvatarInfo clearLevel() { + public FriendAvatarInfo clearEquipmentUniqueId() { bitField0_ &= ~0x00000001; - level = 0; + equipmentUniqueId = 0; return this; } /** - * optional uint32 level = 8; - * @return the level + * optional uint32 equipment_unique_id = 3; + * @return the equipmentUniqueId */ - public int getLevel() { - return level; + public int getEquipmentUniqueId() { + return equipmentUniqueId; } /** - * optional uint32 level = 8; - * @param value the level to set + * optional uint32 equipment_unique_id = 3; + * @param value the equipmentUniqueId to set * @return this */ - public FriendAvatarInfo setLevel(final int value) { + public FriendAvatarInfo setEquipmentUniqueId(final int value) { bitField0_ |= 0x00000001; - level = value; + equipmentUniqueId = value; return this; } /** - * optional uint32 avatar_id = 13; + * optional uint32 avatar_id = 6; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -84,7 +89,7 @@ public final class FriendAvatarInfoOuterClass { } /** - * optional uint32 avatar_id = 13; + * optional uint32 avatar_id = 6; * @return this */ public FriendAvatarInfo clearAvatarId() { @@ -94,7 +99,7 @@ public final class FriendAvatarInfoOuterClass { } /** - * optional uint32 avatar_id = 13; + * optional uint32 avatar_id = 6; * @return the avatarId */ public int getAvatarId() { @@ -102,7 +107,7 @@ public final class FriendAvatarInfoOuterClass { } /** - * optional uint32 avatar_id = 13; + * optional uint32 avatar_id = 6; * @param value the avatarId to set * @return this */ @@ -112,13 +117,51 @@ public final class FriendAvatarInfoOuterClass { 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 FriendAvatarInfo 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 FriendAvatarInfo setLevel(final int value) { + bitField0_ |= 0x00000004; + level = value; + return this; + } + @Override public FriendAvatarInfo copyFrom(final FriendAvatarInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - level = other.level; + equipmentUniqueId = other.equipmentUniqueId; avatarId = other.avatarId; + level = other.level; } return this; } @@ -129,12 +172,15 @@ public final class FriendAvatarInfoOuterClass { return this; } cachedSize = -1; - if (other.hasLevel()) { - setLevel(other.level); + if (other.hasEquipmentUniqueId()) { + setEquipmentUniqueId(other.equipmentUniqueId); } if (other.hasAvatarId()) { setAvatarId(other.avatarId); } + if (other.hasLevel()) { + setLevel(other.level); + } return this; } @@ -145,8 +191,9 @@ public final class FriendAvatarInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - level = 0; + equipmentUniqueId = 0; avatarId = 0; + level = 0; return this; } @@ -170,31 +217,39 @@ public final class FriendAvatarInfoOuterClass { } FriendAvatarInfo other = (FriendAvatarInfo) o; return bitField0_ == other.bitField0_ - && (!hasLevel() || level == other.level) - && (!hasAvatarId() || avatarId == other.avatarId); + && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) + && (!hasAvatarId() || avatarId == other.avatarId) + && (!hasLevel() || level == other.level); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(avatarId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(level); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } return size; } @@ -205,20 +260,29 @@ public final class FriendAvatarInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // level - level = input.readUInt32(); + case 24: { + // equipmentUniqueId + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 48) { break; } } - case 104: { + case 48: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 0) { break; } @@ -241,11 +305,14 @@ public final class FriendAvatarInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.avatarId, avatarId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.level, level); + } output.endObject(); } @@ -256,10 +323,11 @@ public final class FriendAvatarInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case -1867136902: + case 760467160: { + if (input.isAtField(FieldNames.equipmentUniqueId)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -279,6 +347,17 @@ public final class FriendAvatarInfoOuterClass { } break; } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -332,9 +411,11 @@ public final class FriendAvatarInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName level = FieldName.forField("level"); + static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); + + static final FieldName level = FieldName.forField("level"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java index d3dc78b..cf443ff 100644 --- a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java @@ -20,14 +20,14 @@ public final class FriendListInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .SimpleInfo simple_info = 9; + * optional .SimpleInfo simple_info = 11; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); /** - * optional string EOLJAAMDENK = 4; + * optional string IJHBIGOHDIC = 2; */ - private final Utf8String eOLJAAMDENK = Utf8String.newEmptyInstance(); + private final Utf8String iJHBIGOHDIC = Utf8String.newEmptyInstance(); private FriendListInfo() { } @@ -40,7 +40,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 9; + * optional .SimpleInfo simple_info = 11; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -48,7 +48,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 9; + * optional .SimpleInfo simple_info = 11; * @return this */ public FriendListInfo clearSimpleInfo() { @@ -58,7 +58,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 9; + * optional .SimpleInfo simple_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. @@ -72,7 +72,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 9; + * optional .SimpleInfo simple_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 @@ -86,7 +86,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 9; + * optional .SimpleInfo simple_info = 11; * @param value the simpleInfo to set * @return this */ @@ -97,67 +97,67 @@ public final class FriendListInfoOuterClass { } /** - * optional string EOLJAAMDENK = 4; - * @return whether the eOLJAAMDENK field is set + * optional string IJHBIGOHDIC = 2; + * @return whether the iJHBIGOHDIC field is set */ - public boolean hasEOLJAAMDENK() { + public boolean hasIJHBIGOHDIC() { return (bitField0_ & 0x00000002) != 0; } /** - * optional string EOLJAAMDENK = 4; + * optional string IJHBIGOHDIC = 2; * @return this */ - public FriendListInfo clearEOLJAAMDENK() { + public FriendListInfo clearIJHBIGOHDIC() { bitField0_ &= ~0x00000002; - eOLJAAMDENK.clear(); + iJHBIGOHDIC.clear(); return this; } /** - * optional string EOLJAAMDENK = 4; - * @return the eOLJAAMDENK + * optional string IJHBIGOHDIC = 2; + * @return the iJHBIGOHDIC */ - public String getEOLJAAMDENK() { - return eOLJAAMDENK.getString(); + public String getIJHBIGOHDIC() { + return iJHBIGOHDIC.getString(); } /** - * optional string EOLJAAMDENK = 4; - * @return internal {@code Utf8String} representation of eOLJAAMDENK for reading + * optional string IJHBIGOHDIC = 2; + * @return internal {@code Utf8String} representation of iJHBIGOHDIC for reading */ - public Utf8String getEOLJAAMDENKBytes() { - return this.eOLJAAMDENK; + public Utf8String getIJHBIGOHDICBytes() { + return this.iJHBIGOHDIC; } /** - * optional string EOLJAAMDENK = 4; - * @return internal {@code Utf8String} representation of eOLJAAMDENK for modifications + * optional string IJHBIGOHDIC = 2; + * @return internal {@code Utf8String} representation of iJHBIGOHDIC for modifications */ - public Utf8String getMutableEOLJAAMDENKBytes() { + public Utf8String getMutableIJHBIGOHDICBytes() { bitField0_ |= 0x00000002; - return this.eOLJAAMDENK; + return this.iJHBIGOHDIC; } /** - * optional string EOLJAAMDENK = 4; - * @param value the eOLJAAMDENK to set + * optional string IJHBIGOHDIC = 2; + * @param value the iJHBIGOHDIC to set * @return this */ - public FriendListInfo setEOLJAAMDENK(final CharSequence value) { + public FriendListInfo setIJHBIGOHDIC(final CharSequence value) { bitField0_ |= 0x00000002; - eOLJAAMDENK.copyFrom(value); + iJHBIGOHDIC.copyFrom(value); return this; } /** - * optional string EOLJAAMDENK = 4; - * @param value the eOLJAAMDENK to set + * optional string IJHBIGOHDIC = 2; + * @param value the iJHBIGOHDIC to set * @return this */ - public FriendListInfo setEOLJAAMDENK(final Utf8String value) { + public FriendListInfo setIJHBIGOHDIC(final Utf8String value) { bitField0_ |= 0x00000002; - eOLJAAMDENK.copyFrom(value); + iJHBIGOHDIC.copyFrom(value); return this; } @@ -167,7 +167,7 @@ public final class FriendListInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; simpleInfo.copyFrom(other.simpleInfo); - eOLJAAMDENK.copyFrom(other.eOLJAAMDENK); + iJHBIGOHDIC.copyFrom(other.iJHBIGOHDIC); } return this; } @@ -181,8 +181,8 @@ public final class FriendListInfoOuterClass { if (other.hasSimpleInfo()) { getMutableSimpleInfo().mergeFrom(other.simpleInfo); } - if (other.hasEOLJAAMDENK()) { - getMutableEOLJAAMDENKBytes().copyFrom(other.eOLJAAMDENK); + if (other.hasIJHBIGOHDIC()) { + getMutableIJHBIGOHDICBytes().copyFrom(other.iJHBIGOHDIC); } return this; } @@ -195,7 +195,7 @@ public final class FriendListInfoOuterClass { cachedSize = -1; bitField0_ = 0; simpleInfo.clear(); - eOLJAAMDENK.clear(); + iJHBIGOHDIC.clear(); return this; } @@ -207,7 +207,7 @@ public final class FriendListInfoOuterClass { cachedSize = -1; bitField0_ = 0; simpleInfo.clearQuick(); - eOLJAAMDENK.clear(); + iJHBIGOHDIC.clear(); return this; } @@ -222,18 +222,18 @@ public final class FriendListInfoOuterClass { FriendListInfo other = (FriendListInfo) o; return bitField0_ == other.bitField0_ && (!hasSimpleInfo() || simpleInfo.equals(other.simpleInfo)) - && (!hasEOLJAAMDENK() || eOLJAAMDENK.equals(other.eOLJAAMDENK)); + && (!hasIJHBIGOHDIC() || iJHBIGOHDIC.equals(other.iJHBIGOHDIC)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 90); output.writeMessageNoTag(simpleInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); - output.writeStringNoTag(eOLJAAMDENK); + output.writeRawByte((byte) 18); + output.writeStringNoTag(iJHBIGOHDIC); } } @@ -244,7 +244,7 @@ public final class FriendListInfoOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(simpleInfo); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(eOLJAAMDENK); + size += 1 + ProtoSink.computeStringSizeNoTag(iJHBIGOHDIC); } return size; } @@ -256,18 +256,18 @@ public final class FriendListInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 90: { // simpleInfo input.readMessage(simpleInfo); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 18) { break; } } - case 34: { - // eOLJAAMDENK - input.readString(eOLJAAMDENK); + case 18: { + // iJHBIGOHDIC + input.readString(iJHBIGOHDIC); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -295,7 +295,7 @@ public final class FriendListInfoOuterClass { output.writeMessage(FieldNames.simpleInfo, simpleInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeString(FieldNames.eOLJAAMDENK, eOLJAAMDENK); + output.writeString(FieldNames.iJHBIGOHDIC, iJHBIGOHDIC); } output.endObject(); } @@ -319,10 +319,10 @@ public final class FriendListInfoOuterClass { } break; } - case 1903367939: { - if (input.isAtField(FieldNames.eOLJAAMDENK)) { + case 554201932: { + if (input.isAtField(FieldNames.iJHBIGOHDIC)) { if (!input.trySkipNullValue()) { - input.readString(eOLJAAMDENK); + input.readString(iJHBIGOHDIC); bitField0_ |= 0x00000002; } } else { @@ -385,7 +385,7 @@ public final class FriendListInfoOuterClass { static class FieldNames { static final FieldName simpleInfo = FieldName.forField("simpleInfo", "simple_info"); - static final FieldName eOLJAAMDENK = FieldName.forField("EOLJAAMDENK"); + static final FieldName iJHBIGOHDIC = FieldName.forField("IJHBIGOHDIC"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java index 7fb53fd..c94eff8 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java @@ -21,60 +21,42 @@ public final class GachaInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 1; + * optional int64 begin_time = 9; */ private long beginTime; /** - * optional int64 end_time = 3; + * optional int64 end_time = 12; */ private long endTime; /** - * optional uint32 MNDHFONAGNL = 5; - */ - private int mNDHFONAGNL; - - /** - * optional uint32 gacha_id = 10; + * optional uint32 gacha_id = 2; */ private int gachaId; /** - * optional uint32 MNPCOHFBLFD = 15; - */ - private int mNPCOHFBLFD; - - /** - * optional .GachaCeiling gacha_ceiling = 4; + * optional .GachaCeiling gacha_ceiling = 10; */ private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); /** - * optional string history_url = 12; - */ - private final Utf8String historyUrl = Utf8String.newEmptyInstance(); - - /** - * optional string detail_url = 13; + * optional string detail_url = 1; */ private final Utf8String detailUrl = Utf8String.newEmptyInstance(); /** - * 
-     *  prize
-     *
- * - * repeated uint32 featured = 6; + * optional string history_url = 6; + */ + private final Utf8String historyUrl = Utf8String.newEmptyInstance(); + + /** + * repeated uint32 featured = 13; */ private final RepeatedInt featured = RepeatedInt.newEmptyInstance(); /** - * 
-     *  details
-     *
- * - * repeated uint32 up_info = 11; + * repeated uint32 up_info = 14; */ private final RepeatedInt upInfo = RepeatedInt.newEmptyInstance(); @@ -89,7 +71,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 begin_time = 1; + * optional int64 begin_time = 9; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -97,7 +79,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 begin_time = 1; + * optional int64 begin_time = 9; * @return this */ public GachaInfo clearBeginTime() { @@ -107,7 +89,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 begin_time = 1; + * optional int64 begin_time = 9; * @return the beginTime */ public long getBeginTime() { @@ -115,7 +97,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 begin_time = 1; + * optional int64 begin_time = 9; * @param value the beginTime to set * @return this */ @@ -126,7 +108,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 3; + * optional int64 end_time = 12; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -134,7 +116,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 3; + * optional int64 end_time = 12; * @return this */ public GachaInfo clearEndTime() { @@ -144,7 +126,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 3; + * optional int64 end_time = 12; * @return the endTime */ public long getEndTime() { @@ -152,7 +134,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 3; + * optional int64 end_time = 12; * @param value the endTime to set * @return this */ @@ -163,62 +145,25 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 MNDHFONAGNL = 5; - * @return whether the mNDHFONAGNL field is set + * optional uint32 gacha_id = 2; + * @return whether the gachaId field is set */ - public boolean hasMNDHFONAGNL() { + public boolean hasGachaId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 MNDHFONAGNL = 5; - * @return this - */ - public GachaInfo clearMNDHFONAGNL() { - bitField0_ &= ~0x00000004; - mNDHFONAGNL = 0; - return this; - } - - /** - * optional uint32 MNDHFONAGNL = 5; - * @return the mNDHFONAGNL - */ - public int getMNDHFONAGNL() { - return mNDHFONAGNL; - } - - /** - * optional uint32 MNDHFONAGNL = 5; - * @param value the mNDHFONAGNL to set - * @return this - */ - public GachaInfo setMNDHFONAGNL(final int value) { - bitField0_ |= 0x00000004; - mNDHFONAGNL = value; - return this; - } - - /** - * optional uint32 gacha_id = 10; - * @return whether the gachaId field is set - */ - public boolean hasGachaId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 gacha_id = 10; + * optional uint32 gacha_id = 2; * @return this */ public GachaInfo clearGachaId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; gachaId = 0; return this; } /** - * optional uint32 gacha_id = 10; + * optional uint32 gacha_id = 2; * @return the gachaId */ public int getGachaId() { @@ -226,73 +171,36 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 10; + * optional uint32 gacha_id = 2; * @param value the gachaId to set * @return this */ public GachaInfo setGachaId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; gachaId = value; return this; } /** - * optional uint32 MNPCOHFBLFD = 15; - * @return whether the mNPCOHFBLFD field is set - */ - public boolean hasMNPCOHFBLFD() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 MNPCOHFBLFD = 15; - * @return this - */ - public GachaInfo clearMNPCOHFBLFD() { - bitField0_ &= ~0x00000010; - mNPCOHFBLFD = 0; - return this; - } - - /** - * optional uint32 MNPCOHFBLFD = 15; - * @return the mNPCOHFBLFD - */ - public int getMNPCOHFBLFD() { - return mNPCOHFBLFD; - } - - /** - * optional uint32 MNPCOHFBLFD = 15; - * @param value the mNPCOHFBLFD to set - * @return this - */ - public GachaInfo setMNPCOHFBLFD(final int value) { - bitField0_ |= 0x00000010; - mNPCOHFBLFD = value; - return this; - } - - /** - * optional .GachaCeiling gacha_ceiling = 4; + * optional .GachaCeiling gacha_ceiling = 10; * @return whether the gachaCeiling field is set */ public boolean hasGachaCeiling() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional .GachaCeiling gacha_ceiling = 4; + * optional .GachaCeiling gacha_ceiling = 10; * @return this */ public GachaInfo clearGachaCeiling() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000008; gachaCeiling.clear(); return this; } /** - * optional .GachaCeiling gacha_ceiling = 4; + * optional .GachaCeiling gacha_ceiling = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -306,7 +214,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 4; + * optional .GachaCeiling gacha_ceiling = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -315,106 +223,41 @@ public final class GachaInfoOuterClass { * @return internal storage object for modifications */ public GachaCeilingOuterClass.GachaCeiling getMutableGachaCeiling() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; return gachaCeiling; } /** - * optional .GachaCeiling gacha_ceiling = 4; + * optional .GachaCeiling gacha_ceiling = 10; * @param value the gachaCeiling to set * @return this */ public GachaInfo setGachaCeiling(final GachaCeilingOuterClass.GachaCeiling value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; gachaCeiling.copyFrom(value); return this; } /** - * optional string history_url = 12; - * @return whether the historyUrl field is set - */ - public boolean hasHistoryUrl() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional string history_url = 12; - * @return this - */ - public GachaInfo clearHistoryUrl() { - bitField0_ &= ~0x00000040; - historyUrl.clear(); - return this; - } - - /** - * optional string history_url = 12; - * @return the historyUrl - */ - public String getHistoryUrl() { - return historyUrl.getString(); - } - - /** - * optional string history_url = 12; - * @return internal {@code Utf8String} representation of historyUrl for reading - */ - public Utf8String getHistoryUrlBytes() { - return this.historyUrl; - } - - /** - * optional string history_url = 12; - * @return internal {@code Utf8String} representation of historyUrl for modifications - */ - public Utf8String getMutableHistoryUrlBytes() { - bitField0_ |= 0x00000040; - return this.historyUrl; - } - - /** - * optional string history_url = 12; - * @param value the historyUrl to set - * @return this - */ - public GachaInfo setHistoryUrl(final CharSequence value) { - bitField0_ |= 0x00000040; - historyUrl.copyFrom(value); - return this; - } - - /** - * optional string history_url = 12; - * @param value the historyUrl to set - * @return this - */ - public GachaInfo setHistoryUrl(final Utf8String value) { - bitField0_ |= 0x00000040; - historyUrl.copyFrom(value); - return this; - } - - /** - * optional string detail_url = 13; + * optional string detail_url = 1; * @return whether the detailUrl field is set */ public boolean hasDetailUrl() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000010) != 0; } /** - * optional string detail_url = 13; + * optional string detail_url = 1; * @return this */ public GachaInfo clearDetailUrl() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000010; detailUrl.clear(); return this; } /** - * optional string detail_url = 13; + * optional string detail_url = 1; * @return the detailUrl */ public String getDetailUrl() { @@ -422,7 +265,7 @@ public final class GachaInfoOuterClass { } /** - * optional string detail_url = 13; + * optional string detail_url = 1; * @return internal {@code Utf8String} representation of detailUrl for reading */ public Utf8String getDetailUrlBytes() { @@ -430,68 +273,121 @@ public final class GachaInfoOuterClass { } /** - * optional string detail_url = 13; + * optional string detail_url = 1; * @return internal {@code Utf8String} representation of detailUrl for modifications */ public Utf8String getMutableDetailUrlBytes() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; return this.detailUrl; } /** - * optional string detail_url = 13; + * optional string detail_url = 1; * @param value the detailUrl to set * @return this */ public GachaInfo setDetailUrl(final CharSequence value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; detailUrl.copyFrom(value); return this; } /** - * optional string detail_url = 13; + * optional string detail_url = 1; * @param value the detailUrl to set * @return this */ public GachaInfo setDetailUrl(final Utf8String value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; detailUrl.copyFrom(value); return this; } /** - * 
-     *  prize
-     *
- * - * repeated uint32 featured = 6; - * @return whether the featured field is set + * optional string history_url = 6; + * @return whether the historyUrl field is set */ - public boolean hasFeatured() { - return (bitField0_ & 0x00000100) != 0; + public boolean hasHistoryUrl() { + return (bitField0_ & 0x00000020) != 0; } /** - * 
-     *  prize
-     *
- * - * repeated uint32 featured = 6; + * optional string history_url = 6; + * @return this + */ + public GachaInfo clearHistoryUrl() { + bitField0_ &= ~0x00000020; + historyUrl.clear(); + return this; + } + + /** + * optional string history_url = 6; + * @return the historyUrl + */ + public String getHistoryUrl() { + return historyUrl.getString(); + } + + /** + * optional string history_url = 6; + * @return internal {@code Utf8String} representation of historyUrl for reading + */ + public Utf8String getHistoryUrlBytes() { + return this.historyUrl; + } + + /** + * optional string history_url = 6; + * @return internal {@code Utf8String} representation of historyUrl for modifications + */ + public Utf8String getMutableHistoryUrlBytes() { + bitField0_ |= 0x00000020; + return this.historyUrl; + } + + /** + * optional string history_url = 6; + * @param value the historyUrl to set + * @return this + */ + public GachaInfo setHistoryUrl(final CharSequence value) { + bitField0_ |= 0x00000020; + historyUrl.copyFrom(value); + return this; + } + + /** + * optional string history_url = 6; + * @param value the historyUrl to set + * @return this + */ + public GachaInfo setHistoryUrl(final Utf8String value) { + bitField0_ |= 0x00000020; + historyUrl.copyFrom(value); + return this; + } + + /** + * repeated uint32 featured = 13; + * @return whether the featured field is set + */ + public boolean hasFeatured() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * repeated uint32 featured = 13; * @return this */ public GachaInfo clearFeatured() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000040; featured.clear(); return this; } /** - * 
-     *  prize
-     *
- * - * repeated uint32 featured = 6; + * repeated uint32 featured = 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. @@ -505,11 +401,7 @@ public final class GachaInfoOuterClass { } /** - * 
-     *  prize
-     *
- * - * repeated uint32 featured = 6; + * repeated uint32 featured = 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 @@ -518,72 +410,52 @@ public final class GachaInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableFeatured() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; return featured; } /** - * 
-     *  prize
-     *
- * - * repeated uint32 featured = 6; + * repeated uint32 featured = 13; * @param value the featured to add * @return this */ public GachaInfo addFeatured(final int value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; featured.add(value); return this; } /** - * 
-     *  prize
-     *
- * - * repeated uint32 featured = 6; + * repeated uint32 featured = 13; * @param values the featured to add * @return this */ public GachaInfo addAllFeatured(final int... values) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; featured.addAll(values); return this; } /** - * 
-     *  details
-     *
- * - * repeated uint32 up_info = 11; + * repeated uint32 up_info = 14; * @return whether the upInfo field is set */ public boolean hasUpInfo() { - return (bitField0_ & 0x00000200) != 0; + return (bitField0_ & 0x00000080) != 0; } /** - * 
-     *  details
-     *
- * - * repeated uint32 up_info = 11; + * repeated uint32 up_info = 14; * @return this */ public GachaInfo clearUpInfo() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000080; upInfo.clear(); return this; } /** - * 
-     *  details
-     *
- * - * repeated uint32 up_info = 11; + * repeated uint32 up_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. @@ -597,11 +469,7 @@ public final class GachaInfoOuterClass { } /** - * 
-     *  details
-     *
- * - * repeated uint32 up_info = 11; + * repeated uint32 up_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 @@ -610,36 +478,28 @@ public final class GachaInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableUpInfo() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; return upInfo; } /** - * 
-     *  details
-     *
- * - * repeated uint32 up_info = 11; + * repeated uint32 up_info = 14; * @param value the upInfo to add * @return this */ public GachaInfo addUpInfo(final int value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; upInfo.add(value); return this; } /** - * 
-     *  details
-     *
- * - * repeated uint32 up_info = 11; + * repeated uint32 up_info = 14; * @param values the upInfo to add * @return this */ public GachaInfo addAllUpInfo(final int... values) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; upInfo.addAll(values); return this; } @@ -651,12 +511,10 @@ public final class GachaInfoOuterClass { bitField0_ = other.bitField0_; beginTime = other.beginTime; endTime = other.endTime; - mNDHFONAGNL = other.mNDHFONAGNL; gachaId = other.gachaId; - mNPCOHFBLFD = other.mNPCOHFBLFD; gachaCeiling.copyFrom(other.gachaCeiling); - historyUrl.copyFrom(other.historyUrl); detailUrl.copyFrom(other.detailUrl); + historyUrl.copyFrom(other.historyUrl); featured.copyFrom(other.featured); upInfo.copyFrom(other.upInfo); } @@ -675,24 +533,18 @@ public final class GachaInfoOuterClass { if (other.hasEndTime()) { setEndTime(other.endTime); } - if (other.hasMNDHFONAGNL()) { - setMNDHFONAGNL(other.mNDHFONAGNL); - } if (other.hasGachaId()) { setGachaId(other.gachaId); } - if (other.hasMNPCOHFBLFD()) { - setMNPCOHFBLFD(other.mNPCOHFBLFD); - } if (other.hasGachaCeiling()) { getMutableGachaCeiling().mergeFrom(other.gachaCeiling); } - if (other.hasHistoryUrl()) { - getMutableHistoryUrlBytes().copyFrom(other.historyUrl); - } if (other.hasDetailUrl()) { getMutableDetailUrlBytes().copyFrom(other.detailUrl); } + if (other.hasHistoryUrl()) { + getMutableHistoryUrlBytes().copyFrom(other.historyUrl); + } if (other.hasFeatured()) { getMutableFeatured().addAll(other.featured); } @@ -711,12 +563,10 @@ public final class GachaInfoOuterClass { bitField0_ = 0; beginTime = 0L; endTime = 0L; - mNDHFONAGNL = 0; gachaId = 0; - mNPCOHFBLFD = 0; gachaCeiling.clear(); - historyUrl.clear(); detailUrl.clear(); + historyUrl.clear(); featured.clear(); upInfo.clear(); return this; @@ -730,8 +580,8 @@ public final class GachaInfoOuterClass { cachedSize = -1; bitField0_ = 0; gachaCeiling.clearQuick(); - historyUrl.clear(); detailUrl.clear(); + historyUrl.clear(); featured.clear(); upInfo.clear(); return this; @@ -749,12 +599,10 @@ public final class GachaInfoOuterClass { return bitField0_ == other.bitField0_ && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) - && (!hasMNDHFONAGNL() || mNDHFONAGNL == other.mNDHFONAGNL) && (!hasGachaId() || gachaId == other.gachaId) - && (!hasMNPCOHFBLFD() || mNPCOHFBLFD == other.mNPCOHFBLFD) && (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling)) - && (!hasHistoryUrl() || historyUrl.equals(other.historyUrl)) && (!hasDetailUrl() || detailUrl.equals(other.detailUrl)) + && (!hasHistoryUrl() || historyUrl.equals(other.historyUrl)) && (!hasFeatured() || featured.equals(other.featured)) && (!hasUpInfo() || upInfo.equals(other.upInfo)); } @@ -762,46 +610,38 @@ public final class GachaInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 72); output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 96); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(mNDHFONAGNL); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(gachaId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(mNPCOHFBLFD); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 34); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 82); output.writeMessageNoTag(gachaCeiling); } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 98); - output.writeStringNoTag(historyUrl); - } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 106); + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 10); output.writeStringNoTag(detailUrl); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 50); + output.writeStringNoTag(historyUrl); + } + if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < featured.length(); i++) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(featured.array()[i]); } } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000080) != 0) { for (int i = 0; i < upInfo.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(upInfo.array()[i]); } } @@ -817,27 +657,21 @@ public final class GachaInfoOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mNDHFONAGNL); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mNPCOHFBLFD); - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(gachaCeiling); } - if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(historyUrl); - } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(detailUrl); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeStringSizeNoTag(historyUrl); + } + if ((bitField0_ & 0x00000040) != 0) { size += (1 * featured.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(featured); } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000080) != 0) { size += (1 * upInfo.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(upInfo); } return size; @@ -850,91 +684,73 @@ public final class GachaInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 72: { // beginTime beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 96) { break; } } - case 24: { + case 96: { // endTime endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 16) { break; } } - case 40: { - // mNDHFONAGNL - mNDHFONAGNL = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 16: { // gachaId gachaId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 120) { + if (tag != 82) { break; } } - case 120: { - // mNPCOHFBLFD - mNPCOHFBLFD = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 34) { - break; - } - } - case 34: { + case 82: { // gachaCeiling input.readMessage(gachaCeiling); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 98) { + if (tag != 10) { break; } } - case 98: { - // historyUrl - input.readString(historyUrl); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { + case 10: { // detailUrl input.readString(detailUrl); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 50) { break; } } case 50: { - // featured [packed=true] - input.readPackedUInt32(featured, tag); - bitField0_ |= 0x00000100; + // historyUrl + input.readString(historyUrl); + bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 90) { + if (tag != 106) { break; } } - case 90: { + case 106: { + // featured [packed=true] + input.readPackedUInt32(featured, tag); + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { // upInfo [packed=true] input.readPackedUInt32(upInfo, tag); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 0) { break; @@ -950,16 +766,16 @@ public final class GachaInfoOuterClass { tag = input.readTag(); break; } - case 48: { + case 104: { // featured [packed=false] tag = input.readRepeatedUInt32(featured, tag); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; break; } - case 88: { + case 112: { // upInfo [packed=false] tag = input.readRepeatedUInt32(upInfo, tag); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; break; } } @@ -976,27 +792,21 @@ public final class GachaInfoOuterClass { output.writeInt64(FieldNames.endTime, endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.mNDHFONAGNL, mNDHFONAGNL); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.gachaId, gachaId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.mNPCOHFBLFD, mNPCOHFBLFD); - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.gachaCeiling, gachaCeiling); } - if ((bitField0_ & 0x00000040) != 0) { - output.writeString(FieldNames.historyUrl, historyUrl); - } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeString(FieldNames.detailUrl, detailUrl); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000020) != 0) { + output.writeString(FieldNames.historyUrl, historyUrl); + } + if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedUInt32(FieldNames.featured, featured); } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000080) != 0) { output.writeRepeatedUInt32(FieldNames.upInfo, upInfo); } output.endObject(); @@ -1033,34 +843,12 @@ public final class GachaInfoOuterClass { } break; } - case -757519100: { - if (input.isAtField(FieldNames.mNDHFONAGNL)) { - if (!input.trySkipNullValue()) { - mNDHFONAGNL = 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 { - input.skipUnknownField(); - } - break; - } - case -1906412607: { - if (input.isAtField(FieldNames.mNPCOHFBLFD)) { - if (!input.trySkipNullValue()) { - mNPCOHFBLFD = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -1072,19 +860,7 @@ public final class GachaInfoOuterClass { if (input.isAtField(FieldNames.gachaCeiling)) { if (!input.trySkipNullValue()) { input.readMessage(gachaCeiling); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1951019067: - case 352350020: { - if (input.isAtField(FieldNames.historyUrl)) { - if (!input.trySkipNullValue()) { - input.readString(historyUrl); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -1096,7 +872,19 @@ public final class GachaInfoOuterClass { if (input.isAtField(FieldNames.detailUrl)) { if (!input.trySkipNullValue()) { input.readString(detailUrl); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1951019067: + case 352350020: { + if (input.isAtField(FieldNames.historyUrl)) { + if (!input.trySkipNullValue()) { + input.readString(historyUrl); + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -1107,7 +895,7 @@ public final class GachaInfoOuterClass { if (input.isAtField(FieldNames.featured)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(featured); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -1119,7 +907,7 @@ public final class GachaInfoOuterClass { if (input.isAtField(FieldNames.upInfo)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(upInfo); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1182,18 +970,14 @@ public final class GachaInfoOuterClass { static final FieldName endTime = FieldName.forField("endTime", "end_time"); - static final FieldName mNDHFONAGNL = FieldName.forField("MNDHFONAGNL"); - static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); - static final FieldName mNPCOHFBLFD = FieldName.forField("MNPCOHFBLFD"); - static final FieldName gachaCeiling = FieldName.forField("gachaCeiling", "gacha_ceiling"); - static final FieldName historyUrl = FieldName.forField("historyUrl", "history_url"); - static final FieldName detailUrl = FieldName.forField("detailUrl", "detail_url"); + static final FieldName historyUrl = FieldName.forField("historyUrl", "history_url"); + static final FieldName featured = FieldName.forField("featured"); static final FieldName upInfo = FieldName.forField("upInfo", "up_info"); diff --git a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java index 3436eda..54926cf 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java @@ -19,7 +19,7 @@ public final class GachaItemOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool is_new = 11; + * optional bool is_new = 5; */ private boolean isNew; @@ -29,7 +29,7 @@ public final class GachaItemOuterClass { private final ItemListOuterClass.ItemList tokenItem = ItemListOuterClass.ItemList.newInstance(); /** - * optional .Item gacha_item = 7; + * optional .Item gacha_item = 13; */ private final ItemOuterClass.Item gachaItem = ItemOuterClass.Item.newInstance(); @@ -49,7 +49,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 11; + * optional bool is_new = 5; * @return whether the isNew field is set */ public boolean hasIsNew() { @@ -57,7 +57,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 11; + * optional bool is_new = 5; * @return this */ public GachaItem clearIsNew() { @@ -67,7 +67,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 11; + * optional bool is_new = 5; * @return the isNew */ public boolean getIsNew() { @@ -75,7 +75,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 11; + * optional bool is_new = 5; * @param value the isNew to set * @return this */ @@ -143,7 +143,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 7; + * optional .Item gacha_item = 13; * @return whether the gachaItem field is set */ public boolean hasGachaItem() { @@ -151,7 +151,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 7; + * optional .Item gacha_item = 13; * @return this */ public GachaItem clearGachaItem() { @@ -161,7 +161,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 7; + * optional .Item gacha_item = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -175,7 +175,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 7; + * optional .Item gacha_item = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -189,7 +189,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 7; + * optional .Item gacha_item = 13; * @param value the gachaItem to set * @return this */ @@ -336,7 +336,7 @@ public final class GachaItemOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeBoolNoTag(isNew); } if ((bitField0_ & 0x00000002) != 0) { @@ -344,7 +344,7 @@ public final class GachaItemOuterClass { output.writeMessageNoTag(tokenItem); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 106); output.writeMessageNoTag(gachaItem); } if ((bitField0_ & 0x00000008) != 0) { @@ -378,7 +378,7 @@ public final class GachaItemOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 40: { // isNew isNew = input.readBool(); bitField0_ |= 0x00000001; @@ -392,11 +392,11 @@ public final class GachaItemOuterClass { input.readMessage(tokenItem); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 106) { break; } } - case 58: { + case 106: { // gachaItem input.readMessage(gachaItem); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java index 54840f5..b9980f4 100644 --- a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java @@ -25,62 +25,61 @@ public final class GateserverOuterClass { private int port; /** - * optional bool unk1 = 3; + * optional bool unk1 = 8; */ private boolean unk1; /** - * optional bool unk2 = 1325; + * optional bool unk2 = 1159; */ private boolean unk2; /** - * optional bool unk3 = 2043; + * optional bool unk3 = 1624; */ private boolean unk3; /** - * optional string asset_bundle_url = 1; - */ - private final Utf8String assetBundleUrl = Utf8String.newEmptyInstance(); - - /** - * optional string lua_url = 4; - */ - private final Utf8String luaUrl = Utf8String.newEmptyInstance(); - - /** - * optional string region_name = 6; - */ - private final Utf8String regionName = Utf8String.newEmptyInstance(); - - /** - * optional string ex_resource_url = 12; + * optional string ex_resource_url = 5; */ private final Utf8String exResourceUrl = Utf8String.newEmptyInstance(); /** - * optional string ip = 14; + * optional string asset_bundle_url = 7; + */ + private final Utf8String assetBundleUrl = Utf8String.newEmptyInstance(); + + /** + * optional string lua_url = 9; + */ + private final Utf8String luaUrl = Utf8String.newEmptyInstance(); + + /** + * optional string region_name = 12; + */ + private final Utf8String regionName = Utf8String.newEmptyInstance(); + + /** + * optional string ip = 15; */ private final Utf8String ip = Utf8String.newEmptyInstance(); /** - * optional string mdk_res_version = 427; - */ - private final Utf8String mdkResVersion = Utf8String.newEmptyInstance(); - - /** - * optional string login_white_msg = 579; - */ - private final Utf8String loginWhiteMsg = Utf8String.newEmptyInstance(); - - /** - * optional string ifix_url = 723; + * optional string ifix_url = 762; */ private final Utf8String ifixUrl = Utf8String.newEmptyInstance(); /** - * optional string client_secret_key = 2009; + * optional string mdk_res_version = 1893; + */ + private final Utf8String mdkResVersion = Utf8String.newEmptyInstance(); + + /** + * 
+     *  Filler
+     *
+ * + * optional string client_secret_key = 2006; */ private final Utf8String clientSecretKey = Utf8String.newEmptyInstance(); @@ -132,7 +131,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 3; + * optional bool unk1 = 8; * @return whether the unk1 field is set */ public boolean hasUnk1() { @@ -140,7 +139,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 3; + * optional bool unk1 = 8; * @return this */ public Gateserver clearUnk1() { @@ -150,7 +149,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 3; + * optional bool unk1 = 8; * @return the unk1 */ public boolean getUnk1() { @@ -158,7 +157,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 3; + * optional bool unk1 = 8; * @param value the unk1 to set * @return this */ @@ -169,7 +168,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 1325; + * optional bool unk2 = 1159; * @return whether the unk2 field is set */ public boolean hasUnk2() { @@ -177,7 +176,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 1325; + * optional bool unk2 = 1159; * @return this */ public Gateserver clearUnk2() { @@ -187,7 +186,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 1325; + * optional bool unk2 = 1159; * @return the unk2 */ public boolean getUnk2() { @@ -195,7 +194,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 1325; + * optional bool unk2 = 1159; * @param value the unk2 to set * @return this */ @@ -206,7 +205,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 2043; + * optional bool unk3 = 1624; * @return whether the unk3 field is set */ public boolean hasUnk3() { @@ -214,7 +213,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 2043; + * optional bool unk3 = 1624; * @return this */ public Gateserver clearUnk3() { @@ -224,7 +223,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 2043; + * optional bool unk3 = 1624; * @return the unk3 */ public boolean getUnk3() { @@ -232,7 +231,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 2043; + * optional bool unk3 = 1624; * @param value the unk3 to set * @return this */ @@ -243,220 +242,25 @@ public final class GateserverOuterClass { } /** - * optional string asset_bundle_url = 1; - * @return whether the assetBundleUrl field is set + * optional string ex_resource_url = 5; + * @return whether the exResourceUrl field is set */ - public boolean hasAssetBundleUrl() { + public boolean hasExResourceUrl() { return (bitField0_ & 0x00000010) != 0; } /** - * optional string asset_bundle_url = 1; - * @return this - */ - public Gateserver clearAssetBundleUrl() { - bitField0_ &= ~0x00000010; - 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_ |= 0x00000010; - return this.assetBundleUrl; - } - - /** - * optional string asset_bundle_url = 1; - * @param value the assetBundleUrl to set - * @return this - */ - public Gateserver setAssetBundleUrl(final CharSequence value) { - bitField0_ |= 0x00000010; - 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_ |= 0x00000010; - assetBundleUrl.copyFrom(value); - return this; - } - - /** - * optional string lua_url = 4; - * @return whether the luaUrl field is set - */ - public boolean hasLuaUrl() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional string lua_url = 4; - * @return this - */ - public Gateserver clearLuaUrl() { - bitField0_ &= ~0x00000020; - luaUrl.clear(); - return this; - } - - /** - * optional string lua_url = 4; - * @return the luaUrl - */ - public String getLuaUrl() { - return luaUrl.getString(); - } - - /** - * optional string lua_url = 4; - * @return internal {@code Utf8String} representation of luaUrl for reading - */ - public Utf8String getLuaUrlBytes() { - return this.luaUrl; - } - - /** - * optional string lua_url = 4; - * @return internal {@code Utf8String} representation of luaUrl for modifications - */ - public Utf8String getMutableLuaUrlBytes() { - bitField0_ |= 0x00000020; - return this.luaUrl; - } - - /** - * optional string lua_url = 4; - * @param value the luaUrl to set - * @return this - */ - public Gateserver setLuaUrl(final CharSequence value) { - bitField0_ |= 0x00000020; - luaUrl.copyFrom(value); - return this; - } - - /** - * optional string lua_url = 4; - * @param value the luaUrl to set - * @return this - */ - public Gateserver setLuaUrl(final Utf8String value) { - bitField0_ |= 0x00000020; - luaUrl.copyFrom(value); - return this; - } - - /** - * optional string region_name = 6; - * @return whether the regionName field is set - */ - public boolean hasRegionName() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional string region_name = 6; - * @return this - */ - public Gateserver clearRegionName() { - bitField0_ &= ~0x00000040; - regionName.clear(); - return this; - } - - /** - * optional string region_name = 6; - * @return the regionName - */ - public String getRegionName() { - return regionName.getString(); - } - - /** - * optional string region_name = 6; - * @return internal {@code Utf8String} representation of regionName for reading - */ - public Utf8String getRegionNameBytes() { - return this.regionName; - } - - /** - * optional string region_name = 6; - * @return internal {@code Utf8String} representation of regionName for modifications - */ - public Utf8String getMutableRegionNameBytes() { - bitField0_ |= 0x00000040; - return this.regionName; - } - - /** - * optional string region_name = 6; - * @param value the regionName to set - * @return this - */ - public Gateserver setRegionName(final CharSequence value) { - bitField0_ |= 0x00000040; - regionName.copyFrom(value); - return this; - } - - /** - * optional string region_name = 6; - * @param value the regionName to set - * @return this - */ - public Gateserver setRegionName(final Utf8String value) { - bitField0_ |= 0x00000040; - regionName.copyFrom(value); - return this; - } - - /** - * optional string ex_resource_url = 12; - * @return whether the exResourceUrl field is set - */ - public boolean hasExResourceUrl() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional string ex_resource_url = 12; + * optional string ex_resource_url = 5; * @return this */ public Gateserver clearExResourceUrl() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000010; exResourceUrl.clear(); return this; } /** - * optional string ex_resource_url = 12; + * optional string ex_resource_url = 5; * @return the exResourceUrl */ public String getExResourceUrl() { @@ -464,7 +268,7 @@ public final class GateserverOuterClass { } /** - * optional string ex_resource_url = 12; + * optional string ex_resource_url = 5; * @return internal {@code Utf8String} representation of exResourceUrl for reading */ public Utf8String getExResourceUrlBytes() { @@ -472,38 +276,233 @@ public final class GateserverOuterClass { } /** - * optional string ex_resource_url = 12; + * optional string ex_resource_url = 5; * @return internal {@code Utf8String} representation of exResourceUrl for modifications */ public Utf8String getMutableExResourceUrlBytes() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; return this.exResourceUrl; } /** - * optional string ex_resource_url = 12; + * optional string ex_resource_url = 5; * @param value the exResourceUrl to set * @return this */ public Gateserver setExResourceUrl(final CharSequence value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; exResourceUrl.copyFrom(value); return this; } /** - * optional string ex_resource_url = 12; + * optional string ex_resource_url = 5; * @param value the exResourceUrl to set * @return this */ public Gateserver setExResourceUrl(final Utf8String value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; exResourceUrl.copyFrom(value); return this; } /** - * optional string ip = 14; + * optional string asset_bundle_url = 7; + * @return whether the assetBundleUrl field is set + */ + public boolean hasAssetBundleUrl() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional string asset_bundle_url = 7; + * @return this + */ + public Gateserver clearAssetBundleUrl() { + bitField0_ &= ~0x00000020; + assetBundleUrl.clear(); + return this; + } + + /** + * optional string asset_bundle_url = 7; + * @return the assetBundleUrl + */ + public String getAssetBundleUrl() { + return assetBundleUrl.getString(); + } + + /** + * optional string asset_bundle_url = 7; + * @return internal {@code Utf8String} representation of assetBundleUrl for reading + */ + public Utf8String getAssetBundleUrlBytes() { + return this.assetBundleUrl; + } + + /** + * optional string asset_bundle_url = 7; + * @return internal {@code Utf8String} representation of assetBundleUrl for modifications + */ + public Utf8String getMutableAssetBundleUrlBytes() { + bitField0_ |= 0x00000020; + return this.assetBundleUrl; + } + + /** + * optional string asset_bundle_url = 7; + * @param value the assetBundleUrl to set + * @return this + */ + public Gateserver setAssetBundleUrl(final CharSequence value) { + bitField0_ |= 0x00000020; + assetBundleUrl.copyFrom(value); + return this; + } + + /** + * optional string asset_bundle_url = 7; + * @param value the assetBundleUrl to set + * @return this + */ + public Gateserver setAssetBundleUrl(final Utf8String value) { + bitField0_ |= 0x00000020; + assetBundleUrl.copyFrom(value); + return this; + } + + /** + * optional string lua_url = 9; + * @return whether the luaUrl field is set + */ + public boolean hasLuaUrl() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional string lua_url = 9; + * @return this + */ + public Gateserver clearLuaUrl() { + bitField0_ &= ~0x00000040; + luaUrl.clear(); + return this; + } + + /** + * optional string lua_url = 9; + * @return the luaUrl + */ + public String getLuaUrl() { + return luaUrl.getString(); + } + + /** + * optional string lua_url = 9; + * @return internal {@code Utf8String} representation of luaUrl for reading + */ + public Utf8String getLuaUrlBytes() { + return this.luaUrl; + } + + /** + * optional string lua_url = 9; + * @return internal {@code Utf8String} representation of luaUrl for modifications + */ + public Utf8String getMutableLuaUrlBytes() { + bitField0_ |= 0x00000040; + return this.luaUrl; + } + + /** + * optional string lua_url = 9; + * @param value the luaUrl to set + * @return this + */ + public Gateserver setLuaUrl(final CharSequence value) { + bitField0_ |= 0x00000040; + luaUrl.copyFrom(value); + return this; + } + + /** + * optional string lua_url = 9; + * @param value the luaUrl to set + * @return this + */ + public Gateserver setLuaUrl(final Utf8String value) { + bitField0_ |= 0x00000040; + luaUrl.copyFrom(value); + return this; + } + + /** + * optional string region_name = 12; + * @return whether the regionName field is set + */ + public boolean hasRegionName() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional string region_name = 12; + * @return this + */ + public Gateserver clearRegionName() { + bitField0_ &= ~0x00000080; + regionName.clear(); + return this; + } + + /** + * optional string region_name = 12; + * @return the regionName + */ + public String getRegionName() { + return regionName.getString(); + } + + /** + * optional string region_name = 12; + * @return internal {@code Utf8String} representation of regionName for reading + */ + public Utf8String getRegionNameBytes() { + return this.regionName; + } + + /** + * optional string region_name = 12; + * @return internal {@code Utf8String} representation of regionName for modifications + */ + public Utf8String getMutableRegionNameBytes() { + bitField0_ |= 0x00000080; + return this.regionName; + } + + /** + * optional string region_name = 12; + * @param value the regionName to set + * @return this + */ + public Gateserver setRegionName(final CharSequence value) { + bitField0_ |= 0x00000080; + regionName.copyFrom(value); + return this; + } + + /** + * optional string region_name = 12; + * @param value the regionName to set + * @return this + */ + public Gateserver setRegionName(final Utf8String value) { + bitField0_ |= 0x00000080; + regionName.copyFrom(value); + return this; + } + + /** + * optional string ip = 15; * @return whether the ip field is set */ public boolean hasIp() { @@ -511,7 +510,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 14; + * optional string ip = 15; * @return this */ public Gateserver clearIp() { @@ -521,7 +520,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 14; + * optional string ip = 15; * @return the ip */ public String getIp() { @@ -529,7 +528,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 14; + * optional string ip = 15; * @return internal {@code Utf8String} representation of ip for reading */ public Utf8String getIpBytes() { @@ -537,7 +536,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 14; + * optional string ip = 15; * @return internal {@code Utf8String} representation of ip for modifications */ public Utf8String getMutableIpBytes() { @@ -546,7 +545,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 14; + * optional string ip = 15; * @param value the ip to set * @return this */ @@ -557,7 +556,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 14; + * optional string ip = 15; * @param value the ip to set * @return this */ @@ -568,155 +567,25 @@ public final class GateserverOuterClass { } /** - * optional string mdk_res_version = 427; - * @return whether the mdkResVersion field is set + * optional string ifix_url = 762; + * @return whether the ifixUrl field is set */ - public boolean hasMdkResVersion() { + public boolean hasIfixUrl() { return (bitField0_ & 0x00000200) != 0; } /** - * optional string mdk_res_version = 427; - * @return this - */ - public Gateserver clearMdkResVersion() { - bitField0_ &= ~0x00000200; - mdkResVersion.clear(); - return this; - } - - /** - * optional string mdk_res_version = 427; - * @return the mdkResVersion - */ - public String getMdkResVersion() { - return mdkResVersion.getString(); - } - - /** - * optional string mdk_res_version = 427; - * @return internal {@code Utf8String} representation of mdkResVersion for reading - */ - public Utf8String getMdkResVersionBytes() { - return this.mdkResVersion; - } - - /** - * optional string mdk_res_version = 427; - * @return internal {@code Utf8String} representation of mdkResVersion for modifications - */ - public Utf8String getMutableMdkResVersionBytes() { - bitField0_ |= 0x00000200; - return this.mdkResVersion; - } - - /** - * optional string mdk_res_version = 427; - * @param value the mdkResVersion to set - * @return this - */ - public Gateserver setMdkResVersion(final CharSequence value) { - bitField0_ |= 0x00000200; - mdkResVersion.copyFrom(value); - return this; - } - - /** - * optional string mdk_res_version = 427; - * @param value the mdkResVersion to set - * @return this - */ - public Gateserver setMdkResVersion(final Utf8String value) { - bitField0_ |= 0x00000200; - mdkResVersion.copyFrom(value); - return this; - } - - /** - * optional string login_white_msg = 579; - * @return whether the loginWhiteMsg field is set - */ - public boolean hasLoginWhiteMsg() { - return (bitField0_ & 0x00000400) != 0; - } - - /** - * optional string login_white_msg = 579; - * @return this - */ - public Gateserver clearLoginWhiteMsg() { - bitField0_ &= ~0x00000400; - loginWhiteMsg.clear(); - return this; - } - - /** - * optional string login_white_msg = 579; - * @return the loginWhiteMsg - */ - public String getLoginWhiteMsg() { - return loginWhiteMsg.getString(); - } - - /** - * optional string login_white_msg = 579; - * @return internal {@code Utf8String} representation of loginWhiteMsg for reading - */ - public Utf8String getLoginWhiteMsgBytes() { - return this.loginWhiteMsg; - } - - /** - * optional string login_white_msg = 579; - * @return internal {@code Utf8String} representation of loginWhiteMsg for modifications - */ - public Utf8String getMutableLoginWhiteMsgBytes() { - bitField0_ |= 0x00000400; - return this.loginWhiteMsg; - } - - /** - * optional string login_white_msg = 579; - * @param value the loginWhiteMsg to set - * @return this - */ - public Gateserver setLoginWhiteMsg(final CharSequence value) { - bitField0_ |= 0x00000400; - loginWhiteMsg.copyFrom(value); - return this; - } - - /** - * optional string login_white_msg = 579; - * @param value the loginWhiteMsg to set - * @return this - */ - public Gateserver setLoginWhiteMsg(final Utf8String value) { - bitField0_ |= 0x00000400; - loginWhiteMsg.copyFrom(value); - return this; - } - - /** - * optional string ifix_url = 723; - * @return whether the ifixUrl field is set - */ - public boolean hasIfixUrl() { - return (bitField0_ & 0x00000800) != 0; - } - - /** - * optional string ifix_url = 723; + * optional string ifix_url = 762; * @return this */ public Gateserver clearIfixUrl() { - bitField0_ &= ~0x00000800; + bitField0_ &= ~0x00000200; ifixUrl.clear(); return this; } /** - * optional string ifix_url = 723; + * optional string ifix_url = 762; * @return the ifixUrl */ public String getIfixUrl() { @@ -724,7 +593,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_url = 723; + * optional string ifix_url = 762; * @return internal {@code Utf8String} representation of ifixUrl for reading */ public Utf8String getIfixUrlBytes() { @@ -732,56 +601,133 @@ public final class GateserverOuterClass { } /** - * optional string ifix_url = 723; + * optional string ifix_url = 762; * @return internal {@code Utf8String} representation of ifixUrl for modifications */ public Utf8String getMutableIfixUrlBytes() { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000200; return this.ifixUrl; } /** - * optional string ifix_url = 723; + * optional string ifix_url = 762; * @param value the ifixUrl to set * @return this */ public Gateserver setIfixUrl(final CharSequence value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000200; ifixUrl.copyFrom(value); return this; } /** - * optional string ifix_url = 723; + * optional string ifix_url = 762; * @param value the ifixUrl to set * @return this */ public Gateserver setIfixUrl(final Utf8String value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000200; ifixUrl.copyFrom(value); return this; } /** - * optional string client_secret_key = 2009; - * @return whether the clientSecretKey field is set + * optional string mdk_res_version = 1893; + * @return whether the mdkResVersion field is set */ - public boolean hasClientSecretKey() { - return (bitField0_ & 0x00001000) != 0; + public boolean hasMdkResVersion() { + return (bitField0_ & 0x00000400) != 0; } /** - * optional string client_secret_key = 2009; + * optional string mdk_res_version = 1893; + * @return this + */ + public Gateserver clearMdkResVersion() { + bitField0_ &= ~0x00000400; + mdkResVersion.clear(); + return this; + } + + /** + * optional string mdk_res_version = 1893; + * @return the mdkResVersion + */ + public String getMdkResVersion() { + return mdkResVersion.getString(); + } + + /** + * optional string mdk_res_version = 1893; + * @return internal {@code Utf8String} representation of mdkResVersion for reading + */ + public Utf8String getMdkResVersionBytes() { + return this.mdkResVersion; + } + + /** + * optional string mdk_res_version = 1893; + * @return internal {@code Utf8String} representation of mdkResVersion for modifications + */ + public Utf8String getMutableMdkResVersionBytes() { + bitField0_ |= 0x00000400; + return this.mdkResVersion; + } + + /** + * optional string mdk_res_version = 1893; + * @param value the mdkResVersion to set + * @return this + */ + public Gateserver setMdkResVersion(final CharSequence value) { + bitField0_ |= 0x00000400; + mdkResVersion.copyFrom(value); + return this; + } + + /** + * optional string mdk_res_version = 1893; + * @param value the mdkResVersion to set + * @return this + */ + public Gateserver setMdkResVersion(final Utf8String value) { + bitField0_ |= 0x00000400; + mdkResVersion.copyFrom(value); + return this; + } + + /** + * 
+     *  Filler
+     *
+ * + * optional string client_secret_key = 2006; + * @return whether the clientSecretKey field is set + */ + public boolean hasClientSecretKey() { + return (bitField0_ & 0x00000800) != 0; + } + + /** + * 
+     *  Filler
+     *
+ * + * optional string client_secret_key = 2006; * @return this */ public Gateserver clearClientSecretKey() { - bitField0_ &= ~0x00001000; + bitField0_ &= ~0x00000800; clientSecretKey.clear(); return this; } /** - * optional string client_secret_key = 2009; + * 
+     *  Filler
+     *
+ * + * optional string client_secret_key = 2006; * @return the clientSecretKey */ public String getClientSecretKey() { @@ -789,7 +735,11 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 2009; + * 
+     *  Filler
+     *
+ * + * optional string client_secret_key = 2006; * @return internal {@code Utf8String} representation of clientSecretKey for reading */ public Utf8String getClientSecretKeyBytes() { @@ -797,32 +747,44 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 2009; + * 
+     *  Filler
+     *
+ * + * optional string client_secret_key = 2006; * @return internal {@code Utf8String} representation of clientSecretKey for modifications */ public Utf8String getMutableClientSecretKeyBytes() { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; return this.clientSecretKey; } /** - * optional string client_secret_key = 2009; + * 
+     *  Filler
+     *
+ * + * optional string client_secret_key = 2006; * @param value the clientSecretKey to set * @return this */ public Gateserver setClientSecretKey(final CharSequence value) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; clientSecretKey.copyFrom(value); return this; } /** - * optional string client_secret_key = 2009; + * 
+     *  Filler
+     *
+ * + * optional string client_secret_key = 2006; * @param value the clientSecretKey to set * @return this */ public Gateserver setClientSecretKey(final Utf8String value) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; clientSecretKey.copyFrom(value); return this; } @@ -836,14 +798,13 @@ public final class GateserverOuterClass { unk1 = other.unk1; unk2 = other.unk2; unk3 = other.unk3; + exResourceUrl.copyFrom(other.exResourceUrl); assetBundleUrl.copyFrom(other.assetBundleUrl); luaUrl.copyFrom(other.luaUrl); regionName.copyFrom(other.regionName); - exResourceUrl.copyFrom(other.exResourceUrl); ip.copyFrom(other.ip); - mdkResVersion.copyFrom(other.mdkResVersion); - loginWhiteMsg.copyFrom(other.loginWhiteMsg); ifixUrl.copyFrom(other.ifixUrl); + mdkResVersion.copyFrom(other.mdkResVersion); clientSecretKey.copyFrom(other.clientSecretKey); } return this; @@ -867,6 +828,9 @@ public final class GateserverOuterClass { if (other.hasUnk3()) { setUnk3(other.unk3); } + if (other.hasExResourceUrl()) { + getMutableExResourceUrlBytes().copyFrom(other.exResourceUrl); + } if (other.hasAssetBundleUrl()) { getMutableAssetBundleUrlBytes().copyFrom(other.assetBundleUrl); } @@ -876,21 +840,15 @@ public final class GateserverOuterClass { if (other.hasRegionName()) { getMutableRegionNameBytes().copyFrom(other.regionName); } - if (other.hasExResourceUrl()) { - getMutableExResourceUrlBytes().copyFrom(other.exResourceUrl); - } if (other.hasIp()) { getMutableIpBytes().copyFrom(other.ip); } - if (other.hasMdkResVersion()) { - getMutableMdkResVersionBytes().copyFrom(other.mdkResVersion); - } - if (other.hasLoginWhiteMsg()) { - getMutableLoginWhiteMsgBytes().copyFrom(other.loginWhiteMsg); - } if (other.hasIfixUrl()) { getMutableIfixUrlBytes().copyFrom(other.ifixUrl); } + if (other.hasMdkResVersion()) { + getMutableMdkResVersionBytes().copyFrom(other.mdkResVersion); + } if (other.hasClientSecretKey()) { getMutableClientSecretKeyBytes().copyFrom(other.clientSecretKey); } @@ -908,14 +866,13 @@ public final class GateserverOuterClass { unk1 = false; unk2 = false; unk3 = false; + exResourceUrl.clear(); assetBundleUrl.clear(); luaUrl.clear(); regionName.clear(); - exResourceUrl.clear(); ip.clear(); - mdkResVersion.clear(); - loginWhiteMsg.clear(); ifixUrl.clear(); + mdkResVersion.clear(); clientSecretKey.clear(); return this; } @@ -927,14 +884,13 @@ public final class GateserverOuterClass { } cachedSize = -1; bitField0_ = 0; + exResourceUrl.clear(); assetBundleUrl.clear(); luaUrl.clear(); regionName.clear(); - exResourceUrl.clear(); ip.clear(); - mdkResVersion.clear(); - loginWhiteMsg.clear(); ifixUrl.clear(); + mdkResVersion.clear(); clientSecretKey.clear(); return this; } @@ -953,14 +909,13 @@ public final class GateserverOuterClass { && (!hasUnk1() || unk1 == other.unk1) && (!hasUnk2() || unk2 == other.unk2) && (!hasUnk3() || unk3 == other.unk3) + && (!hasExResourceUrl() || exResourceUrl.equals(other.exResourceUrl)) && (!hasAssetBundleUrl() || assetBundleUrl.equals(other.assetBundleUrl)) && (!hasLuaUrl() || luaUrl.equals(other.luaUrl)) && (!hasRegionName() || regionName.equals(other.regionName)) - && (!hasExResourceUrl() || exResourceUrl.equals(other.exResourceUrl)) && (!hasIp() || ip.equals(other.ip)) - && (!hasMdkResVersion() || mdkResVersion.equals(other.mdkResVersion)) - && (!hasLoginWhiteMsg() || loginWhiteMsg.equals(other.loginWhiteMsg)) && (!hasIfixUrl() || ifixUrl.equals(other.ifixUrl)) + && (!hasMdkResVersion() || mdkResVersion.equals(other.mdkResVersion)) && (!hasClientSecretKey() || clientSecretKey.equals(other.clientSecretKey)); } @@ -971,51 +926,47 @@ public final class GateserverOuterClass { output.writeUInt32NoTag(port); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 64); output.writeBoolNoTag(unk1); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 21224); + output.writeRawLittleEndian16((short) 18616); output.writeBoolNoTag(unk2); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 32728); + output.writeRawLittleEndian16((short) 26048); output.writeBoolNoTag(unk3); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 10); - output.writeStringNoTag(assetBundleUrl); + output.writeRawByte((byte) 42); + output.writeStringNoTag(exResourceUrl); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 34); - output.writeStringNoTag(luaUrl); + output.writeRawByte((byte) 58); + output.writeStringNoTag(assetBundleUrl); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 50); - output.writeStringNoTag(regionName); + output.writeRawByte((byte) 74); + output.writeStringNoTag(luaUrl); } if ((bitField0_ & 0x00000080) != 0) { output.writeRawByte((byte) 98); - output.writeStringNoTag(exResourceUrl); + output.writeStringNoTag(regionName); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 122); output.writeStringNoTag(ip); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawLittleEndian16((short) 6874); - output.writeStringNoTag(mdkResVersion); - } - if ((bitField0_ & 0x00000400) != 0) { - output.writeRawLittleEndian16((short) 9370); - output.writeStringNoTag(loginWhiteMsg); - } - if ((bitField0_ & 0x00000800) != 0) { - output.writeRawLittleEndian16((short) 11674); + output.writeRawLittleEndian16((short) 12242); output.writeStringNoTag(ifixUrl); } - if ((bitField0_ & 0x00001000) != 0) { - output.writeRawLittleEndian16((short) 32202); + if ((bitField0_ & 0x00000400) != 0) { + output.writeRawLittleEndian16((short) 30378); + output.writeStringNoTag(mdkResVersion); + } + if ((bitField0_ & 0x00000800) != 0) { + output.writeRawLittleEndian16((short) 32178); output.writeStringNoTag(clientSecretKey); } } @@ -1036,30 +987,27 @@ public final class GateserverOuterClass { size += 3; } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(assetBundleUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(luaUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(assetBundleUrl); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(regionName); + size += 1 + ProtoSink.computeStringSizeNoTag(luaUrl); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(regionName); } if ((bitField0_ & 0x00000100) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(ip); } if ((bitField0_ & 0x00000200) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(mdkResVersion); - } - if ((bitField0_ & 0x00000400) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(loginWhiteMsg); - } - if ((bitField0_ & 0x00000800) != 0) { size += 2 + ProtoSink.computeStringSizeNoTag(ifixUrl); } - if ((bitField0_ & 0x00001000) != 0) { + if ((bitField0_ & 0x00000400) != 0) { + size += 2 + ProtoSink.computeStringSizeNoTag(mdkResVersion); + } + if ((bitField0_ & 0x00000800) != 0) { size += 2 + ProtoSink.computeStringSizeNoTag(clientSecretKey); } return size; @@ -1077,58 +1025,58 @@ public final class GateserverOuterClass { port = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 64) { break; } } - case 24: { + case 64: { // unk1 unk1 = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 10600) { + if (tag != 9272) { break; } } - case 10600: { + case 9272: { // unk2 unk2 = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 16344) { + if (tag != 12992) { break; } } - case 16344: { + case 12992: { // unk3 unk3 = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 10) { + if (tag != 42) { break; } } - case 10: { - // assetBundleUrl - input.readString(assetBundleUrl); + case 42: { + // exResourceUrl + input.readString(exResourceUrl); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 34) { + if (tag != 58) { break; } } - case 34: { - // luaUrl - input.readString(luaUrl); + case 58: { + // assetBundleUrl + input.readString(assetBundleUrl); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 50) { + if (tag != 74) { break; } } - case 50: { - // regionName - input.readString(regionName); + case 74: { + // luaUrl + input.readString(luaUrl); bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 98) { @@ -1136,54 +1084,45 @@ public final class GateserverOuterClass { } } case 98: { - // exResourceUrl - input.readString(exResourceUrl); + // regionName + input.readString(regionName); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 114) { + if (tag != 122) { break; } } - case 114: { + case 122: { // ip input.readString(ip); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 3418) { + if (tag != 6098) { break; } } - case 3418: { - // mdkResVersion - input.readString(mdkResVersion); - bitField0_ |= 0x00000200; - tag = input.readTag(); - if (tag != 4634) { - break; - } - } - case 4634: { - // loginWhiteMsg - input.readString(loginWhiteMsg); - bitField0_ |= 0x00000400; - tag = input.readTag(); - if (tag != 5786) { - break; - } - } - case 5786: { + case 6098: { // ifixUrl input.readString(ifixUrl); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 16074) { + if (tag != 15146) { break; } } - case 16074: { + case 15146: { + // mdkResVersion + input.readString(mdkResVersion); + bitField0_ |= 0x00000400; + tag = input.readTag(); + if (tag != 16050) { + break; + } + } + case 16050: { // clientSecretKey input.readString(clientSecretKey); - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; tag = input.readTag(); if (tag != 0) { break; @@ -1219,30 +1158,27 @@ public final class GateserverOuterClass { output.writeBool(FieldNames.unk3, unk3); } if ((bitField0_ & 0x00000010) != 0) { - output.writeString(FieldNames.assetBundleUrl, assetBundleUrl); + output.writeString(FieldNames.exResourceUrl, exResourceUrl); } if ((bitField0_ & 0x00000020) != 0) { - output.writeString(FieldNames.luaUrl, luaUrl); + output.writeString(FieldNames.assetBundleUrl, assetBundleUrl); } if ((bitField0_ & 0x00000040) != 0) { - output.writeString(FieldNames.regionName, regionName); + output.writeString(FieldNames.luaUrl, luaUrl); } if ((bitField0_ & 0x00000080) != 0) { - output.writeString(FieldNames.exResourceUrl, exResourceUrl); + output.writeString(FieldNames.regionName, regionName); } if ((bitField0_ & 0x00000100) != 0) { output.writeString(FieldNames.ip, ip); } if ((bitField0_ & 0x00000200) != 0) { - output.writeString(FieldNames.mdkResVersion, mdkResVersion); - } - if ((bitField0_ & 0x00000400) != 0) { - output.writeString(FieldNames.loginWhiteMsg, loginWhiteMsg); - } - if ((bitField0_ & 0x00000800) != 0) { output.writeString(FieldNames.ifixUrl, ifixUrl); } - if ((bitField0_ & 0x00001000) != 0) { + if ((bitField0_ & 0x00000400) != 0) { + output.writeString(FieldNames.mdkResVersion, mdkResVersion); + } + if ((bitField0_ & 0x00000800) != 0) { output.writeString(FieldNames.clientSecretKey, clientSecretKey); } output.endObject(); @@ -1299,12 +1235,24 @@ public final class GateserverOuterClass { } break; } + case 1643520974: + case -1086137910: { + if (input.isAtField(FieldNames.exResourceUrl)) { + if (!input.trySkipNullValue()) { + input.readString(exResourceUrl); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } case -1116358531: case 1973569761: { if (input.isAtField(FieldNames.assetBundleUrl)) { if (!input.trySkipNullValue()) { input.readString(assetBundleUrl); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -1316,7 +1264,7 @@ public final class GateserverOuterClass { if (input.isAtField(FieldNames.luaUrl)) { if (!input.trySkipNullValue()) { input.readString(luaUrl); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -1328,18 +1276,6 @@ public final class GateserverOuterClass { if (input.isAtField(FieldNames.regionName)) { if (!input.trySkipNullValue()) { input.readString(regionName); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1643520974: - case -1086137910: { - if (input.isAtField(FieldNames.exResourceUrl)) { - if (!input.trySkipNullValue()) { - input.readString(exResourceUrl); bitField0_ |= 0x00000080; } } else { @@ -1358,11 +1294,11 @@ public final class GateserverOuterClass { } break; } - case -1415579412: - case -204279250: { - if (input.isAtField(FieldNames.mdkResVersion)) { + case 1719409347: + case 1762383292: { + if (input.isAtField(FieldNames.ifixUrl)) { if (!input.trySkipNullValue()) { - input.readString(mdkResVersion); + input.readString(ifixUrl); bitField0_ |= 0x00000200; } } else { @@ -1370,11 +1306,11 @@ public final class GateserverOuterClass { } break; } - case 1235575073: - case 893116693: { - if (input.isAtField(FieldNames.loginWhiteMsg)) { + case -1415579412: + case -204279250: { + if (input.isAtField(FieldNames.mdkResVersion)) { if (!input.trySkipNullValue()) { - input.readString(loginWhiteMsg); + input.readString(mdkResVersion); bitField0_ |= 0x00000400; } } else { @@ -1382,24 +1318,12 @@ public final class GateserverOuterClass { } break; } - case 1719409347: - case 1762383292: { - if (input.isAtField(FieldNames.ifixUrl)) { - if (!input.trySkipNullValue()) { - input.readString(ifixUrl); - bitField0_ |= 0x00000800; - } - } else { - input.skipUnknownField(); - } - break; - } case -584558076: case 904194372: { if (input.isAtField(FieldNames.clientSecretKey)) { if (!input.trySkipNullValue()) { input.readString(clientSecretKey); - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; } } else { input.skipUnknownField(); @@ -1466,22 +1390,20 @@ public final class GateserverOuterClass { static final FieldName unk3 = FieldName.forField("unk3"); + static final FieldName exResourceUrl = FieldName.forField("exResourceUrl", "ex_resource_url"); + 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 ip = FieldName.forField("ip"); - static final FieldName mdkResVersion = FieldName.forField("mdkResVersion", "mdk_res_version"); - - static final FieldName loginWhiteMsg = FieldName.forField("loginWhiteMsg", "login_white_msg"); - static final FieldName ifixUrl = FieldName.forField("ifixUrl", "ifix_url"); + static final FieldName mdkResVersion = FieldName.forField("mdkResVersion", "mdk_res_version"); + static final FieldName clientSecretKey = FieldName.forField("clientSecretKey", "client_secret_key"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java index 101d846..d613502 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; + * optional uint32 retcode = 4; */ private int retcode; /** - * optional uint32 cur_index = 11; + * optional uint32 cur_index = 10; */ private int curIndex; /** - * repeated .LineupInfo lineup_list = 6; + * repeated .LineupInfo lineup_list = 3; */ private final RepeatedMessage lineupList = RepeatedMessage.newEmptyInstance(LineupInfoOuterClass.LineupInfo.getFactory()); @@ -45,7 +45,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return this */ public GetAllLineupDataScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 cur_index = 11; + * optional uint32 cur_index = 10; * @return whether the curIndex field is set */ public boolean hasCurIndex() { @@ -90,7 +90,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 cur_index = 11; + * optional uint32 cur_index = 10; * @return this */ public GetAllLineupDataScRsp clearCurIndex() { @@ -100,7 +100,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 cur_index = 11; + * optional uint32 cur_index = 10; * @return the curIndex */ public int getCurIndex() { @@ -108,7 +108,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 cur_index = 11; + * optional uint32 cur_index = 10; * @param value the curIndex to set * @return this */ @@ -119,7 +119,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 6; + * 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 = 6; + * repeated .LineupInfo lineup_list = 3; * @return this */ public GetAllLineupDataScRsp clearLineupList() { @@ -137,7 +137,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 6; + * 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 = 6; + * 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 = 6; + * 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 = 6; + * repeated .LineupInfo lineup_list = 3; * @param values the lineupList to add * @return this */ @@ -258,16 +258,16 @@ public final class GetAllLineupDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(curIndex); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < lineupList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 26); output.writeMessageNoTag(lineupList.get(i)); } } @@ -295,25 +295,25 @@ public final class GetAllLineupDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 80) { break; } } - case 88: { + case 80: { // curIndex curIndex = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 50) { + if (tag != 26) { break; } } - case 50: { + case 26: { // lineupList tag = input.readRepeatedMessage(lineupList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java index 7f5a651..5fa5139 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 = 11; + * optional bool is_get_all = 6; */ private boolean isGetAll; /** - * repeated uint32 base_avatar_id_list = 15; + * repeated uint32 base_avatar_id_list = 2; */ private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 11; + * optional bool is_get_all = 6; * @return whether the isGetAll field is set */ public boolean hasIsGetAll() { @@ -48,7 +48,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 11; + * optional bool is_get_all = 6; * @return this */ public GetAvatarDataCsReq clearIsGetAll() { @@ -58,7 +58,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 11; + * optional bool is_get_all = 6; * @return the isGetAll */ public boolean getIsGetAll() { @@ -66,7 +66,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 11; + * optional bool is_get_all = 6; * @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 = 2; * @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 = 2; * @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 = 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 GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 15; + * repeated uint32 base_avatar_id_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 15; + * repeated uint32 base_avatar_id_list = 2; * @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 = 2; * @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) 88); + output.writeRawByte((byte) 48); output.writeBoolNoTag(isGetAll); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < baseAvatarIdList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(baseAvatarIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class GetAvatarDataCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 48: { // isGetAll isGetAll = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 18) { break; } } - case 122: { + case 18: { // baseAvatarIdList [packed=true] input.readPackedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class GetAvatarDataCsReqOuterClass { tag = input.readTag(); break; } - case 120: { + case 16: { // 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 336e662..381d7cb 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 = 12; + * optional uint32 retcode = 5; */ private int retcode; /** - * optional bool is_get_all = 4; + * optional bool is_get_all = 14; */ private boolean isGetAll; /** - * repeated .Avatar avatar_list = 8; + * repeated .Avatar avatar_list = 1; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory()); @@ -45,7 +45,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @return this */ public GetAvatarDataScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 4; + * optional bool is_get_all = 14; * @return whether the isGetAll field is set */ public boolean hasIsGetAll() { @@ -90,7 +90,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 4; + * optional bool is_get_all = 14; * @return this */ public GetAvatarDataScRsp clearIsGetAll() { @@ -100,7 +100,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 4; + * optional bool is_get_all = 14; * @return the isGetAll */ public boolean getIsGetAll() { @@ -108,7 +108,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 4; + * optional bool is_get_all = 14; * @param value the isGetAll to set * @return this */ @@ -119,7 +119,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 8; + * repeated .Avatar avatar_list = 1; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -127,7 +127,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 8; + * repeated .Avatar avatar_list = 1; * @return this */ public GetAvatarDataScRsp clearAvatarList() { @@ -137,7 +137,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 8; + * repeated .Avatar avatar_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 8; + * repeated .Avatar avatar_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 8; + * repeated .Avatar avatar_list = 1; * @param value the avatarList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 8; + * repeated .Avatar avatar_list = 1; * @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) 96); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 112); output.writeBoolNoTag(isGetAll); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 10); output.writeMessageNoTag(avatarList.get(i)); } } @@ -295,25 +295,25 @@ public final class GetAvatarDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 112) { break; } } - case 32: { + case 112: { // isGetAll isGetAll = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 66) { + if (tag != 10) { break; } } - case 66: { + case 10: { // 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 1f06d3d..cb54df0 100644 --- a/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java @@ -21,52 +21,49 @@ public final class GetBagScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional uint32 AGDPOHEPDDK = 14; + * optional uint32 BLDMDEFNEPK = 13; */ - private int aGDPOHEPDDK; + private int bLDMDEFNEPK; /** - * repeated uint32 FCCFAPHDPIB = 8; + * repeated uint32 MIOOCCLLFAA = 1; */ - private final RepeatedInt fCCFAPHDPIB = RepeatedInt.newEmptyInstance(); + private final RepeatedInt mIOOCCLLFAA = RepeatedInt.newEmptyInstance(); /** - * repeated .Material material_list = 1; - */ - private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); - - /** - * 
-     * repeated JAKOAONFNGN KPBMGJKOKDA = 11;
-     *
- * - * repeated .Equipment equipment_list = 2; - */ - private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); - - /** - * 
-     * repeated JAKOAONFNGN LKGOMEBOJAF = 6;
-     *
- * - * repeated .Relic relic_list = 7; + * repeated .Relic relic_list = 2; */ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); /** - * repeated .WaitDelResource wait_del_resource_list = 9; + * 
+     * repeated IIEKAFLADPC GEHHOPNKDFE = 5;
+     * repeated IIEKAFLADPC LOOLEGLHFIP = 10;
+     *
+ * + * repeated .WaitDelResource DNOIJIGOANN = 3; */ - private final RepeatedMessage waitDelResourceList = RepeatedMessage.newEmptyInstance(WaitDelResourceOuterClass.WaitDelResource.getFactory()); + private final RepeatedMessage dNOIJIGOANN = RepeatedMessage.newEmptyInstance(WaitDelResourceOuterClass.WaitDelResource.getFactory()); /** - * repeated .Material EANGCGPDMBM = 13; + * repeated .Material material_list = 6; */ - private final RepeatedMessage eANGCGPDMBM = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); + private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); + + /** + * repeated .Equipment equipment_list = 14; + */ + private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); + + /** + * repeated .Material BBKKDJEGAPF = 15; + */ + private final RepeatedMessage bBKKDJEGAPF = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); private GetBagScRsp() { } @@ -79,7 +76,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -87,7 +84,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return this */ public GetBagScRsp clearRetcode() { @@ -97,7 +94,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -105,7 +102,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -116,76 +113,76 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 AGDPOHEPDDK = 14; - * @return whether the aGDPOHEPDDK field is set + * optional uint32 BLDMDEFNEPK = 13; + * @return whether the bLDMDEFNEPK field is set */ - public boolean hasAGDPOHEPDDK() { + public boolean hasBLDMDEFNEPK() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 AGDPOHEPDDK = 14; + * optional uint32 BLDMDEFNEPK = 13; * @return this */ - public GetBagScRsp clearAGDPOHEPDDK() { + public GetBagScRsp clearBLDMDEFNEPK() { bitField0_ &= ~0x00000002; - aGDPOHEPDDK = 0; + bLDMDEFNEPK = 0; return this; } /** - * optional uint32 AGDPOHEPDDK = 14; - * @return the aGDPOHEPDDK + * optional uint32 BLDMDEFNEPK = 13; + * @return the bLDMDEFNEPK */ - public int getAGDPOHEPDDK() { - return aGDPOHEPDDK; + public int getBLDMDEFNEPK() { + return bLDMDEFNEPK; } /** - * optional uint32 AGDPOHEPDDK = 14; - * @param value the aGDPOHEPDDK to set + * optional uint32 BLDMDEFNEPK = 13; + * @param value the bLDMDEFNEPK to set * @return this */ - public GetBagScRsp setAGDPOHEPDDK(final int value) { + public GetBagScRsp setBLDMDEFNEPK(final int value) { bitField0_ |= 0x00000002; - aGDPOHEPDDK = value; + bLDMDEFNEPK = value; return this; } /** - * repeated uint32 FCCFAPHDPIB = 8; - * @return whether the fCCFAPHDPIB field is set + * repeated uint32 MIOOCCLLFAA = 1; + * @return whether the mIOOCCLLFAA field is set */ - public boolean hasFCCFAPHDPIB() { + public boolean hasMIOOCCLLFAA() { return (bitField0_ & 0x00000004) != 0; } /** - * repeated uint32 FCCFAPHDPIB = 8; + * repeated uint32 MIOOCCLLFAA = 1; * @return this */ - public GetBagScRsp clearFCCFAPHDPIB() { + public GetBagScRsp clearMIOOCCLLFAA() { bitField0_ &= ~0x00000004; - fCCFAPHDPIB.clear(); + mIOOCCLLFAA.clear(); return this; } /** - * repeated uint32 FCCFAPHDPIB = 8; + * repeated uint32 MIOOCCLLFAA = 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 #getMutableFCCFAPHDPIB()} if you want to modify it. + * Use {@link #getMutableMIOOCCLLFAA()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getFCCFAPHDPIB() { - return fCCFAPHDPIB; + public RepeatedInt getMIOOCCLLFAA() { + return mIOOCCLLFAA; } /** - * repeated uint32 FCCFAPHDPIB = 8; + * repeated uint32 MIOOCCLLFAA = 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 @@ -193,225 +190,53 @@ public final class GetBagScRspOuterClass { * * @return internal storage object for modifications */ - public RepeatedInt getMutableFCCFAPHDPIB() { + public RepeatedInt getMutableMIOOCCLLFAA() { bitField0_ |= 0x00000004; - return fCCFAPHDPIB; + return mIOOCCLLFAA; } /** - * repeated uint32 FCCFAPHDPIB = 8; - * @param value the fCCFAPHDPIB to add + * repeated uint32 MIOOCCLLFAA = 1; + * @param value the mIOOCCLLFAA to add * @return this */ - public GetBagScRsp addFCCFAPHDPIB(final int value) { + public GetBagScRsp addMIOOCCLLFAA(final int value) { bitField0_ |= 0x00000004; - fCCFAPHDPIB.add(value); + mIOOCCLLFAA.add(value); return this; } /** - * repeated uint32 FCCFAPHDPIB = 8; - * @param values the fCCFAPHDPIB to add + * repeated uint32 MIOOCCLLFAA = 1; + * @param values the mIOOCCLLFAA to add * @return this */ - public GetBagScRsp addAllFCCFAPHDPIB(final int... values) { + public GetBagScRsp addAllMIOOCCLLFAA(final int... values) { bitField0_ |= 0x00000004; - fCCFAPHDPIB.addAll(values); + mIOOCCLLFAA.addAll(values); return this; } /** - * repeated .Material material_list = 1; - * @return whether the materialList field is set + * repeated .Relic relic_list = 2; + * @return whether the relicList field is set */ - public boolean hasMaterialList() { + public boolean hasRelicList() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated .Material material_list = 1; - * @return this - */ - public GetBagScRsp clearMaterialList() { - bitField0_ &= ~0x00000008; - materialList.clear(); - return this; - } - - /** - * repeated .Material material_list = 1; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableMaterialList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMaterialList() { - return materialList; - } - - /** - * repeated .Material material_list = 1; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableMaterialList() { - bitField0_ |= 0x00000008; - return materialList; - } - - /** - * repeated .Material material_list = 1; - * @param value the materialList to add - * @return this - */ - public GetBagScRsp addMaterialList(final MaterialOuterClass.Material value) { - bitField0_ |= 0x00000008; - materialList.add(value); - return this; - } - - /** - * repeated .Material material_list = 1; - * @param values the materialList to add - * @return this - */ - public GetBagScRsp addAllMaterialList(final MaterialOuterClass.Material... values) { - bitField0_ |= 0x00000008; - materialList.addAll(values); - return this; - } - - /** - * 
-     * repeated JAKOAONFNGN KPBMGJKOKDA = 11;
-     *
- * - * repeated .Equipment equipment_list = 2; - * @return whether the equipmentList field is set - */ - public boolean hasEquipmentList() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * 
-     * repeated JAKOAONFNGN KPBMGJKOKDA = 11;
-     *
- * - * repeated .Equipment equipment_list = 2; - * @return this - */ - public GetBagScRsp clearEquipmentList() { - bitField0_ &= ~0x00000010; - equipmentList.clear(); - return this; - } - - /** - * 
-     * repeated JAKOAONFNGN KPBMGJKOKDA = 11;
-     *
- * - * 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. - * - * Use {@link #getMutableEquipmentList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getEquipmentList() { - return equipmentList; - } - - /** - * 
-     * repeated JAKOAONFNGN KPBMGJKOKDA = 11;
-     *
- * - * 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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableEquipmentList() { - bitField0_ |= 0x00000010; - return equipmentList; - } - - /** - * 
-     * repeated JAKOAONFNGN KPBMGJKOKDA = 11;
-     *
- * - * repeated .Equipment equipment_list = 2; - * @param value the equipmentList to add - * @return this - */ - public GetBagScRsp addEquipmentList(final EquipmentOuterClass.Equipment value) { - bitField0_ |= 0x00000010; - equipmentList.add(value); - return this; - } - - /** - * 
-     * repeated JAKOAONFNGN KPBMGJKOKDA = 11;
-     *
- * - * repeated .Equipment equipment_list = 2; - * @param values the equipmentList to add - * @return this - */ - public GetBagScRsp addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { - bitField0_ |= 0x00000010; - equipmentList.addAll(values); - return this; - } - - /** - * 
-     * repeated JAKOAONFNGN LKGOMEBOJAF = 6;
-     *
- * - * repeated .Relic relic_list = 7; - * @return whether the relicList field is set - */ - public boolean hasRelicList() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * 
-     * repeated JAKOAONFNGN LKGOMEBOJAF = 6;
-     *
- * - * repeated .Relic relic_list = 7; + * repeated .Relic relic_list = 2; * @return this */ public GetBagScRsp clearRelicList() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000008; relicList.clear(); return this; } /** - * 
-     * repeated JAKOAONFNGN LKGOMEBOJAF = 6;
-     *
- * - * repeated .Relic relic_list = 7; + * repeated .Relic relic_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -425,11 +250,7 @@ public final class GetBagScRspOuterClass { } /** - * 
-     * repeated JAKOAONFNGN LKGOMEBOJAF = 6;
-     *
- * - * repeated .Relic relic_list = 7; + * repeated .Relic relic_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -438,74 +259,233 @@ public final class GetBagScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableRelicList() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; return relicList; } /** - * 
-     * repeated JAKOAONFNGN LKGOMEBOJAF = 6;
-     *
- * - * repeated .Relic relic_list = 7; + * repeated .Relic relic_list = 2; * @param value the relicList to add * @return this */ public GetBagScRsp addRelicList(final RelicOuterClass.Relic value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; relicList.add(value); return this; } /** - * 
-     * repeated JAKOAONFNGN LKGOMEBOJAF = 6;
-     *
- * - * repeated .Relic relic_list = 7; + * repeated .Relic relic_list = 2; * @param values the relicList to add * @return this */ public GetBagScRsp addAllRelicList(final RelicOuterClass.Relic... values) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; relicList.addAll(values); return this; } /** - * repeated .WaitDelResource wait_del_resource_list = 9; - * @return whether the waitDelResourceList field is set + * 
+     * repeated IIEKAFLADPC GEHHOPNKDFE = 5;
+     * repeated IIEKAFLADPC LOOLEGLHFIP = 10;
+     *
+ * + * repeated .WaitDelResource DNOIJIGOANN = 3; + * @return whether the dNOIJIGOANN field is set */ - public boolean hasWaitDelResourceList() { + public boolean hasDNOIJIGOANN() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * 
+     * repeated IIEKAFLADPC GEHHOPNKDFE = 5;
+     * repeated IIEKAFLADPC LOOLEGLHFIP = 10;
+     *
+ * + * repeated .WaitDelResource DNOIJIGOANN = 3; + * @return this + */ + public GetBagScRsp clearDNOIJIGOANN() { + bitField0_ &= ~0x00000010; + dNOIJIGOANN.clear(); + return this; + } + + /** + * 
+     * repeated IIEKAFLADPC GEHHOPNKDFE = 5;
+     * repeated IIEKAFLADPC LOOLEGLHFIP = 10;
+     *
+ * + * repeated .WaitDelResource DNOIJIGOANN = 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 #getMutableDNOIJIGOANN()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getDNOIJIGOANN() { + return dNOIJIGOANN; + } + + /** + * 
+     * repeated IIEKAFLADPC GEHHOPNKDFE = 5;
+     * repeated IIEKAFLADPC LOOLEGLHFIP = 10;
+     *
+ * + * repeated .WaitDelResource DNOIJIGOANN = 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 getMutableDNOIJIGOANN() { + bitField0_ |= 0x00000010; + return dNOIJIGOANN; + } + + /** + * 
+     * repeated IIEKAFLADPC GEHHOPNKDFE = 5;
+     * repeated IIEKAFLADPC LOOLEGLHFIP = 10;
+     *
+ * + * repeated .WaitDelResource DNOIJIGOANN = 3; + * @param value the dNOIJIGOANN to add + * @return this + */ + public GetBagScRsp addDNOIJIGOANN(final WaitDelResourceOuterClass.WaitDelResource value) { + bitField0_ |= 0x00000010; + dNOIJIGOANN.add(value); + return this; + } + + /** + * 
+     * repeated IIEKAFLADPC GEHHOPNKDFE = 5;
+     * repeated IIEKAFLADPC LOOLEGLHFIP = 10;
+     *
+ * + * repeated .WaitDelResource DNOIJIGOANN = 3; + * @param values the dNOIJIGOANN to add + * @return this + */ + public GetBagScRsp addAllDNOIJIGOANN( + final WaitDelResourceOuterClass.WaitDelResource... values) { + bitField0_ |= 0x00000010; + dNOIJIGOANN.addAll(values); + return this; + } + + /** + * repeated .Material material_list = 6; + * @return whether the materialList field is set + */ + public boolean hasMaterialList() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * repeated .Material material_list = 6; + * @return this + */ + public GetBagScRsp clearMaterialList() { + bitField0_ &= ~0x00000020; + materialList.clear(); + return this; + } + + /** + * 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. + * + * Use {@link #getMutableMaterialList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMaterialList() { + return materialList; + } + + /** + * 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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableMaterialList() { + bitField0_ |= 0x00000020; + return materialList; + } + + /** + * repeated .Material material_list = 6; + * @param value the materialList to add + * @return this + */ + public GetBagScRsp addMaterialList(final MaterialOuterClass.Material value) { + bitField0_ |= 0x00000020; + materialList.add(value); + return this; + } + + /** + * repeated .Material material_list = 6; + * @param values the materialList to add + * @return this + */ + public GetBagScRsp addAllMaterialList(final MaterialOuterClass.Material... values) { + bitField0_ |= 0x00000020; + materialList.addAll(values); + return this; + } + + /** + * repeated .Equipment equipment_list = 14; + * @return whether the equipmentList field is set + */ + public boolean hasEquipmentList() { return (bitField0_ & 0x00000040) != 0; } /** - * repeated .WaitDelResource wait_del_resource_list = 9; + * repeated .Equipment equipment_list = 14; * @return this */ - public GetBagScRsp clearWaitDelResourceList() { + public GetBagScRsp clearEquipmentList() { bitField0_ &= ~0x00000040; - waitDelResourceList.clear(); + equipmentList.clear(); return this; } /** - * repeated .WaitDelResource wait_del_resource_list = 9; + * repeated .Equipment equipment_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableWaitDelResourceList()} if you want to modify it. + * Use {@link #getMutableEquipmentList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getWaitDelResourceList() { - return waitDelResourceList; + public RepeatedMessage getEquipmentList() { + return equipmentList; } /** - * repeated .WaitDelResource wait_del_resource_list = 9; + * repeated .Equipment equipment_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -513,70 +493,67 @@ public final class GetBagScRspOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableWaitDelResourceList( - ) { + public RepeatedMessage getMutableEquipmentList() { bitField0_ |= 0x00000040; - return waitDelResourceList; + return equipmentList; } /** - * repeated .WaitDelResource wait_del_resource_list = 9; - * @param value the waitDelResourceList to add + * repeated .Equipment equipment_list = 14; + * @param value the equipmentList to add * @return this */ - public GetBagScRsp addWaitDelResourceList( - final WaitDelResourceOuterClass.WaitDelResource value) { + public GetBagScRsp addEquipmentList(final EquipmentOuterClass.Equipment value) { bitField0_ |= 0x00000040; - waitDelResourceList.add(value); + equipmentList.add(value); return this; } /** - * repeated .WaitDelResource wait_del_resource_list = 9; - * @param values the waitDelResourceList to add + * repeated .Equipment equipment_list = 14; + * @param values the equipmentList to add * @return this */ - public GetBagScRsp addAllWaitDelResourceList( - final WaitDelResourceOuterClass.WaitDelResource... values) { + public GetBagScRsp addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { bitField0_ |= 0x00000040; - waitDelResourceList.addAll(values); + equipmentList.addAll(values); return this; } /** - * repeated .Material EANGCGPDMBM = 13; - * @return whether the eANGCGPDMBM field is set + * repeated .Material BBKKDJEGAPF = 15; + * @return whether the bBKKDJEGAPF field is set */ - public boolean hasEANGCGPDMBM() { + public boolean hasBBKKDJEGAPF() { return (bitField0_ & 0x00000080) != 0; } /** - * repeated .Material EANGCGPDMBM = 13; + * repeated .Material BBKKDJEGAPF = 15; * @return this */ - public GetBagScRsp clearEANGCGPDMBM() { + public GetBagScRsp clearBBKKDJEGAPF() { bitField0_ &= ~0x00000080; - eANGCGPDMBM.clear(); + bBKKDJEGAPF.clear(); return this; } /** - * repeated .Material EANGCGPDMBM = 13; + * repeated .Material BBKKDJEGAPF = 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 #getMutableEANGCGPDMBM()} if you want to modify it. + * Use {@link #getMutableBBKKDJEGAPF()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getEANGCGPDMBM() { - return eANGCGPDMBM; + public RepeatedMessage getBBKKDJEGAPF() { + return bBKKDJEGAPF; } /** - * repeated .Material EANGCGPDMBM = 13; + * repeated .Material BBKKDJEGAPF = 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 @@ -584,30 +561,30 @@ public final class GetBagScRspOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableEANGCGPDMBM() { + public RepeatedMessage getMutableBBKKDJEGAPF() { bitField0_ |= 0x00000080; - return eANGCGPDMBM; + return bBKKDJEGAPF; } /** - * repeated .Material EANGCGPDMBM = 13; - * @param value the eANGCGPDMBM to add + * repeated .Material BBKKDJEGAPF = 15; + * @param value the bBKKDJEGAPF to add * @return this */ - public GetBagScRsp addEANGCGPDMBM(final MaterialOuterClass.Material value) { + public GetBagScRsp addBBKKDJEGAPF(final MaterialOuterClass.Material value) { bitField0_ |= 0x00000080; - eANGCGPDMBM.add(value); + bBKKDJEGAPF.add(value); return this; } /** - * repeated .Material EANGCGPDMBM = 13; - * @param values the eANGCGPDMBM to add + * repeated .Material BBKKDJEGAPF = 15; + * @param values the bBKKDJEGAPF to add * @return this */ - public GetBagScRsp addAllEANGCGPDMBM(final MaterialOuterClass.Material... values) { + public GetBagScRsp addAllBBKKDJEGAPF(final MaterialOuterClass.Material... values) { bitField0_ |= 0x00000080; - eANGCGPDMBM.addAll(values); + bBKKDJEGAPF.addAll(values); return this; } @@ -617,13 +594,13 @@ public final class GetBagScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - aGDPOHEPDDK = other.aGDPOHEPDDK; - fCCFAPHDPIB.copyFrom(other.fCCFAPHDPIB); + bLDMDEFNEPK = other.bLDMDEFNEPK; + mIOOCCLLFAA.copyFrom(other.mIOOCCLLFAA); + relicList.copyFrom(other.relicList); + dNOIJIGOANN.copyFrom(other.dNOIJIGOANN); materialList.copyFrom(other.materialList); equipmentList.copyFrom(other.equipmentList); - relicList.copyFrom(other.relicList); - waitDelResourceList.copyFrom(other.waitDelResourceList); - eANGCGPDMBM.copyFrom(other.eANGCGPDMBM); + bBKKDJEGAPF.copyFrom(other.bBKKDJEGAPF); } return this; } @@ -637,11 +614,17 @@ public final class GetBagScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasAGDPOHEPDDK()) { - setAGDPOHEPDDK(other.aGDPOHEPDDK); + if (other.hasBLDMDEFNEPK()) { + setBLDMDEFNEPK(other.bLDMDEFNEPK); } - if (other.hasFCCFAPHDPIB()) { - getMutableFCCFAPHDPIB().addAll(other.fCCFAPHDPIB); + if (other.hasMIOOCCLLFAA()) { + getMutableMIOOCCLLFAA().addAll(other.mIOOCCLLFAA); + } + if (other.hasRelicList()) { + getMutableRelicList().addAll(other.relicList); + } + if (other.hasDNOIJIGOANN()) { + getMutableDNOIJIGOANN().addAll(other.dNOIJIGOANN); } if (other.hasMaterialList()) { getMutableMaterialList().addAll(other.materialList); @@ -649,14 +632,8 @@ public final class GetBagScRspOuterClass { if (other.hasEquipmentList()) { getMutableEquipmentList().addAll(other.equipmentList); } - if (other.hasRelicList()) { - getMutableRelicList().addAll(other.relicList); - } - if (other.hasWaitDelResourceList()) { - getMutableWaitDelResourceList().addAll(other.waitDelResourceList); - } - if (other.hasEANGCGPDMBM()) { - getMutableEANGCGPDMBM().addAll(other.eANGCGPDMBM); + if (other.hasBBKKDJEGAPF()) { + getMutableBBKKDJEGAPF().addAll(other.bBKKDJEGAPF); } return this; } @@ -669,13 +646,13 @@ public final class GetBagScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - aGDPOHEPDDK = 0; - fCCFAPHDPIB.clear(); + bLDMDEFNEPK = 0; + mIOOCCLLFAA.clear(); + relicList.clear(); + dNOIJIGOANN.clear(); materialList.clear(); equipmentList.clear(); - relicList.clear(); - waitDelResourceList.clear(); - eANGCGPDMBM.clear(); + bBKKDJEGAPF.clear(); return this; } @@ -686,12 +663,12 @@ public final class GetBagScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - fCCFAPHDPIB.clear(); + mIOOCCLLFAA.clear(); + relicList.clearQuick(); + dNOIJIGOANN.clearQuick(); materialList.clearQuick(); equipmentList.clearQuick(); - relicList.clearQuick(); - waitDelResourceList.clearQuick(); - eANGCGPDMBM.clearQuick(); + bBKKDJEGAPF.clearQuick(); return this; } @@ -706,59 +683,59 @@ public final class GetBagScRspOuterClass { GetBagScRsp other = (GetBagScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasAGDPOHEPDDK() || aGDPOHEPDDK == other.aGDPOHEPDDK) - && (!hasFCCFAPHDPIB() || fCCFAPHDPIB.equals(other.fCCFAPHDPIB)) + && (!hasBLDMDEFNEPK() || bLDMDEFNEPK == other.bLDMDEFNEPK) + && (!hasMIOOCCLLFAA() || mIOOCCLLFAA.equals(other.mIOOCCLLFAA)) + && (!hasRelicList() || relicList.equals(other.relicList)) + && (!hasDNOIJIGOANN() || dNOIJIGOANN.equals(other.dNOIJIGOANN)) && (!hasMaterialList() || materialList.equals(other.materialList)) && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)) - && (!hasRelicList() || relicList.equals(other.relicList)) - && (!hasWaitDelResourceList() || waitDelResourceList.equals(other.waitDelResourceList)) - && (!hasEANGCGPDMBM() || eANGCGPDMBM.equals(other.eANGCGPDMBM)); + && (!hasBBKKDJEGAPF() || bBKKDJEGAPF.equals(other.bBKKDJEGAPF)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(aGDPOHEPDDK); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(bLDMDEFNEPK); } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < fCCFAPHDPIB.length(); i++) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(fCCFAPHDPIB.array()[i]); + for (int i = 0; i < mIOOCCLLFAA.length(); i++) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(mIOOCCLLFAA.array()[i]); } } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < materialList.length(); i++) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(materialList.get(i)); - } - } - if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < equipmentList.length(); i++) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(equipmentList.get(i)); - } - } - if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 18); output.writeMessageNoTag(relicList.get(i)); } } + if ((bitField0_ & 0x00000010) != 0) { + for (int i = 0; i < dNOIJIGOANN.length(); i++) { + output.writeRawByte((byte) 26); + output.writeMessageNoTag(dNOIJIGOANN.get(i)); + } + } + if ((bitField0_ & 0x00000020) != 0) { + for (int i = 0; i < materialList.length(); i++) { + output.writeRawByte((byte) 50); + output.writeMessageNoTag(materialList.get(i)); + } + } if ((bitField0_ & 0x00000040) != 0) { - for (int i = 0; i < waitDelResourceList.length(); i++) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(waitDelResourceList.get(i)); + for (int i = 0; i < equipmentList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(equipmentList.get(i)); } } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < eANGCGPDMBM.length(); i++) { - output.writeRawByte((byte) 106); - output.writeMessageNoTag(eANGCGPDMBM.get(i)); + for (int i = 0; i < bBKKDJEGAPF.length(); i++) { + output.writeRawByte((byte) 122); + output.writeMessageNoTag(bBKKDJEGAPF.get(i)); } } } @@ -770,25 +747,25 @@ public final class GetBagScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(aGDPOHEPDDK); + size += 1 + ProtoSink.computeUInt32SizeNoTag(bLDMDEFNEPK); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * fCCFAPHDPIB.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(fCCFAPHDPIB); + size += (1 * mIOOCCLLFAA.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mIOOCCLLFAA); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); - } - if ((bitField0_ & 0x00000010) != 0) { - size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); - } - if ((bitField0_ & 0x00000020) != 0) { size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); } + if ((bitField0_ & 0x00000010) != 0) { + size += (1 * dNOIJIGOANN.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dNOIJIGOANN); + } + if ((bitField0_ & 0x00000020) != 0) { + size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); + } if ((bitField0_ & 0x00000040) != 0) { - size += (1 * waitDelResourceList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(waitDelResourceList); + size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * eANGCGPDMBM.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(eANGCGPDMBM); + size += (1 * bBKKDJEGAPF.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(bBKKDJEGAPF); } return size; } @@ -800,68 +777,68 @@ public final class GetBagScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { - // aGDPOHEPDDK - aGDPOHEPDDK = input.readUInt32(); + case 104: { + // bLDMDEFNEPK + bLDMDEFNEPK = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { - // fCCFAPHDPIB [packed=true] - input.readPackedUInt32(fCCFAPHDPIB, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 10) { break; } } case 10: { - // materialList - tag = input.readRepeatedMessage(materialList, tag); - bitField0_ |= 0x00000008; + // mIOOCCLLFAA [packed=true] + input.readPackedUInt32(mIOOCCLLFAA, tag); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 18) { break; } } case 18: { - // equipmentList - tag = input.readRepeatedMessage(equipmentList, tag); - bitField0_ |= 0x00000010; - if (tag != 58) { - break; - } - } - case 58: { // relicList tag = input.readRepeatedMessage(relicList, tag); + bitField0_ |= 0x00000008; + if (tag != 26) { + break; + } + } + case 26: { + // dNOIJIGOANN + tag = input.readRepeatedMessage(dNOIJIGOANN, tag); + bitField0_ |= 0x00000010; + if (tag != 50) { + break; + } + } + case 50: { + // materialList + tag = input.readRepeatedMessage(materialList, tag); bitField0_ |= 0x00000020; - if (tag != 74) { + if (tag != 114) { break; } } - case 74: { - // waitDelResourceList - tag = input.readRepeatedMessage(waitDelResourceList, tag); + case 114: { + // equipmentList + tag = input.readRepeatedMessage(equipmentList, tag); bitField0_ |= 0x00000040; - if (tag != 106) { + if (tag != 122) { break; } } - case 106: { - // eANGCGPDMBM - tag = input.readRepeatedMessage(eANGCGPDMBM, tag); + case 122: { + // bBKKDJEGAPF + tag = input.readRepeatedMessage(bBKKDJEGAPF, tag); bitField0_ |= 0x00000080; if (tag != 0) { break; @@ -877,9 +854,9 @@ public final class GetBagScRspOuterClass { tag = input.readTag(); break; } - case 64: { - // fCCFAPHDPIB [packed=false] - tag = input.readRepeatedUInt32(fCCFAPHDPIB, tag); + case 8: { + // mIOOCCLLFAA [packed=false] + tag = input.readRepeatedUInt32(mIOOCCLLFAA, tag); bitField0_ |= 0x00000004; break; } @@ -894,25 +871,25 @@ public final class GetBagScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.aGDPOHEPDDK, aGDPOHEPDDK); + output.writeUInt32(FieldNames.bLDMDEFNEPK, bLDMDEFNEPK); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.fCCFAPHDPIB, fCCFAPHDPIB); + output.writeRepeatedUInt32(FieldNames.mIOOCCLLFAA, mIOOCCLLFAA); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedMessage(FieldNames.materialList, materialList); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeRepeatedMessage(FieldNames.relicList, relicList); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRepeatedMessage(FieldNames.dNOIJIGOANN, dNOIJIGOANN); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRepeatedMessage(FieldNames.materialList, materialList); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedMessage(FieldNames.waitDelResourceList, waitDelResourceList); + output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.eANGCGPDMBM, eANGCGPDMBM); + output.writeRepeatedMessage(FieldNames.bBKKDJEGAPF, bBKKDJEGAPF); } output.endObject(); } @@ -935,10 +912,10 @@ public final class GetBagScRspOuterClass { } break; } - case 953562517: { - if (input.isAtField(FieldNames.aGDPOHEPDDK)) { + case 277919140: { + if (input.isAtField(FieldNames.bLDMDEFNEPK)) { if (!input.trySkipNullValue()) { - aGDPOHEPDDK = input.readUInt32(); + bLDMDEFNEPK = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -946,10 +923,10 @@ public final class GetBagScRspOuterClass { } break; } - case -699644354: { - if (input.isAtField(FieldNames.fCCFAPHDPIB)) { + case -1874925302: { + if (input.isAtField(FieldNames.mIOOCCLLFAA)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(fCCFAPHDPIB); + input.readRepeatedUInt32(mIOOCCLLFAA); bitField0_ |= 0x00000004; } } else { @@ -957,35 +934,34 @@ public final class GetBagScRspOuterClass { } break; } - case -2115854747: - case -1149360970: { - if (input.isAtField(FieldNames.materialList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(materialList); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 2007143244: - case 2109525167: { - if (input.isAtField(FieldNames.equipmentList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(equipmentList); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } case 204814001: case 2071893482: { if (input.isAtField(FieldNames.relicList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(relicList); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 648040854: { + if (input.isAtField(FieldNames.dNOIJIGOANN)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(dNOIJIGOANN); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case -2115854747: + case -1149360970: { + if (input.isAtField(FieldNames.materialList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(materialList); bitField0_ |= 0x00000020; } } else { @@ -993,11 +969,11 @@ public final class GetBagScRspOuterClass { } break; } - case -299057342: - case -402862927: { - if (input.isAtField(FieldNames.waitDelResourceList)) { + case 2007143244: + case 2109525167: { + if (input.isAtField(FieldNames.equipmentList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(waitDelResourceList); + input.readRepeatedMessage(equipmentList); bitField0_ |= 0x00000040; } } else { @@ -1005,10 +981,10 @@ public final class GetBagScRspOuterClass { } break; } - case 2055744523: { - if (input.isAtField(FieldNames.eANGCGPDMBM)) { + case -867835985: { + if (input.isAtField(FieldNames.bBKKDJEGAPF)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(eANGCGPDMBM); + input.readRepeatedMessage(bBKKDJEGAPF); bitField0_ |= 0x00000080; } } else { @@ -1070,19 +1046,19 @@ public final class GetBagScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName aGDPOHEPDDK = FieldName.forField("AGDPOHEPDDK"); + static final FieldName bLDMDEFNEPK = FieldName.forField("BLDMDEFNEPK"); - static final FieldName fCCFAPHDPIB = FieldName.forField("FCCFAPHDPIB"); + static final FieldName mIOOCCLLFAA = FieldName.forField("MIOOCCLLFAA"); + + static final FieldName relicList = FieldName.forField("relicList", "relic_list"); + + static final FieldName dNOIJIGOANN = FieldName.forField("DNOIJIGOANN"); static final FieldName materialList = FieldName.forField("materialList", "material_list"); static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list"); - static final FieldName relicList = FieldName.forField("relicList", "relic_list"); - - static final FieldName waitDelResourceList = FieldName.forField("waitDelResourceList", "wait_del_resource_list"); - - static final FieldName eANGCGPDMBM = FieldName.forField("EANGCGPDMBM"); + static final FieldName bBKKDJEGAPF = FieldName.forField("BBKKDJEGAPF"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java index f2b3630..792b734 100644 --- a/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java @@ -19,42 +19,42 @@ public final class GetBasicInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 last_set_nickname_time = 14; - */ - private long lastSetNicknameTime; - - /** - * optional int64 next_recover_time = 15; + * optional int64 next_recover_time = 11; */ private long nextRecoverTime; /** - * optional uint32 gameplay_birthday = 2; + * optional int64 last_set_nickname_time = 13; */ - private int gameplayBirthday; + private long lastSetNicknameTime; /** - * optional uint32 exchange_times = 3; - */ - private int exchangeTimes; - - /** - * optional uint32 cur_day = 7; - */ - private int curDay; - - /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional uint32 week_cocoon_finished_count = 13; + * optional uint32 exchange_times = 6; + */ + private int exchangeTimes; + + /** + * optional uint32 week_cocoon_finished_count = 7; */ private int weekCocoonFinishedCount; /** - * optional .PlayerSettingInfo player_setting_info = 12; + * optional uint32 gameplay_birthday = 8; + */ + private int gameplayBirthday; + + /** + * optional uint32 cur_day = 10; + */ + private int curDay; + + /** + * optional .PlayerSettingInfo player_setting_info = 4; */ private final PlayerSettingInfoOuterClass.PlayerSettingInfo playerSettingInfo = PlayerSettingInfoOuterClass.PlayerSettingInfo.newInstance(); @@ -69,62 +69,25 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 last_set_nickname_time = 14; - * @return whether the lastSetNicknameTime field is set + * optional int64 next_recover_time = 11; + * @return whether the nextRecoverTime field is set */ - public boolean hasLastSetNicknameTime() { + public boolean hasNextRecoverTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional int64 last_set_nickname_time = 14; - * @return this - */ - public GetBasicInfoScRsp clearLastSetNicknameTime() { - bitField0_ &= ~0x00000001; - lastSetNicknameTime = 0L; - return this; - } - - /** - * optional int64 last_set_nickname_time = 14; - * @return the lastSetNicknameTime - */ - public long getLastSetNicknameTime() { - return lastSetNicknameTime; - } - - /** - * optional int64 last_set_nickname_time = 14; - * @param value the lastSetNicknameTime to set - * @return this - */ - public GetBasicInfoScRsp setLastSetNicknameTime(final long value) { - bitField0_ |= 0x00000001; - lastSetNicknameTime = value; - return this; - } - - /** - * optional int64 next_recover_time = 15; - * @return whether the nextRecoverTime field is set - */ - public boolean hasNextRecoverTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 next_recover_time = 15; + * optional int64 next_recover_time = 11; * @return this */ public GetBasicInfoScRsp clearNextRecoverTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; nextRecoverTime = 0L; return this; } /** - * optional int64 next_recover_time = 15; + * optional int64 next_recover_time = 11; * @return the nextRecoverTime */ public long getNextRecoverTime() { @@ -132,55 +95,92 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 next_recover_time = 15; + * optional int64 next_recover_time = 11; * @param value the nextRecoverTime to set * @return this */ public GetBasicInfoScRsp setNextRecoverTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; nextRecoverTime = value; return this; } /** - * optional uint32 gameplay_birthday = 2; - * @return whether the gameplayBirthday field is set + * optional int64 last_set_nickname_time = 13; + * @return whether the lastSetNicknameTime field is set */ - public boolean hasGameplayBirthday() { + public boolean hasLastSetNicknameTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 last_set_nickname_time = 13; + * @return this + */ + public GetBasicInfoScRsp clearLastSetNicknameTime() { + bitField0_ &= ~0x00000002; + lastSetNicknameTime = 0L; + return this; + } + + /** + * optional int64 last_set_nickname_time = 13; + * @return the lastSetNicknameTime + */ + public long getLastSetNicknameTime() { + return lastSetNicknameTime; + } + + /** + * optional int64 last_set_nickname_time = 13; + * @param value the lastSetNicknameTime to set + * @return this + */ + public GetBasicInfoScRsp setLastSetNicknameTime(final long value) { + bitField0_ |= 0x00000002; + lastSetNicknameTime = value; + return this; + } + + /** + * optional uint32 retcode = 2; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 gameplay_birthday = 2; + * optional uint32 retcode = 2; * @return this */ - public GetBasicInfoScRsp clearGameplayBirthday() { + public GetBasicInfoScRsp clearRetcode() { bitField0_ &= ~0x00000004; - gameplayBirthday = 0; + retcode = 0; return this; } /** - * optional uint32 gameplay_birthday = 2; - * @return the gameplayBirthday + * optional uint32 retcode = 2; + * @return the retcode */ - public int getGameplayBirthday() { - return gameplayBirthday; + public int getRetcode() { + return retcode; } /** - * optional uint32 gameplay_birthday = 2; - * @param value the gameplayBirthday to set + * optional uint32 retcode = 2; + * @param value the retcode to set * @return this */ - public GetBasicInfoScRsp setGameplayBirthday(final int value) { + public GetBasicInfoScRsp setRetcode(final int value) { bitField0_ |= 0x00000004; - gameplayBirthday = value; + retcode = value; return this; } /** - * optional uint32 exchange_times = 3; + * optional uint32 exchange_times = 6; * @return whether the exchangeTimes field is set */ public boolean hasExchangeTimes() { @@ -188,7 +188,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 exchange_times = 3; + * optional uint32 exchange_times = 6; * @return this */ public GetBasicInfoScRsp clearExchangeTimes() { @@ -198,7 +198,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 exchange_times = 3; + * optional uint32 exchange_times = 6; * @return the exchangeTimes */ public int getExchangeTimes() { @@ -206,7 +206,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 exchange_times = 3; + * optional uint32 exchange_times = 6; * @param value the exchangeTimes to set * @return this */ @@ -217,99 +217,25 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 cur_day = 7; - * @return whether the curDay field is set + * optional uint32 week_cocoon_finished_count = 7; + * @return whether the weekCocoonFinishedCount field is set */ - public boolean hasCurDay() { + public boolean hasWeekCocoonFinishedCount() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 cur_day = 7; - * @return this - */ - public GetBasicInfoScRsp clearCurDay() { - bitField0_ &= ~0x00000010; - curDay = 0; - return this; - } - - /** - * optional uint32 cur_day = 7; - * @return the curDay - */ - public int getCurDay() { - return curDay; - } - - /** - * optional uint32 cur_day = 7; - * @param value the curDay to set - * @return this - */ - public GetBasicInfoScRsp setCurDay(final int value) { - bitField0_ |= 0x00000010; - curDay = value; - return this; - } - - /** - * optional uint32 retcode = 10; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 retcode = 10; - * @return this - */ - public GetBasicInfoScRsp clearRetcode() { - bitField0_ &= ~0x00000020; - 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 GetBasicInfoScRsp setRetcode(final int value) { - bitField0_ |= 0x00000020; - retcode = value; - return this; - } - - /** - * optional uint32 week_cocoon_finished_count = 13; - * @return whether the weekCocoonFinishedCount field is set - */ - public boolean hasWeekCocoonFinishedCount() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional uint32 week_cocoon_finished_count = 13; + * optional uint32 week_cocoon_finished_count = 7; * @return this */ public GetBasicInfoScRsp clearWeekCocoonFinishedCount() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000010; weekCocoonFinishedCount = 0; return this; } /** - * optional uint32 week_cocoon_finished_count = 13; + * optional uint32 week_cocoon_finished_count = 7; * @return the weekCocoonFinishedCount */ public int getWeekCocoonFinishedCount() { @@ -317,18 +243,92 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 week_cocoon_finished_count = 13; + * optional uint32 week_cocoon_finished_count = 7; * @param value the weekCocoonFinishedCount to set * @return this */ public GetBasicInfoScRsp setWeekCocoonFinishedCount(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; weekCocoonFinishedCount = value; return this; } /** - * optional .PlayerSettingInfo player_setting_info = 12; + * optional uint32 gameplay_birthday = 8; + * @return whether the gameplayBirthday field is set + */ + public boolean hasGameplayBirthday() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 gameplay_birthday = 8; + * @return this + */ + public GetBasicInfoScRsp clearGameplayBirthday() { + bitField0_ &= ~0x00000020; + gameplayBirthday = 0; + return this; + } + + /** + * optional uint32 gameplay_birthday = 8; + * @return the gameplayBirthday + */ + public int getGameplayBirthday() { + return gameplayBirthday; + } + + /** + * optional uint32 gameplay_birthday = 8; + * @param value the gameplayBirthday to set + * @return this + */ + public GetBasicInfoScRsp setGameplayBirthday(final int value) { + bitField0_ |= 0x00000020; + gameplayBirthday = value; + return this; + } + + /** + * optional uint32 cur_day = 10; + * @return whether the curDay field is set + */ + public boolean hasCurDay() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional uint32 cur_day = 10; + * @return this + */ + public GetBasicInfoScRsp clearCurDay() { + bitField0_ &= ~0x00000040; + curDay = 0; + return this; + } + + /** + * optional uint32 cur_day = 10; + * @return the curDay + */ + public int getCurDay() { + return curDay; + } + + /** + * optional uint32 cur_day = 10; + * @param value the curDay to set + * @return this + */ + public GetBasicInfoScRsp setCurDay(final int value) { + bitField0_ |= 0x00000040; + curDay = value; + return this; + } + + /** + * optional .PlayerSettingInfo player_setting_info = 4; * @return whether the playerSettingInfo field is set */ public boolean hasPlayerSettingInfo() { @@ -336,7 +336,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 12; + * optional .PlayerSettingInfo player_setting_info = 4; * @return this */ public GetBasicInfoScRsp clearPlayerSettingInfo() { @@ -346,7 +346,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 12; + * optional .PlayerSettingInfo player_setting_info = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -360,7 +360,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 12; + * optional .PlayerSettingInfo player_setting_info = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -374,7 +374,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 12; + * optional .PlayerSettingInfo player_setting_info = 4; * @param value the playerSettingInfo to set * @return this */ @@ -390,13 +390,13 @@ public final class GetBasicInfoScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - lastSetNicknameTime = other.lastSetNicknameTime; nextRecoverTime = other.nextRecoverTime; - gameplayBirthday = other.gameplayBirthday; - exchangeTimes = other.exchangeTimes; - curDay = other.curDay; + lastSetNicknameTime = other.lastSetNicknameTime; retcode = other.retcode; + exchangeTimes = other.exchangeTimes; weekCocoonFinishedCount = other.weekCocoonFinishedCount; + gameplayBirthday = other.gameplayBirthday; + curDay = other.curDay; playerSettingInfo.copyFrom(other.playerSettingInfo); } return this; @@ -408,27 +408,27 @@ public final class GetBasicInfoScRspOuterClass { return this; } cachedSize = -1; - if (other.hasLastSetNicknameTime()) { - setLastSetNicknameTime(other.lastSetNicknameTime); - } if (other.hasNextRecoverTime()) { setNextRecoverTime(other.nextRecoverTime); } - if (other.hasGameplayBirthday()) { - setGameplayBirthday(other.gameplayBirthday); - } - if (other.hasExchangeTimes()) { - setExchangeTimes(other.exchangeTimes); - } - if (other.hasCurDay()) { - setCurDay(other.curDay); + if (other.hasLastSetNicknameTime()) { + setLastSetNicknameTime(other.lastSetNicknameTime); } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasExchangeTimes()) { + setExchangeTimes(other.exchangeTimes); + } if (other.hasWeekCocoonFinishedCount()) { setWeekCocoonFinishedCount(other.weekCocoonFinishedCount); } + if (other.hasGameplayBirthday()) { + setGameplayBirthday(other.gameplayBirthday); + } + if (other.hasCurDay()) { + setCurDay(other.curDay); + } if (other.hasPlayerSettingInfo()) { getMutablePlayerSettingInfo().mergeFrom(other.playerSettingInfo); } @@ -442,13 +442,13 @@ public final class GetBasicInfoScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - lastSetNicknameTime = 0L; nextRecoverTime = 0L; - gameplayBirthday = 0; - exchangeTimes = 0; - curDay = 0; + lastSetNicknameTime = 0L; retcode = 0; + exchangeTimes = 0; weekCocoonFinishedCount = 0; + gameplayBirthday = 0; + curDay = 0; playerSettingInfo.clear(); return this; } @@ -474,48 +474,48 @@ public final class GetBasicInfoScRspOuterClass { } GetBasicInfoScRsp other = (GetBasicInfoScRsp) o; return bitField0_ == other.bitField0_ - && (!hasLastSetNicknameTime() || lastSetNicknameTime == other.lastSetNicknameTime) && (!hasNextRecoverTime() || nextRecoverTime == other.nextRecoverTime) - && (!hasGameplayBirthday() || gameplayBirthday == other.gameplayBirthday) - && (!hasExchangeTimes() || exchangeTimes == other.exchangeTimes) - && (!hasCurDay() || curDay == other.curDay) + && (!hasLastSetNicknameTime() || lastSetNicknameTime == other.lastSetNicknameTime) && (!hasRetcode() || retcode == other.retcode) + && (!hasExchangeTimes() || exchangeTimes == other.exchangeTimes) && (!hasWeekCocoonFinishedCount() || weekCocoonFinishedCount == other.weekCocoonFinishedCount) + && (!hasGameplayBirthday() || gameplayBirthday == other.gameplayBirthday) + && (!hasCurDay() || curDay == other.curDay) && (!hasPlayerSettingInfo() || playerSettingInfo.equals(other.playerSettingInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); - output.writeInt64NoTag(lastSetNicknameTime); + output.writeRawByte((byte) 88); + output.writeInt64NoTag(nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeInt64NoTag(nextRecoverTime); + output.writeRawByte((byte) 104); + output.writeInt64NoTag(lastSetNicknameTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(gameplayBirthday); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(exchangeTimes); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 56); - output.writeUInt32NoTag(curDay); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 104); output.writeUInt32NoTag(weekCocoonFinishedCount); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(gameplayBirthday); + } + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(curDay); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 34); output.writeMessageNoTag(playerSettingInfo); } } @@ -524,25 +524,25 @@ public final class GetBasicInfoScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(lastSetNicknameTime); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeInt64SizeNoTag(nextRecoverTime); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeInt64SizeNoTag(lastSetNicknameTime); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(exchangeTimes); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curDay); + size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curDay); } if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(playerSettingInfo); @@ -557,18 +557,18 @@ public final class GetBasicInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { - // lastSetNicknameTime - lastSetNicknameTime = input.readInt64(); + case 88: { + // nextRecoverTime + nextRecoverTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 104) { break; } } - case 120: { - // nextRecoverTime - nextRecoverTime = input.readInt64(); + case 104: { + // lastSetNicknameTime + lastSetNicknameTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 16) { @@ -576,15 +576,15 @@ public final class GetBasicInfoScRspOuterClass { } } case 16: { - // gameplayBirthday - gameplayBirthday = input.readUInt32(); + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 24) { + if (tag != 48) { break; } } - case 24: { + case 48: { // exchangeTimes exchangeTimes = input.readUInt32(); bitField0_ |= 0x00000008; @@ -594,33 +594,33 @@ public final class GetBasicInfoScRspOuterClass { } } case 56: { - // curDay - curDay = input.readUInt32(); + // weekCocoonFinishedCount + weekCocoonFinishedCount = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // gameplayBirthday + gameplayBirthday = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); if (tag != 80) { break; } } case 80: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // weekCocoonFinishedCount - weekCocoonFinishedCount = input.readUInt32(); + // curDay + curDay = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 98) { + if (tag != 34) { break; } } - case 98: { + case 34: { // playerSettingInfo input.readMessage(playerSettingInfo); bitField0_ |= 0x00000080; @@ -647,25 +647,25 @@ public final class GetBasicInfoScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.lastSetNicknameTime, lastSetNicknameTime); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeInt64(FieldNames.nextRecoverTime, nextRecoverTime); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeInt64(FieldNames.lastSetNicknameTime, lastSetNicknameTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.exchangeTimes, exchangeTimes); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.curDay, curDay); + output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount); + output.writeUInt32(FieldNames.curDay, curDay); } if ((bitField0_ & 0x00000080) != 0) { output.writeMessage(FieldNames.playerSettingInfo, playerSettingInfo); @@ -680,11 +680,11 @@ public final class GetBasicInfoScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1278606439: - case 400029048: { - if (input.isAtField(FieldNames.lastSetNicknameTime)) { + case -1964148386: + case 394600084: { + if (input.isAtField(FieldNames.nextRecoverTime)) { if (!input.trySkipNullValue()) { - lastSetNicknameTime = input.readInt64(); + nextRecoverTime = input.readInt64(); bitField0_ |= 0x00000001; } } else { @@ -692,11 +692,11 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case -1964148386: - case 394600084: { - if (input.isAtField(FieldNames.nextRecoverTime)) { + case 1278606439: + case 400029048: { + if (input.isAtField(FieldNames.lastSetNicknameTime)) { if (!input.trySkipNullValue()) { - nextRecoverTime = input.readInt64(); + lastSetNicknameTime = input.readInt64(); bitField0_ |= 0x00000002; } } else { @@ -704,11 +704,10 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case 686542531: - case 172986486: { - if (input.isAtField(FieldNames.gameplayBirthday)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - gameplayBirthday = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -728,11 +727,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_ |= 0x00000010; } } else { @@ -740,10 +739,11 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 686542531: + case 172986486: { + if (input.isAtField(FieldNames.gameplayBirthday)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + gameplayBirthday = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -751,11 +751,11 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case 1387396786: - case 668486783: { - if (input.isAtField(FieldNames.weekCocoonFinishedCount)) { + case -1349164740: + case 1126372637: { + if (input.isAtField(FieldNames.curDay)) { if (!input.trySkipNullValue()) { - weekCocoonFinishedCount = input.readUInt32(); + curDay = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -828,20 +828,20 @@ public final class GetBasicInfoScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName lastSetNicknameTime = FieldName.forField("lastSetNicknameTime", "last_set_nickname_time"); - static final FieldName nextRecoverTime = FieldName.forField("nextRecoverTime", "next_recover_time"); - static final FieldName gameplayBirthday = FieldName.forField("gameplayBirthday", "gameplay_birthday"); - - static final FieldName exchangeTimes = FieldName.forField("exchangeTimes", "exchange_times"); - - static final FieldName curDay = FieldName.forField("curDay", "cur_day"); + static final FieldName lastSetNicknameTime = FieldName.forField("lastSetNicknameTime", "last_set_nickname_time"); static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName exchangeTimes = FieldName.forField("exchangeTimes", "exchange_times"); + static final FieldName weekCocoonFinishedCount = FieldName.forField("weekCocoonFinishedCount", "week_cocoon_finished_count"); + static final FieldName gameplayBirthday = FieldName.forField("gameplayBirthday", "gameplay_birthday"); + + static final FieldName curDay = FieldName.forField("curDay", "cur_day"); + static final FieldName playerSettingInfo = FieldName.forField("playerSettingInfo", "player_setting_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java index 99666ef..57403b7 100644 --- a/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java @@ -20,11 +20,7 @@ public final class GetChallengeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; */ private int retcode; @@ -44,11 +40,7 @@ public final class GetChallengeScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -56,11 +48,7 @@ public final class GetChallengeScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @return this */ public GetChallengeScRsp clearRetcode() { @@ -70,11 +58,7 @@ public final class GetChallengeScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -82,11 +66,7 @@ public final class GetChallengeScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -230,7 +210,7 @@ public final class GetChallengeScRspOuterClass { @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) { @@ -260,7 +240,7 @@ public final class GetChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java index da265f2..e3f28c6 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 = 6; + * optional uint32 retcode = 9; */ private int retcode; /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 3; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 9; * @return this */ public GetCurLineupDataScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 3; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -84,7 +84,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 3; * @return this */ public GetCurLineupDataScRsp clearLineup() { @@ -94,7 +94,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 3; * @param value the lineup to set * @return this */ @@ -198,11 +198,11 @@ public final class GetCurLineupDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 26); output.writeMessageNoTag(lineup); } } @@ -226,16 +226,16 @@ public final class GetCurLineupDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 26) { break; } } - case 74: { + case 26: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetCurSceneInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetCurSceneInfoScRspOuterClass.java index 4a05301..f31bc44 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 = 9; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 6; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 1; * @return this */ public GetCurSceneInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 6; * @return whether the scene field is set */ public boolean hasScene() { @@ -84,7 +84,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 6; * @return this */ public GetCurSceneInfoScRsp clearScene() { @@ -94,7 +94,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 6; * @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) 72); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 50); output.writeMessageNoTag(scene); } } @@ -226,16 +226,16 @@ public final class GetCurSceneInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 50) { break; } } - case 122: { + case 50: { // scene input.readMessage(scene); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java index f411d71..9702437 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java @@ -20,21 +20,17 @@ public final class GetFriendListInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * * optional uint32 retcode = 8; */ private int retcode; /** - * repeated .SimpleInfo simple_info = 1; + * repeated .SimpleInfo simple_info = 5; */ private final RepeatedMessage simpleInfo = RepeatedMessage.newEmptyInstance(SimpleInfoOuterClass.SimpleInfo.getFactory()); /** - * repeated .FriendListInfo friend_list = 14; + * repeated .FriendListInfo friend_list = 15; */ private final RepeatedMessage friendList = RepeatedMessage.newEmptyInstance(FriendListInfoOuterClass.FriendListInfo.getFactory()); @@ -49,10 +45,6 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * * optional uint32 retcode = 8; * @return whether the retcode field is set */ @@ -61,10 +53,6 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * * optional uint32 retcode = 8; * @return this */ @@ -75,10 +63,6 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * * optional uint32 retcode = 8; * @return the retcode */ @@ -87,10 +71,6 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * * optional uint32 retcode = 8; * @param value the retcode to set * @return this @@ -102,7 +82,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .SimpleInfo simple_info = 1; + * repeated .SimpleInfo simple_info = 5; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -110,7 +90,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .SimpleInfo simple_info = 1; + * repeated .SimpleInfo simple_info = 5; * @return this */ public GetFriendListInfoScRsp clearSimpleInfo() { @@ -120,7 +100,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .SimpleInfo simple_info = 1; + * repeated .SimpleInfo simple_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. @@ -134,7 +114,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .SimpleInfo simple_info = 1; + * repeated .SimpleInfo simple_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 @@ -148,7 +128,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .SimpleInfo simple_info = 1; + * repeated .SimpleInfo simple_info = 5; * @param value the simpleInfo to add * @return this */ @@ -159,7 +139,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .SimpleInfo simple_info = 1; + * repeated .SimpleInfo simple_info = 5; * @param values the simpleInfo to add * @return this */ @@ -171,7 +151,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 14; + * repeated .FriendListInfo friend_list = 15; * @return whether the friendList field is set */ public boolean hasFriendList() { @@ -179,7 +159,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 14; + * repeated .FriendListInfo friend_list = 15; * @return this */ public GetFriendListInfoScRsp clearFriendList() { @@ -189,7 +169,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 14; + * repeated .FriendListInfo friend_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. @@ -203,7 +183,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 14; + * repeated .FriendListInfo friend_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 @@ -217,7 +197,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 14; + * repeated .FriendListInfo friend_list = 15; * @param value the friendList to add * @return this */ @@ -229,7 +209,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 14; + * repeated .FriendListInfo friend_list = 15; * @param values the friendList to add * @return this */ @@ -318,13 +298,13 @@ public final class GetFriendListInfoScRspOuterClass { } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < simpleInfo.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 42); output.writeMessageNoTag(simpleInfo.get(i)); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < friendList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 122); output.writeMessageNoTag(friendList.get(i)); } } @@ -357,19 +337,19 @@ public final class GetFriendListInfoScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 42) { break; } } - case 10: { + case 42: { // simpleInfo tag = input.readRepeatedMessage(simpleInfo, tag); bitField0_ |= 0x00000002; - if (tag != 114) { + if (tag != 122) { break; } } - case 114: { + case 122: { // friendList tag = input.readRepeatedMessage(friendList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java index 1bb0de4..e9d6160 100644 --- a/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java @@ -20,32 +20,32 @@ public final class GetGachaInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 LDHOFGOIKPI = 1; + * optional uint32 DGKOENMHFHH = 3; */ - private int lDHOFGOIKPI; + private int dGKOENMHFHH; /** - * optional uint32 NMAOJEIEDAK = 2; - */ - private int nMAOJEIEDAK; - - /** - * optional uint32 gacha_random = 5; - */ - private int gachaRandom; - - /** - * optional uint32 PGJDNMCPFIE = 8; - */ - private int pGJDNMCPFIE; - - /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 4; */ private int retcode; /** - * repeated .GachaInfo gacha_info_list = 10; + * optional uint32 CBEGPPCBNNF = 5; + */ + private int cBEGPPCBNNF; + + /** + * optional uint32 PHCKGIKDJGK = 13; + */ + private int pHCKGIKDJGK; + + /** + * optional uint32 ADOFPIGHFBE = 14; + */ + private int aDOFPIGHFBE; + + /** + * repeated .GachaInfo gacha_info_list = 12; */ private final RepeatedMessage gachaInfoList = RepeatedMessage.newEmptyInstance(GachaInfoOuterClass.GachaInfo.getFactory()); @@ -60,173 +60,62 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 LDHOFGOIKPI = 1; - * @return whether the lDHOFGOIKPI field is set + * optional uint32 DGKOENMHFHH = 3; + * @return whether the dGKOENMHFHH field is set */ - public boolean hasLDHOFGOIKPI() { + public boolean hasDGKOENMHFHH() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 LDHOFGOIKPI = 1; + * optional uint32 DGKOENMHFHH = 3; * @return this */ - public GetGachaInfoScRsp clearLDHOFGOIKPI() { + public GetGachaInfoScRsp clearDGKOENMHFHH() { bitField0_ &= ~0x00000001; - lDHOFGOIKPI = 0; + dGKOENMHFHH = 0; return this; } /** - * optional uint32 LDHOFGOIKPI = 1; - * @return the lDHOFGOIKPI + * optional uint32 DGKOENMHFHH = 3; + * @return the dGKOENMHFHH */ - public int getLDHOFGOIKPI() { - return lDHOFGOIKPI; + public int getDGKOENMHFHH() { + return dGKOENMHFHH; } /** - * optional uint32 LDHOFGOIKPI = 1; - * @param value the lDHOFGOIKPI to set + * optional uint32 DGKOENMHFHH = 3; + * @param value the dGKOENMHFHH to set * @return this */ - public GetGachaInfoScRsp setLDHOFGOIKPI(final int value) { + public GetGachaInfoScRsp setDGKOENMHFHH(final int value) { bitField0_ |= 0x00000001; - lDHOFGOIKPI = value; + dGKOENMHFHH = value; return this; } /** - * optional uint32 NMAOJEIEDAK = 2; - * @return whether the nMAOJEIEDAK field is set + * optional uint32 retcode = 4; + * @return whether the retcode field is set */ - public boolean hasNMAOJEIEDAK() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 NMAOJEIEDAK = 2; - * @return this - */ - public GetGachaInfoScRsp clearNMAOJEIEDAK() { - bitField0_ &= ~0x00000002; - nMAOJEIEDAK = 0; - return this; - } - - /** - * optional uint32 NMAOJEIEDAK = 2; - * @return the nMAOJEIEDAK - */ - public int getNMAOJEIEDAK() { - return nMAOJEIEDAK; - } - - /** - * optional uint32 NMAOJEIEDAK = 2; - * @param value the nMAOJEIEDAK to set - * @return this - */ - public GetGachaInfoScRsp setNMAOJEIEDAK(final int value) { - bitField0_ |= 0x00000002; - nMAOJEIEDAK = value; - return this; - } - - /** - * optional uint32 gacha_random = 5; - * @return whether the gachaRandom field is set - */ - public boolean hasGachaRandom() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 gacha_random = 5; - * @return this - */ - public GetGachaInfoScRsp clearGachaRandom() { - bitField0_ &= ~0x00000004; - gachaRandom = 0; - return this; - } - - /** - * optional uint32 gacha_random = 5; - * @return the gachaRandom - */ - public int getGachaRandom() { - return gachaRandom; - } - - /** - * optional uint32 gacha_random = 5; - * @param value the gachaRandom to set - * @return this - */ - public GetGachaInfoScRsp setGachaRandom(final int value) { - bitField0_ |= 0x00000004; - gachaRandom = value; - return this; - } - - /** - * optional uint32 PGJDNMCPFIE = 8; - * @return whether the pGJDNMCPFIE field is set - */ - public boolean hasPGJDNMCPFIE() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 PGJDNMCPFIE = 8; - * @return this - */ - public GetGachaInfoScRsp clearPGJDNMCPFIE() { - bitField0_ &= ~0x00000008; - pGJDNMCPFIE = 0; - return this; - } - - /** - * optional uint32 PGJDNMCPFIE = 8; - * @return the pGJDNMCPFIE - */ - public int getPGJDNMCPFIE() { - return pGJDNMCPFIE; - } - - /** - * optional uint32 PGJDNMCPFIE = 8; - * @param value the pGJDNMCPFIE to set - * @return this - */ - public GetGachaInfoScRsp setPGJDNMCPFIE(final int value) { - bitField0_ |= 0x00000008; - pGJDNMCPFIE = value; - return this; - } - - /** - * optional uint32 retcode = 13; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 4; * @return this */ public GetGachaInfoScRsp clearRetcode() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000002; retcode = 0; return this; } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -234,18 +123,129 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ public GetGachaInfoScRsp setRetcode(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; retcode = value; return this; } /** - * repeated .GachaInfo gacha_info_list = 10; + * optional uint32 CBEGPPCBNNF = 5; + * @return whether the cBEGPPCBNNF field is set + */ + public boolean hasCBEGPPCBNNF() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 CBEGPPCBNNF = 5; + * @return this + */ + public GetGachaInfoScRsp clearCBEGPPCBNNF() { + bitField0_ &= ~0x00000004; + cBEGPPCBNNF = 0; + return this; + } + + /** + * optional uint32 CBEGPPCBNNF = 5; + * @return the cBEGPPCBNNF + */ + public int getCBEGPPCBNNF() { + return cBEGPPCBNNF; + } + + /** + * optional uint32 CBEGPPCBNNF = 5; + * @param value the cBEGPPCBNNF to set + * @return this + */ + public GetGachaInfoScRsp setCBEGPPCBNNF(final int value) { + bitField0_ |= 0x00000004; + cBEGPPCBNNF = value; + return this; + } + + /** + * optional uint32 PHCKGIKDJGK = 13; + * @return whether the pHCKGIKDJGK field is set + */ + public boolean hasPHCKGIKDJGK() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 PHCKGIKDJGK = 13; + * @return this + */ + public GetGachaInfoScRsp clearPHCKGIKDJGK() { + bitField0_ &= ~0x00000008; + pHCKGIKDJGK = 0; + return this; + } + + /** + * optional uint32 PHCKGIKDJGK = 13; + * @return the pHCKGIKDJGK + */ + public int getPHCKGIKDJGK() { + return pHCKGIKDJGK; + } + + /** + * optional uint32 PHCKGIKDJGK = 13; + * @param value the pHCKGIKDJGK to set + * @return this + */ + public GetGachaInfoScRsp setPHCKGIKDJGK(final int value) { + bitField0_ |= 0x00000008; + pHCKGIKDJGK = value; + return this; + } + + /** + * optional uint32 ADOFPIGHFBE = 14; + * @return whether the aDOFPIGHFBE field is set + */ + public boolean hasADOFPIGHFBE() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 ADOFPIGHFBE = 14; + * @return this + */ + public GetGachaInfoScRsp clearADOFPIGHFBE() { + bitField0_ &= ~0x00000010; + aDOFPIGHFBE = 0; + return this; + } + + /** + * optional uint32 ADOFPIGHFBE = 14; + * @return the aDOFPIGHFBE + */ + public int getADOFPIGHFBE() { + return aDOFPIGHFBE; + } + + /** + * optional uint32 ADOFPIGHFBE = 14; + * @param value the aDOFPIGHFBE to set + * @return this + */ + public GetGachaInfoScRsp setADOFPIGHFBE(final int value) { + bitField0_ |= 0x00000010; + aDOFPIGHFBE = value; + return this; + } + + /** + * repeated .GachaInfo gacha_info_list = 12; * @return whether the gachaInfoList field is set */ public boolean hasGachaInfoList() { @@ -253,7 +253,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 10; + * repeated .GachaInfo gacha_info_list = 12; * @return this */ public GetGachaInfoScRsp clearGachaInfoList() { @@ -263,7 +263,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 10; + * repeated .GachaInfo gacha_info_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -277,7 +277,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 10; + * repeated .GachaInfo gacha_info_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -291,7 +291,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 10; + * repeated .GachaInfo gacha_info_list = 12; * @param value the gachaInfoList to add * @return this */ @@ -302,7 +302,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 10; + * repeated .GachaInfo gacha_info_list = 12; * @param values the gachaInfoList to add * @return this */ @@ -317,11 +317,11 @@ public final class GetGachaInfoScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - lDHOFGOIKPI = other.lDHOFGOIKPI; - nMAOJEIEDAK = other.nMAOJEIEDAK; - gachaRandom = other.gachaRandom; - pGJDNMCPFIE = other.pGJDNMCPFIE; + dGKOENMHFHH = other.dGKOENMHFHH; retcode = other.retcode; + cBEGPPCBNNF = other.cBEGPPCBNNF; + pHCKGIKDJGK = other.pHCKGIKDJGK; + aDOFPIGHFBE = other.aDOFPIGHFBE; gachaInfoList.copyFrom(other.gachaInfoList); } return this; @@ -333,21 +333,21 @@ public final class GetGachaInfoScRspOuterClass { return this; } cachedSize = -1; - if (other.hasLDHOFGOIKPI()) { - setLDHOFGOIKPI(other.lDHOFGOIKPI); - } - if (other.hasNMAOJEIEDAK()) { - setNMAOJEIEDAK(other.nMAOJEIEDAK); - } - if (other.hasGachaRandom()) { - setGachaRandom(other.gachaRandom); - } - if (other.hasPGJDNMCPFIE()) { - setPGJDNMCPFIE(other.pGJDNMCPFIE); + if (other.hasDGKOENMHFHH()) { + setDGKOENMHFHH(other.dGKOENMHFHH); } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasCBEGPPCBNNF()) { + setCBEGPPCBNNF(other.cBEGPPCBNNF); + } + if (other.hasPHCKGIKDJGK()) { + setPHCKGIKDJGK(other.pHCKGIKDJGK); + } + if (other.hasADOFPIGHFBE()) { + setADOFPIGHFBE(other.aDOFPIGHFBE); + } if (other.hasGachaInfoList()) { getMutableGachaInfoList().addAll(other.gachaInfoList); } @@ -361,11 +361,11 @@ public final class GetGachaInfoScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - lDHOFGOIKPI = 0; - nMAOJEIEDAK = 0; - gachaRandom = 0; - pGJDNMCPFIE = 0; + dGKOENMHFHH = 0; retcode = 0; + cBEGPPCBNNF = 0; + pHCKGIKDJGK = 0; + aDOFPIGHFBE = 0; gachaInfoList.clear(); return this; } @@ -391,39 +391,39 @@ public final class GetGachaInfoScRspOuterClass { } GetGachaInfoScRsp other = (GetGachaInfoScRsp) o; return bitField0_ == other.bitField0_ - && (!hasLDHOFGOIKPI() || lDHOFGOIKPI == other.lDHOFGOIKPI) - && (!hasNMAOJEIEDAK() || nMAOJEIEDAK == other.nMAOJEIEDAK) - && (!hasGachaRandom() || gachaRandom == other.gachaRandom) - && (!hasPGJDNMCPFIE() || pGJDNMCPFIE == other.pGJDNMCPFIE) + && (!hasDGKOENMHFHH() || dGKOENMHFHH == other.dGKOENMHFHH) && (!hasRetcode() || retcode == other.retcode) + && (!hasCBEGPPCBNNF() || cBEGPPCBNNF == other.cBEGPPCBNNF) + && (!hasPHCKGIKDJGK() || pHCKGIKDJGK == other.pHCKGIKDJGK) + && (!hasADOFPIGHFBE() || aDOFPIGHFBE == other.aDOFPIGHFBE) && (!hasGachaInfoList() || gachaInfoList.equals(other.gachaInfoList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(lDHOFGOIKPI); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(dGKOENMHFHH); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(nMAOJEIEDAK); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(gachaRandom); + output.writeUInt32NoTag(cBEGPPCBNNF); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(pGJDNMCPFIE); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(pHCKGIKDJGK); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(aDOFPIGHFBE); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < gachaInfoList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 98); output.writeMessageNoTag(gachaInfoList.get(i)); } } @@ -433,19 +433,19 @@ public final class GetGachaInfoScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lDHOFGOIKPI); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dGKOENMHFHH); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(nMAOJEIEDAK); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cBEGPPCBNNF); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pGJDNMCPFIE); + size += 1 + ProtoSink.computeUInt32SizeNoTag(pHCKGIKDJGK); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(aDOFPIGHFBE); } if ((bitField0_ & 0x00000020) != 0) { size += (1 * gachaInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(gachaInfoList); @@ -460,18 +460,18 @@ public final class GetGachaInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // lDHOFGOIKPI - lDHOFGOIKPI = input.readUInt32(); + case 24: { + // dGKOENMHFHH + dGKOENMHFHH = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 32) { break; } } - case 16: { - // nMAOJEIEDAK - nMAOJEIEDAK = input.readUInt32(); + case 32: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 40) { @@ -479,33 +479,33 @@ public final class GetGachaInfoScRspOuterClass { } } case 40: { - // gachaRandom - gachaRandom = input.readUInt32(); + // cBEGPPCBNNF + cBEGPPCBNNF = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { - // pGJDNMCPFIE - pGJDNMCPFIE = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000010; + // pHCKGIKDJGK + pHCKGIKDJGK = input.readUInt32(); + bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 82) { + if (tag != 112) { break; } } - case 82: { + case 112: { + // aDOFPIGHFBE + aDOFPIGHFBE = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { // gachaInfoList tag = input.readRepeatedMessage(gachaInfoList, tag); bitField0_ |= 0x00000020; @@ -531,19 +531,19 @@ public final class GetGachaInfoScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.lDHOFGOIKPI, lDHOFGOIKPI); + output.writeUInt32(FieldNames.dGKOENMHFHH, dGKOENMHFHH); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.nMAOJEIEDAK, nMAOJEIEDAK); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.gachaRandom, gachaRandom); + output.writeUInt32(FieldNames.cBEGPPCBNNF, cBEGPPCBNNF); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.pGJDNMCPFIE, pGJDNMCPFIE); + output.writeUInt32(FieldNames.pHCKGIKDJGK, pHCKGIKDJGK); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.aDOFPIGHFBE, aDOFPIGHFBE); } if ((bitField0_ & 0x00000020) != 0) { output.writeRepeatedMessage(FieldNames.gachaInfoList, gachaInfoList); @@ -558,10 +558,10 @@ public final class GetGachaInfoScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -843380246: { - if (input.isAtField(FieldNames.lDHOFGOIKPI)) { + case -1758589381: { + if (input.isAtField(FieldNames.dGKOENMHFHH)) { if (!input.trySkipNullValue()) { - lDHOFGOIKPI = input.readUInt32(); + dGKOENMHFHH = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -569,44 +569,43 @@ public final class GetGachaInfoScRspOuterClass { } break; } - case 1343431082: { - if (input.isAtField(FieldNames.nMAOJEIEDAK)) { - if (!input.trySkipNullValue()) { - nMAOJEIEDAK = 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 1624180581: { - if (input.isAtField(FieldNames.pGJDNMCPFIE)) { - if (!input.trySkipNullValue()) { - pGJDNMCPFIE = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case 1097936398: { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -856368282: { + if (input.isAtField(FieldNames.cBEGPPCBNNF)) { + if (!input.trySkipNullValue()) { + cBEGPPCBNNF = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1515323725: { + if (input.isAtField(FieldNames.pHCKGIKDJGK)) { + if (!input.trySkipNullValue()) { + pHCKGIKDJGK = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -489517643: { + if (input.isAtField(FieldNames.aDOFPIGHFBE)) { + if (!input.trySkipNullValue()) { + aDOFPIGHFBE = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -679,16 +678,16 @@ public final class GetGachaInfoScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName lDHOFGOIKPI = FieldName.forField("LDHOFGOIKPI"); - - static final FieldName nMAOJEIEDAK = FieldName.forField("NMAOJEIEDAK"); - - static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); - - static final FieldName pGJDNMCPFIE = FieldName.forField("PGJDNMCPFIE"); + static final FieldName dGKOENMHFHH = FieldName.forField("DGKOENMHFHH"); static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName cBEGPPCBNNF = FieldName.forField("CBEGPPCBNNF"); + + static final FieldName pHCKGIKDJGK = FieldName.forField("PHCKGIKDJGK"); + + static final FieldName aDOFPIGHFBE = FieldName.forField("ADOFPIGHFBE"); + static final FieldName gachaInfoList = FieldName.forField("gachaInfoList", "gacha_info_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java index 72c5a98..d75bbec 100644 --- a/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java @@ -20,32 +20,32 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional .HeroBasicType cur_basic_type = 5; - */ - private int curBasicType; - - /** - * optional .Gender gender = 12; + * optional .Gender gender = 2; */ private int gender; /** - * optional bool is_player_info_modified = 6; + * optional .HeroBasicType cur_basic_type = 11; */ - private boolean isPlayerInfoModified; + private int curBasicType; /** - * optional bool is_gender_modified = 8; + * optional bool DBMPIJBHAGI = 3; */ - private boolean isGenderModified; + private boolean dBMPIJBHAGI; /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 3; + * optional bool NHHDDFFBGNE = 4; + */ + private boolean nHHDDFFBGNE; + + /** + * repeated .HeroBasicTypeInfo basic_type_info_list = 7; */ private final RepeatedMessage basicTypeInfoList = RepeatedMessage.newEmptyInstance(HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo.getFactory()); @@ -60,7 +60,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -68,7 +68,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 14; * @return this */ public GetHeroBasicTypeInfoScRsp clearRetcode() { @@ -78,7 +78,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -86,7 +86,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -97,88 +97,25 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional .HeroBasicType cur_basic_type = 5; - * @return whether the curBasicType field is set + * optional .Gender gender = 2; + * @return whether the gender field is set */ - public boolean hasCurBasicType() { + public boolean hasGender() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .HeroBasicType cur_basic_type = 5; - * @return this - */ - public GetHeroBasicTypeInfoScRsp clearCurBasicType() { - bitField0_ &= ~0x00000002; - curBasicType = 0; - return this; - } - - /** - * optional .HeroBasicType cur_basic_type = 5; - * @return the curBasicType - */ - public HeroBasicTypeOuterClass.HeroBasicType getCurBasicType() { - return HeroBasicTypeOuterClass.HeroBasicType.forNumber(curBasicType); - } - - /** - * Gets the value of the internal enum store. The result is - * equivalent to {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()}.getNumber(). - * - * @return numeric wire representation - */ - public int getCurBasicTypeValue() { - return curBasicType; - } - - /** - * Sets the value of the internal enum store. This does not - * do any validity checks, so be sure to use appropriate value - * constants from {@link HeroBasicTypeOuterClass.HeroBasicType}. Setting an invalid value - * can cause {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public GetHeroBasicTypeInfoScRsp setCurBasicTypeValue(final int value) { - bitField0_ |= 0x00000002; - curBasicType = value; - return this; - } - - /** - * optional .HeroBasicType cur_basic_type = 5; - * @param value the curBasicType to set - * @return this - */ - public GetHeroBasicTypeInfoScRsp setCurBasicType( - final HeroBasicTypeOuterClass.HeroBasicType value) { - bitField0_ |= 0x00000002; - curBasicType = value.getNumber(); - return this; - } - - /** - * optional .Gender gender = 12; - * @return whether the gender field is set - */ - public boolean hasGender() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .Gender gender = 12; + * optional .Gender gender = 2; * @return this */ public GetHeroBasicTypeInfoScRsp clearGender() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; gender = 0; return this; } /** - * optional .Gender gender = 12; + * optional .Gender gender = 2; * @return the gender */ public GenderOuterClass.Gender getGender() { @@ -205,98 +142,161 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { * @return this */ public GetHeroBasicTypeInfoScRsp setGenderValue(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; gender = value; return this; } /** - * optional .Gender gender = 12; + * optional .Gender gender = 2; * @param value the gender to set * @return this */ public GetHeroBasicTypeInfoScRsp setGender(final GenderOuterClass.Gender value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; gender = value.getNumber(); return this; } /** - * optional bool is_player_info_modified = 6; - * @return whether the isPlayerInfoModified field is set + * optional .HeroBasicType cur_basic_type = 11; + * @return whether the curBasicType field is set */ - public boolean hasIsPlayerInfoModified() { + public boolean hasCurBasicType() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .HeroBasicType cur_basic_type = 11; + * @return this + */ + public GetHeroBasicTypeInfoScRsp clearCurBasicType() { + bitField0_ &= ~0x00000004; + curBasicType = 0; + return this; + } + + /** + * optional .HeroBasicType cur_basic_type = 11; + * @return the curBasicType + */ + public HeroBasicTypeOuterClass.HeroBasicType getCurBasicType() { + return HeroBasicTypeOuterClass.HeroBasicType.forNumber(curBasicType); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()}.getNumber(). + * + * @return numeric wire representation + */ + public int getCurBasicTypeValue() { + return curBasicType; + } + + /** + * Sets the value of the internal enum store. This does not + * do any validity checks, so be sure to use appropriate value + * constants from {@link HeroBasicTypeOuterClass.HeroBasicType}. Setting an invalid value + * can cause {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public GetHeroBasicTypeInfoScRsp setCurBasicTypeValue(final int value) { + bitField0_ |= 0x00000004; + curBasicType = value; + return this; + } + + /** + * optional .HeroBasicType cur_basic_type = 11; + * @param value the curBasicType to set + * @return this + */ + public GetHeroBasicTypeInfoScRsp setCurBasicType( + final HeroBasicTypeOuterClass.HeroBasicType value) { + bitField0_ |= 0x00000004; + curBasicType = value.getNumber(); + return this; + } + + /** + * optional bool DBMPIJBHAGI = 3; + * @return whether the dBMPIJBHAGI field is set + */ + public boolean hasDBMPIJBHAGI() { return (bitField0_ & 0x00000008) != 0; } /** - * optional bool is_player_info_modified = 6; + * optional bool DBMPIJBHAGI = 3; * @return this */ - public GetHeroBasicTypeInfoScRsp clearIsPlayerInfoModified() { + public GetHeroBasicTypeInfoScRsp clearDBMPIJBHAGI() { bitField0_ &= ~0x00000008; - isPlayerInfoModified = false; + dBMPIJBHAGI = false; return this; } /** - * optional bool is_player_info_modified = 6; - * @return the isPlayerInfoModified + * optional bool DBMPIJBHAGI = 3; + * @return the dBMPIJBHAGI */ - public boolean getIsPlayerInfoModified() { - return isPlayerInfoModified; + public boolean getDBMPIJBHAGI() { + return dBMPIJBHAGI; } /** - * optional bool is_player_info_modified = 6; - * @param value the isPlayerInfoModified to set + * optional bool DBMPIJBHAGI = 3; + * @param value the dBMPIJBHAGI to set * @return this */ - public GetHeroBasicTypeInfoScRsp setIsPlayerInfoModified(final boolean value) { + public GetHeroBasicTypeInfoScRsp setDBMPIJBHAGI(final boolean value) { bitField0_ |= 0x00000008; - isPlayerInfoModified = value; + dBMPIJBHAGI = value; return this; } /** - * optional bool is_gender_modified = 8; - * @return whether the isGenderModified field is set + * optional bool NHHDDFFBGNE = 4; + * @return whether the nHHDDFFBGNE field is set */ - public boolean hasIsGenderModified() { + public boolean hasNHHDDFFBGNE() { return (bitField0_ & 0x00000010) != 0; } /** - * optional bool is_gender_modified = 8; + * optional bool NHHDDFFBGNE = 4; * @return this */ - public GetHeroBasicTypeInfoScRsp clearIsGenderModified() { + public GetHeroBasicTypeInfoScRsp clearNHHDDFFBGNE() { bitField0_ &= ~0x00000010; - isGenderModified = false; + nHHDDFFBGNE = false; return this; } /** - * optional bool is_gender_modified = 8; - * @return the isGenderModified + * optional bool NHHDDFFBGNE = 4; + * @return the nHHDDFFBGNE */ - public boolean getIsGenderModified() { - return isGenderModified; + public boolean getNHHDDFFBGNE() { + return nHHDDFFBGNE; } /** - * optional bool is_gender_modified = 8; - * @param value the isGenderModified to set + * optional bool NHHDDFFBGNE = 4; + * @param value the nHHDDFFBGNE to set * @return this */ - public GetHeroBasicTypeInfoScRsp setIsGenderModified(final boolean value) { + public GetHeroBasicTypeInfoScRsp setNHHDDFFBGNE(final boolean value) { bitField0_ |= 0x00000010; - isGenderModified = value; + nHHDDFFBGNE = value; return this; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 3; + * repeated .HeroBasicTypeInfo basic_type_info_list = 7; * @return whether the basicTypeInfoList field is set */ public boolean hasBasicTypeInfoList() { @@ -304,7 +304,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 3; + * repeated .HeroBasicTypeInfo basic_type_info_list = 7; * @return this */ public GetHeroBasicTypeInfoScRsp clearBasicTypeInfoList() { @@ -314,7 +314,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 3; + * repeated .HeroBasicTypeInfo basic_type_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. @@ -328,7 +328,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 3; + * repeated .HeroBasicTypeInfo basic_type_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 @@ -343,7 +343,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 3; + * repeated .HeroBasicTypeInfo basic_type_info_list = 7; * @param value the basicTypeInfoList to add * @return this */ @@ -355,7 +355,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 3; + * repeated .HeroBasicTypeInfo basic_type_info_list = 7; * @param values the basicTypeInfoList to add * @return this */ @@ -372,10 +372,10 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - curBasicType = other.curBasicType; gender = other.gender; - isPlayerInfoModified = other.isPlayerInfoModified; - isGenderModified = other.isGenderModified; + curBasicType = other.curBasicType; + dBMPIJBHAGI = other.dBMPIJBHAGI; + nHHDDFFBGNE = other.nHHDDFFBGNE; basicTypeInfoList.copyFrom(other.basicTypeInfoList); } return this; @@ -390,17 +390,17 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasCurBasicType()) { - setCurBasicTypeValue(other.curBasicType); - } if (other.hasGender()) { setGenderValue(other.gender); } - if (other.hasIsPlayerInfoModified()) { - setIsPlayerInfoModified(other.isPlayerInfoModified); + if (other.hasCurBasicType()) { + setCurBasicTypeValue(other.curBasicType); } - if (other.hasIsGenderModified()) { - setIsGenderModified(other.isGenderModified); + if (other.hasDBMPIJBHAGI()) { + setDBMPIJBHAGI(other.dBMPIJBHAGI); + } + if (other.hasNHHDDFFBGNE()) { + setNHHDDFFBGNE(other.nHHDDFFBGNE); } if (other.hasBasicTypeInfoList()) { getMutableBasicTypeInfoList().addAll(other.basicTypeInfoList); @@ -416,10 +416,10 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - curBasicType = 0; gender = 0; - isPlayerInfoModified = false; - isGenderModified = false; + curBasicType = 0; + dBMPIJBHAGI = false; + nHHDDFFBGNE = false; basicTypeInfoList.clear(); return this; } @@ -446,38 +446,38 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { GetHeroBasicTypeInfoScRsp other = (GetHeroBasicTypeInfoScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasCurBasicType() || curBasicType == other.curBasicType) && (!hasGender() || gender == other.gender) - && (!hasIsPlayerInfoModified() || isPlayerInfoModified == other.isPlayerInfoModified) - && (!hasIsGenderModified() || isGenderModified == other.isGenderModified) + && (!hasCurBasicType() || curBasicType == other.curBasicType) + && (!hasDBMPIJBHAGI() || dBMPIJBHAGI == other.dBMPIJBHAGI) + && (!hasNHHDDFFBGNE() || nHHDDFFBGNE == other.nHHDDFFBGNE) && (!hasBasicTypeInfoList() || basicTypeInfoList.equals(other.basicTypeInfoList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeEnumNoTag(curBasicType); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 16); output.writeEnumNoTag(gender); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 88); + output.writeEnumNoTag(curBasicType); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); - output.writeBoolNoTag(isPlayerInfoModified); + output.writeRawByte((byte) 24); + output.writeBoolNoTag(dBMPIJBHAGI); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 64); - output.writeBoolNoTag(isGenderModified); + output.writeRawByte((byte) 32); + output.writeBoolNoTag(nHHDDFFBGNE); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < basicTypeInfoList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 58); output.writeMessageNoTag(basicTypeInfoList.get(i)); } } @@ -490,10 +490,10 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(curBasicType); + size += 1 + ProtoSink.computeEnumSizeNoTag(gender); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(gender); + size += 1 + ProtoSink.computeEnumSizeNoTag(curBasicType); } if ((bitField0_ & 0x00000008) != 0) { size += 2; @@ -514,58 +514,58 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 16) { break; } } - case 40: { - // curBasicType - final int value = input.readInt32(); - if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { - curBasicType = value; - bitField0_ |= 0x00000002; - } - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 16: { // gender final int value = input.readInt32(); if (GenderOuterClass.Gender.forNumber(value) != null) { gender = value; + bitField0_ |= 0x00000002; + } + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // curBasicType + final int value = input.readInt32(); + if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { + curBasicType = value; bitField0_ |= 0x00000004; } tag = input.readTag(); - if (tag != 48) { + if (tag != 24) { break; } } - case 48: { - // isPlayerInfoModified - isPlayerInfoModified = input.readBool(); + case 24: { + // dBMPIJBHAGI + dBMPIJBHAGI = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 64) { + if (tag != 32) { break; } } - case 64: { - // isGenderModified - isGenderModified = input.readBool(); + case 32: { + // nHHDDFFBGNE + nHHDDFFBGNE = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 26) { + if (tag != 58) { break; } } - case 26: { + case 58: { // basicTypeInfoList tag = input.readRepeatedMessage(basicTypeInfoList, tag); bitField0_ |= 0x00000020; @@ -594,16 +594,16 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeEnum(FieldNames.curBasicType, curBasicType, HeroBasicTypeOuterClass.HeroBasicType.converter()); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeEnum(FieldNames.gender, gender, GenderOuterClass.Gender.converter()); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeEnum(FieldNames.curBasicType, curBasicType, HeroBasicTypeOuterClass.HeroBasicType.converter()); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeBool(FieldNames.isPlayerInfoModified, isPlayerInfoModified); + output.writeBool(FieldNames.dBMPIJBHAGI, dBMPIJBHAGI); } if ((bitField0_ & 0x00000010) != 0) { - output.writeBool(FieldNames.isGenderModified, isGenderModified); + output.writeBool(FieldNames.nHHDDFFBGNE, nHHDDFFBGNE); } if ((bitField0_ & 0x00000020) != 0) { output.writeRepeatedMessage(FieldNames.basicTypeInfoList, basicTypeInfoList); @@ -629,13 +629,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_ |= 0x00000002; } else { input.skipUnknownEnumValue(); @@ -646,12 +645,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_ |= 0x00000004; } else { input.skipUnknownEnumValue(); @@ -662,11 +662,10 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } break; } - case -939166238: - case 1421626961: { - if (input.isAtField(FieldNames.isPlayerInfoModified)) { + case 777214107: { + if (input.isAtField(FieldNames.dBMPIJBHAGI)) { if (!input.trySkipNullValue()) { - isPlayerInfoModified = input.readBool(); + dBMPIJBHAGI = input.readBool(); bitField0_ |= 0x00000008; } } else { @@ -674,11 +673,10 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } break; } - case 1591840884: - case -1167877774: { - if (input.isAtField(FieldNames.isGenderModified)) { + case -436607542: { + if (input.isAtField(FieldNames.nHHDDFFBGNE)) { if (!input.trySkipNullValue()) { - isGenderModified = input.readBool(); + nHHDDFFBGNE = input.readBool(); bitField0_ |= 0x00000010; } } else { @@ -753,13 +751,13 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName curBasicType = FieldName.forField("curBasicType", "cur_basic_type"); - static final FieldName gender = FieldName.forField("gender"); - static final FieldName isPlayerInfoModified = FieldName.forField("isPlayerInfoModified", "is_player_info_modified"); + static final FieldName curBasicType = FieldName.forField("curBasicType", "cur_basic_type"); - static final FieldName isGenderModified = FieldName.forField("isGenderModified", "is_gender_modified"); + static final FieldName dBMPIJBHAGI = FieldName.forField("DBMPIJBHAGI"); + + static final FieldName nHHDDFFBGNE = FieldName.forField("NHHDDFFBGNE"); static final FieldName basicTypeInfoList = FieldName.forField("basicTypeInfoList", "basic_type_info_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java index e9b758e..4a48a23 100644 --- a/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java @@ -20,19 +20,19 @@ public final class GetMissionStatusCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 sub_mission_id_list = 7; + * repeated uint32 main_mission_id_list = 5; */ - private final RepeatedInt subMissionIdList = RepeatedInt.newEmptyInstance(); + private final RepeatedInt mainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 mission_event_id_list = 11; + * repeated uint32 mission_event_id_list = 10; */ private final RepeatedInt missionEventIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 main_mission_id_list = 15; + * repeated uint32 sub_mission_id_list = 14; */ - private final RepeatedInt mainMissionIdList = RepeatedInt.newEmptyInstance(); + private final RepeatedInt subMissionIdList = RepeatedInt.newEmptyInstance(); private GetMissionStatusCsReq() { } @@ -45,161 +45,25 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 sub_mission_id_list = 7; - * @return whether the subMissionIdList field is set + * repeated uint32 main_mission_id_list = 5; + * @return whether the mainMissionIdList field is set */ - public boolean hasSubMissionIdList() { + public boolean hasMainMissionIdList() { return (bitField0_ & 0x00000001) != 0; } /** - * repeated uint32 sub_mission_id_list = 7; - * @return this - */ - public GetMissionStatusCsReq clearSubMissionIdList() { - bitField0_ &= ~0x00000001; - subMissionIdList.clear(); - return this; - } - - /** - * repeated uint32 sub_mission_id_list = 7; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableSubMissionIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getSubMissionIdList() { - return subMissionIdList; - } - - /** - * repeated uint32 sub_mission_id_list = 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 getMutableSubMissionIdList() { - bitField0_ |= 0x00000001; - return subMissionIdList; - } - - /** - * repeated uint32 sub_mission_id_list = 7; - * @param value the subMissionIdList to add - * @return this - */ - public GetMissionStatusCsReq addSubMissionIdList(final int value) { - bitField0_ |= 0x00000001; - subMissionIdList.add(value); - return this; - } - - /** - * repeated uint32 sub_mission_id_list = 7; - * @param values the subMissionIdList to add - * @return this - */ - public GetMissionStatusCsReq addAllSubMissionIdList(final int... values) { - bitField0_ |= 0x00000001; - subMissionIdList.addAll(values); - return this; - } - - /** - * repeated uint32 mission_event_id_list = 11; - * @return whether the missionEventIdList field is set - */ - public boolean hasMissionEventIdList() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * repeated uint32 mission_event_id_list = 11; - * @return this - */ - public GetMissionStatusCsReq clearMissionEventIdList() { - bitField0_ &= ~0x00000002; - missionEventIdList.clear(); - return this; - } - - /** - * repeated uint32 mission_event_id_list = 11; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableMissionEventIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getMissionEventIdList() { - return missionEventIdList; - } - - /** - * repeated uint32 mission_event_id_list = 11; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableMissionEventIdList() { - bitField0_ |= 0x00000002; - return missionEventIdList; - } - - /** - * repeated uint32 mission_event_id_list = 11; - * @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 = 11; - * @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 = 15; - * @return whether the mainMissionIdList field is set - */ - public boolean hasMainMissionIdList() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated uint32 main_mission_id_list = 15; + * repeated uint32 main_mission_id_list = 5; * @return this */ public GetMissionStatusCsReq clearMainMissionIdList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; mainMissionIdList.clear(); return this; } /** - * repeated uint32 main_mission_id_list = 15; + * repeated uint32 main_mission_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. @@ -213,7 +77,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 main_mission_id_list = 15; + * repeated uint32 main_mission_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 @@ -222,40 +86,176 @@ public final class GetMissionStatusCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableMainMissionIdList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; return mainMissionIdList; } /** - * repeated uint32 main_mission_id_list = 15; + * repeated uint32 main_mission_id_list = 5; * @param value the mainMissionIdList to add * @return this */ public GetMissionStatusCsReq addMainMissionIdList(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; mainMissionIdList.add(value); return this; } /** - * repeated uint32 main_mission_id_list = 15; + * repeated uint32 main_mission_id_list = 5; * @param values the mainMissionIdList to add * @return this */ public GetMissionStatusCsReq addAllMainMissionIdList(final int... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; mainMissionIdList.addAll(values); return this; } + /** + * repeated uint32 mission_event_id_list = 10; + * @return whether the missionEventIdList field is set + */ + public boolean hasMissionEventIdList() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * repeated uint32 mission_event_id_list = 10; + * @return this + */ + public GetMissionStatusCsReq clearMissionEventIdList() { + bitField0_ &= ~0x00000002; + missionEventIdList.clear(); + return this; + } + + /** + * repeated uint32 mission_event_id_list = 10; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableMissionEventIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getMissionEventIdList() { + return missionEventIdList; + } + + /** + * repeated uint32 mission_event_id_list = 10; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableMissionEventIdList() { + bitField0_ |= 0x00000002; + return missionEventIdList; + } + + /** + * repeated uint32 mission_event_id_list = 10; + * @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 = 10; + * @param values the missionEventIdList to add + * @return this + */ + public GetMissionStatusCsReq addAllMissionEventIdList(final int... values) { + bitField0_ |= 0x00000002; + missionEventIdList.addAll(values); + return this; + } + + /** + * repeated uint32 sub_mission_id_list = 14; + * @return whether the subMissionIdList field is set + */ + public boolean hasSubMissionIdList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated uint32 sub_mission_id_list = 14; + * @return this + */ + public GetMissionStatusCsReq clearSubMissionIdList() { + bitField0_ &= ~0x00000004; + subMissionIdList.clear(); + return this; + } + + /** + * repeated uint32 sub_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. + * + * Use {@link #getMutableSubMissionIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getSubMissionIdList() { + return subMissionIdList; + } + + /** + * repeated uint32 sub_mission_id_list = 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 getMutableSubMissionIdList() { + bitField0_ |= 0x00000004; + return subMissionIdList; + } + + /** + * repeated uint32 sub_mission_id_list = 14; + * @param value the subMissionIdList to add + * @return this + */ + public GetMissionStatusCsReq addSubMissionIdList(final int value) { + bitField0_ |= 0x00000004; + subMissionIdList.add(value); + return this; + } + + /** + * repeated uint32 sub_mission_id_list = 14; + * @param values the subMissionIdList to add + * @return this + */ + public GetMissionStatusCsReq addAllSubMissionIdList(final int... values) { + bitField0_ |= 0x00000004; + subMissionIdList.addAll(values); + return this; + } + @Override public GetMissionStatusCsReq copyFrom(final GetMissionStatusCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - subMissionIdList.copyFrom(other.subMissionIdList); - missionEventIdList.copyFrom(other.missionEventIdList); mainMissionIdList.copyFrom(other.mainMissionIdList); + missionEventIdList.copyFrom(other.missionEventIdList); + subMissionIdList.copyFrom(other.subMissionIdList); } return this; } @@ -266,14 +266,14 @@ public final class GetMissionStatusCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasSubMissionIdList()) { - getMutableSubMissionIdList().addAll(other.subMissionIdList); + if (other.hasMainMissionIdList()) { + getMutableMainMissionIdList().addAll(other.mainMissionIdList); } if (other.hasMissionEventIdList()) { getMutableMissionEventIdList().addAll(other.missionEventIdList); } - if (other.hasMainMissionIdList()) { - getMutableMainMissionIdList().addAll(other.mainMissionIdList); + if (other.hasSubMissionIdList()) { + getMutableSubMissionIdList().addAll(other.subMissionIdList); } return this; } @@ -285,9 +285,9 @@ public final class GetMissionStatusCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - subMissionIdList.clear(); - missionEventIdList.clear(); mainMissionIdList.clear(); + missionEventIdList.clear(); + subMissionIdList.clear(); return this; } @@ -298,9 +298,9 @@ public final class GetMissionStatusCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - subMissionIdList.clear(); - missionEventIdList.clear(); mainMissionIdList.clear(); + missionEventIdList.clear(); + subMissionIdList.clear(); return this; } @@ -314,29 +314,29 @@ public final class GetMissionStatusCsReqOuterClass { } GetMissionStatusCsReq other = (GetMissionStatusCsReq) o; return bitField0_ == other.bitField0_ - && (!hasSubMissionIdList() || subMissionIdList.equals(other.subMissionIdList)) + && (!hasMainMissionIdList() || mainMissionIdList.equals(other.mainMissionIdList)) && (!hasMissionEventIdList() || missionEventIdList.equals(other.missionEventIdList)) - && (!hasMainMissionIdList() || mainMissionIdList.equals(other.mainMissionIdList)); + && (!hasSubMissionIdList() || subMissionIdList.equals(other.subMissionIdList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - for (int i = 0; i < subMissionIdList.length(); i++) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(subMissionIdList.array()[i]); + for (int i = 0; i < mainMissionIdList.length(); i++) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(mainMissionIdList.array()[i]); } } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < missionEventIdList.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(missionEventIdList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < mainMissionIdList.length(); i++) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(mainMissionIdList.array()[i]); + for (int i = 0; i < subMissionIdList.length(); i++) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(subMissionIdList.array()[i]); } } } @@ -345,13 +345,13 @@ public final class GetMissionStatusCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += (1 * subMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(subMissionIdList); + size += (1 * mainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mainMissionIdList); } if ((bitField0_ & 0x00000002) != 0) { size += (1 * missionEventIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(missionEventIdList); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * mainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mainMissionIdList); + size += (1 * subMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(subMissionIdList); } return size; } @@ -363,27 +363,27 @@ public final class GetMissionStatusCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { - // subMissionIdList [packed=true] - input.readPackedUInt32(subMissionIdList, tag); + case 42: { + // mainMissionIdList [packed=true] + input.readPackedUInt32(mainMissionIdList, tag); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 82) { break; } } - case 90: { + case 82: { // missionEventIdList [packed=true] input.readPackedUInt32(missionEventIdList, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 114) { break; } } - case 122: { - // mainMissionIdList [packed=true] - input.readPackedUInt32(mainMissionIdList, tag); + case 114: { + // subMissionIdList [packed=true] + input.readPackedUInt32(subMissionIdList, tag); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -400,21 +400,21 @@ public final class GetMissionStatusCsReqOuterClass { tag = input.readTag(); break; } - case 56: { - // subMissionIdList [packed=false] - tag = input.readRepeatedUInt32(subMissionIdList, tag); + case 40: { + // mainMissionIdList [packed=false] + tag = input.readRepeatedUInt32(mainMissionIdList, tag); bitField0_ |= 0x00000001; break; } - case 88: { + case 80: { // missionEventIdList [packed=false] tag = input.readRepeatedUInt32(missionEventIdList, tag); bitField0_ |= 0x00000002; break; } - case 120: { - // mainMissionIdList [packed=false] - tag = input.readRepeatedUInt32(mainMissionIdList, tag); + case 112: { + // subMissionIdList [packed=false] + tag = input.readRepeatedUInt32(subMissionIdList, tag); bitField0_ |= 0x00000004; break; } @@ -426,13 +426,13 @@ public final class GetMissionStatusCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeRepeatedUInt32(FieldNames.subMissionIdList, subMissionIdList); + output.writeRepeatedUInt32(FieldNames.mainMissionIdList, mainMissionIdList); } if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedUInt32(FieldNames.missionEventIdList, missionEventIdList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.mainMissionIdList, mainMissionIdList); + output.writeRepeatedUInt32(FieldNames.subMissionIdList, subMissionIdList); } output.endObject(); } @@ -444,11 +444,11 @@ public final class GetMissionStatusCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 2039339685: - case -225917552: { - if (input.isAtField(FieldNames.subMissionIdList)) { + case 1438400460: + case -1382679799: { + if (input.isAtField(FieldNames.mainMissionIdList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(subMissionIdList); + input.readRepeatedUInt32(mainMissionIdList); bitField0_ |= 0x00000001; } } else { @@ -468,11 +468,11 @@ public final class GetMissionStatusCsReqOuterClass { } break; } - case 1438400460: - case -1382679799: { - if (input.isAtField(FieldNames.mainMissionIdList)) { + case 2039339685: + case -225917552: { + if (input.isAtField(FieldNames.subMissionIdList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(mainMissionIdList); + input.readRepeatedUInt32(subMissionIdList); bitField0_ |= 0x00000004; } } else { @@ -533,11 +533,11 @@ public final class GetMissionStatusCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName subMissionIdList = FieldName.forField("subMissionIdList", "sub_mission_id_list"); + static final FieldName mainMissionIdList = FieldName.forField("mainMissionIdList", "main_mission_id_list"); static final FieldName missionEventIdList = FieldName.forField("missionEventIdList", "mission_event_id_list"); - static final FieldName mainMissionIdList = FieldName.forField("mainMissionIdList", "main_mission_id_list"); + static final FieldName subMissionIdList = FieldName.forField("subMissionIdList", "sub_mission_id_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java index 3865527..f223ea5 100644 --- a/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java @@ -21,39 +21,35 @@ public final class GetMissionStatusScRspOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; */ private int retcode; /** - * repeated uint32 disabled_main_mission_id_list = 9; + * repeated uint32 disabled_main_mission_id_list = 5; */ private final RepeatedInt disabledMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 finished_main_mission_id_list = 10; + * repeated uint32 finished_main_mission_id_list = 7; */ private final RepeatedInt finishedMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 unfinished_main_mission_id_list = 11; + * repeated uint32 unfinished_main_mission_id_list = 9; */ private final RepeatedInt unfinishedMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .Mission mission_event_status_list = 4; - */ - private final RepeatedMessage missionEventStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); - - /** - * repeated .Mission sub_mission_status_list = 13; + * repeated .Mission sub_mission_status_list = 8; */ private final RepeatedMessage subMissionStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); + /** + * repeated .Mission mission_event_status_list = 13; + */ + private final RepeatedMessage missionEventStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); + private GetMissionStatusScRsp() { } @@ -65,11 +61,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -77,11 +69,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @return this */ public GetMissionStatusScRsp clearRetcode() { @@ -91,11 +79,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -103,11 +87,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -118,7 +98,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 9; + * repeated uint32 disabled_main_mission_id_list = 5; * @return whether the disabledMainMissionIdList field is set */ public boolean hasDisabledMainMissionIdList() { @@ -126,7 +106,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 9; + * repeated uint32 disabled_main_mission_id_list = 5; * @return this */ public GetMissionStatusScRsp clearDisabledMainMissionIdList() { @@ -136,7 +116,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 9; + * repeated uint32 disabled_main_mission_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. @@ -150,7 +130,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 9; + * repeated uint32 disabled_main_mission_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 @@ -164,7 +144,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 9; + * repeated uint32 disabled_main_mission_id_list = 5; * @param value the disabledMainMissionIdList to add * @return this */ @@ -175,7 +155,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 9; + * repeated uint32 disabled_main_mission_id_list = 5; * @param values the disabledMainMissionIdList to add * @return this */ @@ -186,7 +166,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 10; + * repeated uint32 finished_main_mission_id_list = 7; * @return whether the finishedMainMissionIdList field is set */ public boolean hasFinishedMainMissionIdList() { @@ -194,7 +174,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 10; + * repeated uint32 finished_main_mission_id_list = 7; * @return this */ public GetMissionStatusScRsp clearFinishedMainMissionIdList() { @@ -204,7 +184,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 10; + * repeated uint32 finished_main_mission_id_list = 7; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -218,7 +198,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 10; + * repeated uint32 finished_main_mission_id_list = 7; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -232,7 +212,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 10; + * repeated uint32 finished_main_mission_id_list = 7; * @param value the finishedMainMissionIdList to add * @return this */ @@ -243,7 +223,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 10; + * repeated uint32 finished_main_mission_id_list = 7; * @param values the finishedMainMissionIdList to add * @return this */ @@ -254,7 +234,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 unfinished_main_mission_id_list = 11; + * repeated uint32 unfinished_main_mission_id_list = 9; * @return whether the unfinishedMainMissionIdList field is set */ public boolean hasUnfinishedMainMissionIdList() { @@ -262,7 +242,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 unfinished_main_mission_id_list = 11; + * repeated uint32 unfinished_main_mission_id_list = 9; * @return this */ public GetMissionStatusScRsp clearUnfinishedMainMissionIdList() { @@ -272,7 +252,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 unfinished_main_mission_id_list = 11; + * 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. @@ -286,7 +266,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 unfinished_main_mission_id_list = 11; + * 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 @@ -300,7 +280,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 unfinished_main_mission_id_list = 11; + * repeated uint32 unfinished_main_mission_id_list = 9; * @param value the unfinishedMainMissionIdList to add * @return this */ @@ -311,7 +291,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 unfinished_main_mission_id_list = 11; + * repeated uint32 unfinished_main_mission_id_list = 9; * @param values the unfinishedMainMissionIdList to add * @return this */ @@ -322,94 +302,25 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated .Mission mission_event_status_list = 4; - * @return whether the missionEventStatusList field is set + * repeated .Mission sub_mission_status_list = 8; + * @return whether the subMissionStatusList field is set */ - public boolean hasMissionEventStatusList() { + public boolean hasSubMissionStatusList() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated .Mission mission_event_status_list = 4; - * @return this - */ - public GetMissionStatusScRsp clearMissionEventStatusList() { - bitField0_ &= ~0x00000010; - missionEventStatusList.clear(); - return this; - } - - /** - * repeated .Mission mission_event_status_list = 4; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableMissionEventStatusList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMissionEventStatusList() { - return missionEventStatusList; - } - - /** - * repeated .Mission mission_event_status_list = 4; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableMissionEventStatusList() { - bitField0_ |= 0x00000010; - return missionEventStatusList; - } - - /** - * repeated .Mission mission_event_status_list = 4; - * @param value the missionEventStatusList to add - * @return this - */ - public GetMissionStatusScRsp addMissionEventStatusList(final MissionOuterClass.Mission value) { - bitField0_ |= 0x00000010; - missionEventStatusList.add(value); - return this; - } - - /** - * repeated .Mission mission_event_status_list = 4; - * @param values the missionEventStatusList to add - * @return this - */ - public GetMissionStatusScRsp addAllMissionEventStatusList( - final MissionOuterClass.Mission... values) { - bitField0_ |= 0x00000010; - missionEventStatusList.addAll(values); - return this; - } - - /** - * repeated .Mission sub_mission_status_list = 13; - * @return whether the subMissionStatusList field is set - */ - public boolean hasSubMissionStatusList() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * repeated .Mission sub_mission_status_list = 13; + * repeated .Mission sub_mission_status_list = 8; * @return this */ public GetMissionStatusScRsp clearSubMissionStatusList() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; subMissionStatusList.clear(); return this; } /** - * repeated .Mission sub_mission_status_list = 13; + * repeated .Mission sub_mission_status_list = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -423,7 +334,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated .Mission sub_mission_status_list = 13; + * repeated .Mission sub_mission_status_list = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -432,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 = 13; + * repeated .Mission sub_mission_status_list = 8; * @param value the subMissionStatusList to add * @return this */ public GetMissionStatusScRsp addSubMissionStatusList(final MissionOuterClass.Mission value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; subMissionStatusList.add(value); return this; } /** - * repeated .Mission sub_mission_status_list = 13; + * repeated .Mission sub_mission_status_list = 8; * @param values the subMissionStatusList to add * @return this */ public GetMissionStatusScRsp addAllSubMissionStatusList( final MissionOuterClass.Mission... values) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; subMissionStatusList.addAll(values); return this; } + /** + * repeated .Mission mission_event_status_list = 13; + * @return whether the missionEventStatusList field is set + */ + public boolean hasMissionEventStatusList() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * repeated .Mission mission_event_status_list = 13; + * @return this + */ + public GetMissionStatusScRsp clearMissionEventStatusList() { + bitField0_ &= ~0x00000020; + missionEventStatusList.clear(); + return this; + } + + /** + * repeated .Mission mission_event_status_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 #getMutableMissionEventStatusList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMissionEventStatusList() { + return missionEventStatusList; + } + + /** + * repeated .Mission mission_event_status_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 getMutableMissionEventStatusList() { + bitField0_ |= 0x00000020; + return missionEventStatusList; + } + + /** + * repeated .Mission mission_event_status_list = 13; + * @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 = 13; + * @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; @@ -468,8 +448,8 @@ public final class GetMissionStatusScRspOuterClass { disabledMainMissionIdList.copyFrom(other.disabledMainMissionIdList); finishedMainMissionIdList.copyFrom(other.finishedMainMissionIdList); unfinishedMainMissionIdList.copyFrom(other.unfinishedMainMissionIdList); - missionEventStatusList.copyFrom(other.missionEventStatusList); subMissionStatusList.copyFrom(other.subMissionStatusList); + missionEventStatusList.copyFrom(other.missionEventStatusList); } return this; } @@ -492,12 +472,12 @@ public final class GetMissionStatusScRspOuterClass { if (other.hasUnfinishedMainMissionIdList()) { getMutableUnfinishedMainMissionIdList().addAll(other.unfinishedMainMissionIdList); } - if (other.hasMissionEventStatusList()) { - getMutableMissionEventStatusList().addAll(other.missionEventStatusList); - } if (other.hasSubMissionStatusList()) { getMutableSubMissionStatusList().addAll(other.subMissionStatusList); } + if (other.hasMissionEventStatusList()) { + getMutableMissionEventStatusList().addAll(other.missionEventStatusList); + } return this; } @@ -512,8 +492,8 @@ public final class GetMissionStatusScRspOuterClass { disabledMainMissionIdList.clear(); finishedMainMissionIdList.clear(); unfinishedMainMissionIdList.clear(); - missionEventStatusList.clear(); subMissionStatusList.clear(); + missionEventStatusList.clear(); return this; } @@ -527,8 +507,8 @@ public final class GetMissionStatusScRspOuterClass { disabledMainMissionIdList.clear(); finishedMainMissionIdList.clear(); unfinishedMainMissionIdList.clear(); - missionEventStatusList.clearQuick(); subMissionStatusList.clearQuick(); + missionEventStatusList.clearQuick(); return this; } @@ -546,44 +526,44 @@ public final class GetMissionStatusScRspOuterClass { && (!hasDisabledMainMissionIdList() || disabledMainMissionIdList.equals(other.disabledMainMissionIdList)) && (!hasFinishedMainMissionIdList() || finishedMainMissionIdList.equals(other.finishedMainMissionIdList)) && (!hasUnfinishedMainMissionIdList() || unfinishedMainMissionIdList.equals(other.unfinishedMainMissionIdList)) - && (!hasMissionEventStatusList() || missionEventStatusList.equals(other.missionEventStatusList)) - && (!hasSubMissionStatusList() || subMissionStatusList.equals(other.subMissionStatusList)); + && (!hasSubMissionStatusList() || subMissionStatusList.equals(other.subMissionStatusList)) + && (!hasMissionEventStatusList() || missionEventStatusList.equals(other.missionEventStatusList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < disabledMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(disabledMainMissionIdList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < finishedMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(finishedMainMissionIdList.array()[i]); } } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < unfinishedMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(unfinishedMainMissionIdList.array()[i]); } } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < missionEventStatusList.length(); i++) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(missionEventStatusList.get(i)); + for (int i = 0; i < subMissionStatusList.length(); i++) { + output.writeRawByte((byte) 66); + output.writeMessageNoTag(subMissionStatusList.get(i)); } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < subMissionStatusList.length(); i++) { + for (int i = 0; i < missionEventStatusList.length(); i++) { output.writeRawByte((byte) 106); - output.writeMessageNoTag(subMissionStatusList.get(i)); + output.writeMessageNoTag(missionEventStatusList.get(i)); } } } @@ -604,10 +584,10 @@ public final class GetMissionStatusScRspOuterClass { size += (1 * unfinishedMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unfinishedMainMissionIdList); } 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; } @@ -619,53 +599,53 @@ public final class GetMissionStatusScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { + // disabledMainMissionIdList [packed=true] + input.readPackedUInt32(disabledMainMissionIdList, tag); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // finishedMainMissionIdList [packed=true] + input.readPackedUInt32(finishedMainMissionIdList, tag); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 74) { break; } } case 74: { - // disabledMainMissionIdList [packed=true] - input.readPackedUInt32(disabledMainMissionIdList, tag); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 82) { - break; - } - } - case 82: { - // finishedMainMissionIdList [packed=true] - input.readPackedUInt32(finishedMainMissionIdList, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { // unfinishedMainMissionIdList [packed=true] input.readPackedUInt32(unfinishedMainMissionIdList, tag); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 34) { + if (tag != 66) { break; } } - case 34: { - // missionEventStatusList - tag = input.readRepeatedMessage(missionEventStatusList, tag); + case 66: { + // subMissionStatusList + tag = input.readRepeatedMessage(subMissionStatusList, tag); bitField0_ |= 0x00000010; if (tag != 106) { break; } } case 106: { - // subMissionStatusList - tag = input.readRepeatedMessage(subMissionStatusList, tag); + // missionEventStatusList + tag = input.readRepeatedMessage(missionEventStatusList, tag); bitField0_ |= 0x00000020; if (tag != 0) { break; @@ -681,19 +661,19 @@ public final class GetMissionStatusScRspOuterClass { tag = input.readTag(); break; } - case 72: { + case 40: { // disabledMainMissionIdList [packed=false] tag = input.readRepeatedUInt32(disabledMainMissionIdList, tag); bitField0_ |= 0x00000002; break; } - case 80: { + case 56: { // finishedMainMissionIdList [packed=false] tag = input.readRepeatedUInt32(finishedMainMissionIdList, tag); bitField0_ |= 0x00000004; break; } - case 88: { + case 72: { // unfinishedMainMissionIdList [packed=false] tag = input.readRepeatedUInt32(unfinishedMainMissionIdList, tag); bitField0_ |= 0x00000008; @@ -719,10 +699,10 @@ public final class GetMissionStatusScRspOuterClass { output.writeRepeatedUInt32(FieldNames.unfinishedMainMissionIdList, unfinishedMainMissionIdList); } 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(); } @@ -781,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 { @@ -793,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 { @@ -866,9 +846,9 @@ public final class GetMissionStatusScRspOuterClass { static final FieldName unfinishedMainMissionIdList = FieldName.forField("unfinishedMainMissionIdList", "unfinished_main_mission_id_list"); - static final FieldName missionEventStatusList = FieldName.forField("missionEventStatusList", "mission_event_status_list"); - static final FieldName subMissionStatusList = FieldName.forField("subMissionStatusList", "sub_mission_status_list"); + + static final FieldName missionEventStatusList = FieldName.forField("missionEventStatusList", "mission_event_status_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java index 8217295..3cdd57f 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java @@ -21,27 +21,22 @@ public final class GetPlayerBoardDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 IBIJADEBLOH = 9; - */ - private int iBIJADEBLOH; - - /** - * optional uint32 retcode = 10; - */ - private int retcode; - - /** - * optional uint32 current_head_icon_id = 11; + * optional uint32 current_head_icon_id = 10; */ private int currentHeadIconId; /** - * optional string signature = 12; + * optional uint32 retcode = 15; + */ + private int retcode; + + /** + * optional string signature = 2; */ private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * repeated .HeadIcon unlocked_head_icon_list = 8; + * repeated .HeadIcon unlocked_head_icon_list = 6; */ private final RepeatedMessage unlockedHeadIconList = RepeatedMessage.newEmptyInstance(HeadIconOuterClass.HeadIcon.getFactory()); @@ -56,44 +51,44 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 IBIJADEBLOH = 9; - * @return whether the iBIJADEBLOH field is set + * optional uint32 current_head_icon_id = 10; + * @return whether the currentHeadIconId field is set */ - public boolean hasIBIJADEBLOH() { + public boolean hasCurrentHeadIconId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 IBIJADEBLOH = 9; + * optional uint32 current_head_icon_id = 10; * @return this */ - public GetPlayerBoardDataScRsp clearIBIJADEBLOH() { + public GetPlayerBoardDataScRsp clearCurrentHeadIconId() { bitField0_ &= ~0x00000001; - iBIJADEBLOH = 0; + currentHeadIconId = 0; return this; } /** - * optional uint32 IBIJADEBLOH = 9; - * @return the iBIJADEBLOH + * optional uint32 current_head_icon_id = 10; + * @return the currentHeadIconId */ - public int getIBIJADEBLOH() { - return iBIJADEBLOH; + public int getCurrentHeadIconId() { + return currentHeadIconId; } /** - * optional uint32 IBIJADEBLOH = 9; - * @param value the iBIJADEBLOH to set + * optional uint32 current_head_icon_id = 10; + * @param value the currentHeadIconId to set * @return this */ - public GetPlayerBoardDataScRsp setIBIJADEBLOH(final int value) { + public GetPlayerBoardDataScRsp setCurrentHeadIconId(final int value) { bitField0_ |= 0x00000001; - iBIJADEBLOH = value; + currentHeadIconId = value; return this; } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -101,7 +96,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return this */ public GetPlayerBoardDataScRsp clearRetcode() { @@ -111,7 +106,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -119,7 +114,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -130,62 +125,25 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 11; - * @return whether the currentHeadIconId field is set + * optional string signature = 2; + * @return whether the signature field is set */ - public boolean hasCurrentHeadIconId() { + public boolean hasSignature() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 current_head_icon_id = 11; - * @return this - */ - public GetPlayerBoardDataScRsp clearCurrentHeadIconId() { - bitField0_ &= ~0x00000004; - currentHeadIconId = 0; - return this; - } - - /** - * optional uint32 current_head_icon_id = 11; - * @return the currentHeadIconId - */ - public int getCurrentHeadIconId() { - return currentHeadIconId; - } - - /** - * optional uint32 current_head_icon_id = 11; - * @param value the currentHeadIconId to set - * @return this - */ - public GetPlayerBoardDataScRsp setCurrentHeadIconId(final int value) { - bitField0_ |= 0x00000004; - currentHeadIconId = value; - return this; - } - - /** - * optional string signature = 12; - * @return whether the signature field is set - */ - public boolean hasSignature() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional string signature = 12; + * optional string signature = 2; * @return this */ public GetPlayerBoardDataScRsp clearSignature() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; signature.clear(); return this; } /** - * optional string signature = 12; + * optional string signature = 2; * @return the signature */ public String getSignature() { @@ -193,7 +151,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 12; + * optional string signature = 2; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -201,56 +159,56 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 12; + * optional string signature = 2; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return this.signature; } /** - * optional string signature = 12; + * optional string signature = 2; * @param value the signature to set * @return this */ public GetPlayerBoardDataScRsp setSignature(final CharSequence value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; signature.copyFrom(value); return this; } /** - * optional string signature = 12; + * optional string signature = 2; * @param value the signature to set * @return this */ public GetPlayerBoardDataScRsp setSignature(final Utf8String value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; signature.copyFrom(value); return this; } /** - * repeated .HeadIcon unlocked_head_icon_list = 8; + * repeated .HeadIcon unlocked_head_icon_list = 6; * @return whether the unlockedHeadIconList field is set */ public boolean hasUnlockedHeadIconList() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * repeated .HeadIcon unlocked_head_icon_list = 8; + * repeated .HeadIcon unlocked_head_icon_list = 6; * @return this */ public GetPlayerBoardDataScRsp clearUnlockedHeadIconList() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; unlockedHeadIconList.clear(); return this; } /** - * repeated .HeadIcon unlocked_head_icon_list = 8; + * repeated .HeadIcon unlocked_head_icon_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. @@ -264,7 +222,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 8; + * repeated .HeadIcon unlocked_head_icon_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 @@ -273,30 +231,30 @@ public final class GetPlayerBoardDataScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableUnlockedHeadIconList() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return unlockedHeadIconList; } /** - * repeated .HeadIcon unlocked_head_icon_list = 8; + * repeated .HeadIcon unlocked_head_icon_list = 6; * @param value the unlockedHeadIconList to add * @return this */ public GetPlayerBoardDataScRsp addUnlockedHeadIconList( final HeadIconOuterClass.HeadIcon value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; unlockedHeadIconList.add(value); return this; } /** - * repeated .HeadIcon unlocked_head_icon_list = 8; + * repeated .HeadIcon unlocked_head_icon_list = 6; * @param values the unlockedHeadIconList to add * @return this */ public GetPlayerBoardDataScRsp addAllUnlockedHeadIconList( final HeadIconOuterClass.HeadIcon... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; unlockedHeadIconList.addAll(values); return this; } @@ -306,9 +264,8 @@ public final class GetPlayerBoardDataScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - iBIJADEBLOH = other.iBIJADEBLOH; - retcode = other.retcode; currentHeadIconId = other.currentHeadIconId; + retcode = other.retcode; signature.copyFrom(other.signature); unlockedHeadIconList.copyFrom(other.unlockedHeadIconList); } @@ -321,15 +278,12 @@ public final class GetPlayerBoardDataScRspOuterClass { return this; } cachedSize = -1; - if (other.hasIBIJADEBLOH()) { - setIBIJADEBLOH(other.iBIJADEBLOH); + if (other.hasCurrentHeadIconId()) { + setCurrentHeadIconId(other.currentHeadIconId); } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasCurrentHeadIconId()) { - setCurrentHeadIconId(other.currentHeadIconId); - } if (other.hasSignature()) { getMutableSignatureBytes().copyFrom(other.signature); } @@ -346,9 +300,8 @@ public final class GetPlayerBoardDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - iBIJADEBLOH = 0; - retcode = 0; currentHeadIconId = 0; + retcode = 0; signature.clear(); unlockedHeadIconList.clear(); return this; @@ -376,9 +329,8 @@ public final class GetPlayerBoardDataScRspOuterClass { } GetPlayerBoardDataScRsp other = (GetPlayerBoardDataScRsp) o; return bitField0_ == other.bitField0_ - && (!hasIBIJADEBLOH() || iBIJADEBLOH == other.iBIJADEBLOH) - && (!hasRetcode() || retcode == other.retcode) && (!hasCurrentHeadIconId() || currentHeadIconId == other.currentHeadIconId) + && (!hasRetcode() || retcode == other.retcode) && (!hasSignature() || signature.equals(other.signature)) && (!hasUnlockedHeadIconList() || unlockedHeadIconList.equals(other.unlockedHeadIconList)); } @@ -386,24 +338,20 @@ public final class GetPlayerBoardDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(iBIJADEBLOH); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(currentHeadIconId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(currentHeadIconId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 18); output.writeStringNoTag(signature); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < unlockedHeadIconList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 50); output.writeMessageNoTag(unlockedHeadIconList.get(i)); } } @@ -413,18 +361,15 @@ public final class GetPlayerBoardDataScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(iBIJADEBLOH); + size += 1 + ProtoSink.computeUInt32SizeNoTag(currentHeadIconId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(currentHeadIconId); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(signature); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += (1 * unlockedHeadIconList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedHeadIconList); } return size; @@ -437,46 +382,37 @@ public final class GetPlayerBoardDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // iBIJADEBLOH - iBIJADEBLOH = input.readUInt32(); + case 80: { + // currentHeadIconId + currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 120) { break; } } - case 80: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 18) { break; } } - case 88: { - // currentHeadIconId - currentHeadIconId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { + case 18: { // signature input.readString(signature); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 66) { + if (tag != 50) { break; } } - case 66: { + case 50: { // unlockedHeadIconList tag = input.readRepeatedMessage(unlockedHeadIconList, tag); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; if (tag != 0) { break; } @@ -499,18 +435,15 @@ public final class GetPlayerBoardDataScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.iBIJADEBLOH, iBIJADEBLOH); + output.writeUInt32(FieldNames.currentHeadIconId, currentHeadIconId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.currentHeadIconId, currentHeadIconId); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeString(FieldNames.signature, signature); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.unlockedHeadIconList, unlockedHeadIconList); } output.endObject(); @@ -523,10 +456,11 @@ public final class GetPlayerBoardDataScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1523919381: { - if (input.isAtField(FieldNames.iBIJADEBLOH)) { + case 2107487181: + case -1003133880: { + if (input.isAtField(FieldNames.currentHeadIconId)) { if (!input.trySkipNullValue()) { - iBIJADEBLOH = input.readUInt32(); + currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -545,23 +479,11 @@ public final class GetPlayerBoardDataScRspOuterClass { } break; } - case 2107487181: - case -1003133880: { - if (input.isAtField(FieldNames.currentHeadIconId)) { - if (!input.trySkipNullValue()) { - currentHeadIconId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 1073584312: { if (input.isAtField(FieldNames.signature)) { if (!input.trySkipNullValue()) { input.readString(signature); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -573,7 +495,7 @@ public final class GetPlayerBoardDataScRspOuterClass { if (input.isAtField(FieldNames.unlockedHeadIconList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(unlockedHeadIconList); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -633,12 +555,10 @@ public final class GetPlayerBoardDataScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName iBIJADEBLOH = FieldName.forField("IBIJADEBLOH"); + static final FieldName currentHeadIconId = FieldName.forField("currentHeadIconId", "current_head_icon_id"); static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName currentHeadIconId = FieldName.forField("currentHeadIconId", "current_head_icon_id"); - static final FieldName signature = FieldName.forField("signature"); static final FieldName unlockedHeadIconList = FieldName.forField("unlockedHeadIconList", "unlocked_head_icon_list"); diff --git a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java index 519f256..4556d13 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java @@ -19,14 +19,14 @@ public final class GetPrivateChatHistoryCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 to_uid = 13; + * optional uint32 sender_uid = 1; */ - private int toUid; + private int senderUid; /** - * optional uint32 NJNHPFLFKCN = 14; + * optional uint32 to_uid = 8; */ - private int nJNHPFLFKCN; + private int toUid; private GetPrivateChatHistoryCsReq() { } @@ -39,25 +39,62 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 to_uid = 13; - * @return whether the toUid field is set + * optional uint32 sender_uid = 1; + * @return whether the senderUid field is set */ - public boolean hasToUid() { + public boolean hasSenderUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 to_uid = 13; + * optional uint32 sender_uid = 1; + * @return this + */ + public GetPrivateChatHistoryCsReq clearSenderUid() { + bitField0_ &= ~0x00000001; + senderUid = 0; + return this; + } + + /** + * optional uint32 sender_uid = 1; + * @return the senderUid + */ + public int getSenderUid() { + return senderUid; + } + + /** + * optional uint32 sender_uid = 1; + * @param value the senderUid to set + * @return this + */ + public GetPrivateChatHistoryCsReq setSenderUid(final int value) { + bitField0_ |= 0x00000001; + senderUid = value; + return this; + } + + /** + * optional uint32 to_uid = 8; + * @return whether the toUid field is set + */ + public boolean hasToUid() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 to_uid = 8; * @return this */ public GetPrivateChatHistoryCsReq clearToUid() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; toUid = 0; return this; } /** - * optional uint32 to_uid = 13; + * optional uint32 to_uid = 8; * @return the toUid */ public int getToUid() { @@ -65,50 +102,13 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 to_uid = 13; + * optional uint32 to_uid = 8; * @param value the toUid to set * @return this */ public GetPrivateChatHistoryCsReq setToUid(final int value) { - bitField0_ |= 0x00000001; - toUid = value; - return this; - } - - /** - * optional uint32 NJNHPFLFKCN = 14; - * @return whether the nJNHPFLFKCN field is set - */ - public boolean hasNJNHPFLFKCN() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 NJNHPFLFKCN = 14; - * @return this - */ - public GetPrivateChatHistoryCsReq clearNJNHPFLFKCN() { - bitField0_ &= ~0x00000002; - nJNHPFLFKCN = 0; - return this; - } - - /** - * optional uint32 NJNHPFLFKCN = 14; - * @return the nJNHPFLFKCN - */ - public int getNJNHPFLFKCN() { - return nJNHPFLFKCN; - } - - /** - * optional uint32 NJNHPFLFKCN = 14; - * @param value the nJNHPFLFKCN to set - * @return this - */ - public GetPrivateChatHistoryCsReq setNJNHPFLFKCN(final int value) { bitField0_ |= 0x00000002; - nJNHPFLFKCN = value; + toUid = value; return this; } @@ -117,8 +117,8 @@ public final class GetPrivateChatHistoryCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + senderUid = other.senderUid; toUid = other.toUid; - nJNHPFLFKCN = other.nJNHPFLFKCN; } 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.hasNJNHPFLFKCN()) { - setNJNHPFLFKCN(other.nJNHPFLFKCN); - } return this; } @@ -145,8 +145,8 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; + senderUid = 0; toUid = 0; - nJNHPFLFKCN = 0; return this; } @@ -170,19 +170,19 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } GetPrivateChatHistoryCsReq other = (GetPrivateChatHistoryCsReq) o; return bitField0_ == other.bitField0_ - && (!hasToUid() || toUid == other.toUid) - && (!hasNJNHPFLFKCN() || nJNHPFLFKCN == other.nJNHPFLFKCN); + && (!hasSenderUid() || senderUid == other.senderUid) + && (!hasToUid() || toUid == other.toUid); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(toUid); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(senderUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(nJNHPFLFKCN); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(toUid); } } @@ -190,10 +190,10 @@ public final class GetPrivateChatHistoryCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(nJNHPFLFKCN); + size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); } return size; } @@ -205,18 +205,18 @@ public final class GetPrivateChatHistoryCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { - // toUid - toUid = input.readUInt32(); + case 8: { + // senderUid + senderUid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 64) { break; } } - case 112: { - // nJNHPFLFKCN - nJNHPFLFKCN = input.readUInt32(); + case 64: { + // toUid + toUid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class GetPrivateChatHistoryCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.toUid, toUid); + output.writeUInt32(FieldNames.senderUid, senderUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.nJNHPFLFKCN, nJNHPFLFKCN); + output.writeUInt32(FieldNames.toUid, toUid); } output.endObject(); } @@ -256,11 +256,11 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 110520277: - case -868529012: { - if (input.isAtField(FieldNames.toUid)) { + case 32180699: + case 997911366: { + if (input.isAtField(FieldNames.senderUid)) { if (!input.trySkipNullValue()) { - toUid = input.readUInt32(); + senderUid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,10 +268,11 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } break; } - case 1657620688: { - if (input.isAtField(FieldNames.nJNHPFLFKCN)) { + case 110520277: + case -868529012: { + if (input.isAtField(FieldNames.toUid)) { if (!input.trySkipNullValue()) { - nJNHPFLFKCN = input.readUInt32(); + toUid = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +333,9 @@ public final class GetPrivateChatHistoryCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName toUid = FieldName.forField("toUid", "to_uid"); + static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid"); - static final FieldName nJNHPFLFKCN = FieldName.forField("NJNHPFLFKCN"); + static final FieldName toUid = FieldName.forField("toUid", "to_uid"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java index 21faf81..ea58911 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 = 3; - */ - private int toUid; - - /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional uint32 NJNHPFLFKCN = 10; + * optional uint32 to_uid = 4; */ - private int nJNHPFLFKCN; + private int toUid; /** - * repeated .Chat chat_list = 14; + * optional uint32 sender_uid = 7; + */ + private int senderUid; + + /** + * repeated .Chat chat_list = 13; */ private final RepeatedMessage chatList = RepeatedMessage.newEmptyInstance(ChatOuterClass.Chat.getFactory()); @@ -50,62 +50,25 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 to_uid = 3; - * @return whether the toUid field is set + * optional uint32 retcode = 3; + * @return whether the retcode field is set */ - public boolean hasToUid() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 to_uid = 3; - * @return this - */ - public GetPrivateChatHistoryScRsp clearToUid() { - bitField0_ &= ~0x00000001; - toUid = 0; - return this; - } - - /** - * optional uint32 to_uid = 3; - * @return the toUid - */ - public int getToUid() { - return toUid; - } - - /** - * optional uint32 to_uid = 3; - * @param value the toUid to set - * @return this - */ - public GetPrivateChatHistoryScRsp setToUid(final int value) { - bitField0_ |= 0x00000001; - toUid = value; - return this; - } - - /** - * optional uint32 retcode = 9; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 3; * @return this */ public GetPrivateChatHistoryScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -113,55 +76,92 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ public GetPrivateChatHistoryScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional uint32 NJNHPFLFKCN = 10; - * @return whether the nJNHPFLFKCN field is set + * optional uint32 to_uid = 4; + * @return whether the toUid field is set */ - public boolean hasNJNHPFLFKCN() { + public boolean hasToUid() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 to_uid = 4; + * @return this + */ + public GetPrivateChatHistoryScRsp clearToUid() { + bitField0_ &= ~0x00000002; + toUid = 0; + return this; + } + + /** + * optional uint32 to_uid = 4; + * @return the toUid + */ + public int getToUid() { + return toUid; + } + + /** + * optional uint32 to_uid = 4; + * @param value the toUid to set + * @return this + */ + public GetPrivateChatHistoryScRsp setToUid(final int value) { + bitField0_ |= 0x00000002; + toUid = value; + return this; + } + + /** + * optional uint32 sender_uid = 7; + * @return whether the senderUid field is set + */ + public boolean hasSenderUid() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 NJNHPFLFKCN = 10; + * optional uint32 sender_uid = 7; * @return this */ - public GetPrivateChatHistoryScRsp clearNJNHPFLFKCN() { + public GetPrivateChatHistoryScRsp clearSenderUid() { bitField0_ &= ~0x00000004; - nJNHPFLFKCN = 0; + senderUid = 0; return this; } /** - * optional uint32 NJNHPFLFKCN = 10; - * @return the nJNHPFLFKCN + * optional uint32 sender_uid = 7; + * @return the senderUid */ - public int getNJNHPFLFKCN() { - return nJNHPFLFKCN; + public int getSenderUid() { + return senderUid; } /** - * optional uint32 NJNHPFLFKCN = 10; - * @param value the nJNHPFLFKCN to set + * optional uint32 sender_uid = 7; + * @param value the senderUid to set * @return this */ - public GetPrivateChatHistoryScRsp setNJNHPFLFKCN(final int value) { + public GetPrivateChatHistoryScRsp setSenderUid(final int value) { bitField0_ |= 0x00000004; - nJNHPFLFKCN = value; + senderUid = value; return this; } /** - * repeated .Chat chat_list = 14; + * repeated .Chat chat_list = 13; * @return whether the chatList field is set */ public boolean hasChatList() { @@ -169,7 +169,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 14; + * repeated .Chat chat_list = 13; * @return this */ public GetPrivateChatHistoryScRsp clearChatList() { @@ -179,7 +179,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 14; + * repeated .Chat chat_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -193,7 +193,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 14; + * repeated .Chat chat_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -207,7 +207,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 14; + * repeated .Chat chat_list = 13; * @param value the chatList to add * @return this */ @@ -218,7 +218,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 14; + * repeated .Chat chat_list = 13; * @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; - nJNHPFLFKCN = other.nJNHPFLFKCN; + toUid = other.toUid; + senderUid = other.senderUid; 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.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasNJNHPFLFKCN()) { - setNJNHPFLFKCN(other.nJNHPFLFKCN); + if (other.hasToUid()) { + setToUid(other.toUid); + } + if (other.hasSenderUid()) { + setSenderUid(other.senderUid); } if (other.hasChatList()) { getMutableChatList().addAll(other.chatList); @@ -269,9 +269,9 @@ public final class GetPrivateChatHistoryScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - toUid = 0; retcode = 0; - nJNHPFLFKCN = 0; + toUid = 0; + senderUid = 0; chatList.clear(); return this; } @@ -297,9 +297,9 @@ public final class GetPrivateChatHistoryScRspOuterClass { } GetPrivateChatHistoryScRsp other = (GetPrivateChatHistoryScRsp) o; return bitField0_ == other.bitField0_ - && (!hasToUid() || toUid == other.toUid) && (!hasRetcode() || retcode == other.retcode) - && (!hasNJNHPFLFKCN() || nJNHPFLFKCN == other.nJNHPFLFKCN) + && (!hasToUid() || toUid == other.toUid) + && (!hasSenderUid() || senderUid == other.senderUid) && (!hasChatList() || chatList.equals(other.chatList)); } @@ -307,19 +307,19 @@ public final class GetPrivateChatHistoryScRspOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 24); - output.writeUInt32NoTag(toUid); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(toUid); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(nJNHPFLFKCN); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(senderUid); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < chatList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 106); 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); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(nJNHPFLFKCN); + size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); } if ((bitField0_ & 0x00000008) != 0) { size += (1 * chatList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(chatList); @@ -351,33 +351,33 @@ public final class GetPrivateChatHistoryScRspOuterClass { while (true) { switch (tag) { case 24: { - // toUid - toUid = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { // retcode retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // toUid + toUid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 56) { break; } } - case 80: { - // nJNHPFLFKCN - nJNHPFLFKCN = input.readUInt32(); + case 56: { + // senderUid + senderUid = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 114) { + if (tag != 106) { break; } } - case 114: { + case 106: { // 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); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.toUid, toUid); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.nJNHPFLFKCN, nJNHPFLFKCN); + output.writeUInt32(FieldNames.senderUid, senderUid); } if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.chatList, chatList); @@ -424,11 +424,10 @@ public final class GetPrivateChatHistoryScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 110520277: - case -868529012: { - if (input.isAtField(FieldNames.toUid)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - toUid = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -436,10 +435,11 @@ public final class GetPrivateChatHistoryScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 110520277: + case -868529012: { + if (input.isAtField(FieldNames.toUid)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + toUid = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -447,10 +447,11 @@ public final class GetPrivateChatHistoryScRspOuterClass { } break; } - case 1657620688: { - if (input.isAtField(FieldNames.nJNHPFLFKCN)) { + case 32180699: + case 997911366: { + if (input.isAtField(FieldNames.senderUid)) { if (!input.trySkipNullValue()) { - nJNHPFLFKCN = input.readUInt32(); + senderUid = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -523,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 retcode = FieldName.forField("retcode"); - static final FieldName nJNHPFLFKCN = FieldName.forField("NJNHPFLFKCN"); + static final FieldName toUid = FieldName.forField("toUid", "to_uid"); + + static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid"); static final FieldName chatList = FieldName.forField("chatList", "chat_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java index 9e8cc7e..1d7aff8 100644 --- a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java @@ -20,17 +20,12 @@ public final class GetSceneMapInfoCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 1; */ private int entryId; /** - * optional bool DBHFEKHNIIH = 2; - */ - private boolean dBHFEKHNIIH; - - /** - * repeated uint32 entry_id_list = 15; + * repeated uint32 entry_id_list = 10; */ private final RepeatedInt entryIdList = RepeatedInt.newEmptyInstance(); @@ -45,7 +40,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 1; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -53,7 +48,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 1; * @return this */ public GetSceneMapInfoCsReq clearEntryId() { @@ -63,7 +58,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 1; * @return the entryId */ public int getEntryId() { @@ -71,7 +66,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 1; * @param value the entryId to set * @return this */ @@ -82,62 +77,25 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * optional bool DBHFEKHNIIH = 2; - * @return whether the dBHFEKHNIIH field is set + * repeated uint32 entry_id_list = 10; + * @return whether the entryIdList field is set */ - public boolean hasDBHFEKHNIIH() { + public boolean hasEntryIdList() { return (bitField0_ & 0x00000002) != 0; } /** - * optional bool DBHFEKHNIIH = 2; - * @return this - */ - public GetSceneMapInfoCsReq clearDBHFEKHNIIH() { - bitField0_ &= ~0x00000002; - dBHFEKHNIIH = false; - return this; - } - - /** - * optional bool DBHFEKHNIIH = 2; - * @return the dBHFEKHNIIH - */ - public boolean getDBHFEKHNIIH() { - return dBHFEKHNIIH; - } - - /** - * optional bool DBHFEKHNIIH = 2; - * @param value the dBHFEKHNIIH to set - * @return this - */ - public GetSceneMapInfoCsReq setDBHFEKHNIIH(final boolean value) { - bitField0_ |= 0x00000002; - dBHFEKHNIIH = value; - return this; - } - - /** - * repeated uint32 entry_id_list = 15; - * @return whether the entryIdList field is set - */ - public boolean hasEntryIdList() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated uint32 entry_id_list = 15; + * repeated uint32 entry_id_list = 10; * @return this */ public GetSceneMapInfoCsReq clearEntryIdList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; entryIdList.clear(); return this; } /** - * repeated uint32 entry_id_list = 15; + * 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. @@ -151,7 +109,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 15; + * 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 @@ -160,28 +118,28 @@ public final class GetSceneMapInfoCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableEntryIdList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return entryIdList; } /** - * repeated uint32 entry_id_list = 15; + * repeated uint32 entry_id_list = 10; * @param value the entryIdList to add * @return this */ public GetSceneMapInfoCsReq addEntryIdList(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; entryIdList.add(value); return this; } /** - * repeated uint32 entry_id_list = 15; + * repeated uint32 entry_id_list = 10; * @param values the entryIdList to add * @return this */ public GetSceneMapInfoCsReq addAllEntryIdList(final int... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; entryIdList.addAll(values); return this; } @@ -192,7 +150,6 @@ public final class GetSceneMapInfoCsReqOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; entryId = other.entryId; - dBHFEKHNIIH = other.dBHFEKHNIIH; entryIdList.copyFrom(other.entryIdList); } return this; @@ -207,9 +164,6 @@ public final class GetSceneMapInfoCsReqOuterClass { if (other.hasEntryId()) { setEntryId(other.entryId); } - if (other.hasDBHFEKHNIIH()) { - setDBHFEKHNIIH(other.dBHFEKHNIIH); - } if (other.hasEntryIdList()) { getMutableEntryIdList().addAll(other.entryIdList); } @@ -224,7 +178,6 @@ public final class GetSceneMapInfoCsReqOuterClass { cachedSize = -1; bitField0_ = 0; entryId = 0; - dBHFEKHNIIH = false; entryIdList.clear(); return this; } @@ -251,23 +204,18 @@ public final class GetSceneMapInfoCsReqOuterClass { GetSceneMapInfoCsReq other = (GetSceneMapInfoCsReq) o; return bitField0_ == other.bitField0_ && (!hasEntryId() || entryId == other.entryId) - && (!hasDBHFEKHNIIH() || dBHFEKHNIIH == other.dBHFEKHNIIH) && (!hasEntryIdList() || entryIdList.equals(other.entryIdList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeBoolNoTag(dBHFEKHNIIH); - } - if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < entryIdList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(entryIdList.array()[i]); } } @@ -280,9 +228,6 @@ public final class GetSceneMapInfoCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { - size += 2; - } - if ((bitField0_ & 0x00000004) != 0) { size += (1 * entryIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(entryIdList); } return size; @@ -295,28 +240,19 @@ public final class GetSceneMapInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 8: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 82) { break; } } - case 16: { - // dBHFEKHNIIH - dBHFEKHNIIH = input.readBool(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { + case 82: { // entryIdList [packed=true] input.readPackedUInt32(entryIdList, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { break; @@ -332,10 +268,10 @@ public final class GetSceneMapInfoCsReqOuterClass { tag = input.readTag(); break; } - case 120: { + case 80: { // entryIdList [packed=false] tag = input.readRepeatedUInt32(entryIdList, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; break; } } @@ -349,9 +285,6 @@ public final class GetSceneMapInfoCsReqOuterClass { output.writeUInt32(FieldNames.entryId, entryId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeBool(FieldNames.dBHFEKHNIIH, dBHFEKHNIIH); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedUInt32(FieldNames.entryIdList, entryIdList); } output.endObject(); @@ -376,23 +309,12 @@ public final class GetSceneMapInfoCsReqOuterClass { } break; } - case 1755627008: { - if (input.isAtField(FieldNames.dBHFEKHNIIH)) { - if (!input.trySkipNullValue()) { - dBHFEKHNIIH = input.readBool(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -1441102997: case -1413189003: { if (input.isAtField(FieldNames.entryIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(entryIdList); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -454,8 +376,6 @@ public final class GetSceneMapInfoCsReqOuterClass { static class FieldNames { static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - static final FieldName dBHFEKHNIIH = FieldName.forField("DBHFEKHNIIH"); - static final FieldName entryIdList = FieldName.forField("entryIdList", "entry_id_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java index 2708c6f..784e0cc 100644 --- a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java @@ -21,49 +21,35 @@ public final class GetSceneMapInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional uint32 cur_map_entry_id = 9; - */ - private int curMapEntryId; - - /** - * optional uint32 entry_id = 12; + * optional uint32 entry_id = 14; */ private int entryId; /** - * optional bool DBHFEKHNIIH = 10; + * optional uint32 cur_map_entry_id = 15; */ - private boolean dBHFEKHNIIH; + private int curMapEntryId; /** - * repeated uint32 PLHHEJPGCNP = 1; + * repeated uint32 unlocked_teleport_list = 10; */ - private final RepeatedInt pLHHEJPGCNP = RepeatedInt.newEmptyInstance(); + private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 PEJMPFBLINI = 4; + * repeated uint32 lighten_section_list = 12; */ - private final RepeatedInt pEJMPFBLINI = RepeatedInt.newEmptyInstance(); + private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); /** - * repeated .MazeProp maze_prop_list = 3; + * repeated .MazeProp maze_prop_list = 4; */ private final RepeatedMessage mazePropList = RepeatedMessage.newEmptyInstance(MazePropOuterClass.MazeProp.getFactory()); - /** - * repeated .MazeGroup maze_group_list = 5; - */ - private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory()); - /** * repeated .MazeChest unlocked_chest_list = 6; */ @@ -74,6 +60,11 @@ public final class GetSceneMapInfoScRspOuterClass { */ private final RepeatedMessage mapList = RepeatedMessage.newEmptyInstance(MazeMapDataOuterClass.MazeMapData.getFactory()); + /** + * repeated .MazeGroup maze_group_list = 11; + */ + private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory()); + private GetSceneMapInfoScRsp() { } @@ -85,11 +76,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -97,11 +84,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return this */ public GetSceneMapInfoScRsp clearRetcode() { @@ -111,11 +94,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -123,11 +102,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -138,62 +113,25 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * optional uint32 cur_map_entry_id = 9; - * @return whether the curMapEntryId field is set + * optional uint32 entry_id = 14; + * @return whether the entryId field is set */ - public boolean hasCurMapEntryId() { + public boolean hasEntryId() { 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 = 12; - * @return whether the entryId field is set - */ - public boolean hasEntryId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 entry_id = 12; + * optional uint32 entry_id = 14; * @return this */ public GetSceneMapInfoScRsp clearEntryId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; entryId = 0; return this; } /** - * optional uint32 entry_id = 12; + * optional uint32 entry_id = 14; * @return the entryId */ public int getEntryId() { @@ -201,87 +139,155 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * optional uint32 entry_id = 12; + * optional uint32 entry_id = 14; * @param value the entryId to set * @return this */ public GetSceneMapInfoScRsp setEntryId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; entryId = value; return this; } /** - * optional bool DBHFEKHNIIH = 10; - * @return whether the dBHFEKHNIIH field is set + * optional uint32 cur_map_entry_id = 15; + * @return whether the curMapEntryId field is set */ - public boolean hasDBHFEKHNIIH() { + public boolean hasCurMapEntryId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 cur_map_entry_id = 15; + * @return this + */ + public GetSceneMapInfoScRsp clearCurMapEntryId() { + bitField0_ &= ~0x00000004; + curMapEntryId = 0; + return this; + } + + /** + * optional uint32 cur_map_entry_id = 15; + * @return the curMapEntryId + */ + public int getCurMapEntryId() { + return curMapEntryId; + } + + /** + * optional uint32 cur_map_entry_id = 15; + * @param value the curMapEntryId to set + * @return this + */ + public GetSceneMapInfoScRsp setCurMapEntryId(final int value) { + bitField0_ |= 0x00000004; + curMapEntryId = value; + return this; + } + + /** + * repeated uint32 unlocked_teleport_list = 10; + * @return whether the unlockedTeleportList field is set + */ + public boolean hasUnlockedTeleportList() { return (bitField0_ & 0x00000008) != 0; } /** - * optional bool DBHFEKHNIIH = 10; + * repeated uint32 unlocked_teleport_list = 10; * @return this */ - public GetSceneMapInfoScRsp clearDBHFEKHNIIH() { + public GetSceneMapInfoScRsp clearUnlockedTeleportList() { bitField0_ &= ~0x00000008; - dBHFEKHNIIH = false; + unlockedTeleportList.clear(); return this; } /** - * optional bool DBHFEKHNIIH = 10; - * @return the dBHFEKHNIIH + * repeated uint32 unlocked_teleport_list = 10; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableUnlockedTeleportList()} if you want to modify it. + * + * @return internal storage object for reading */ - public boolean getDBHFEKHNIIH() { - return dBHFEKHNIIH; + public RepeatedInt getUnlockedTeleportList() { + return unlockedTeleportList; } /** - * optional bool DBHFEKHNIIH = 10; - * @param value the dBHFEKHNIIH to set + * repeated uint32 unlocked_teleport_list = 10; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableUnlockedTeleportList() { + bitField0_ |= 0x00000008; + return unlockedTeleportList; + } + + /** + * repeated uint32 unlocked_teleport_list = 10; + * @param value the unlockedTeleportList to add * @return this */ - public GetSceneMapInfoScRsp setDBHFEKHNIIH(final boolean value) { + public GetSceneMapInfoScRsp addUnlockedTeleportList(final int value) { bitField0_ |= 0x00000008; - dBHFEKHNIIH = value; + unlockedTeleportList.add(value); return this; } /** - * repeated uint32 PLHHEJPGCNP = 1; - * @return whether the pLHHEJPGCNP field is set + * repeated uint32 unlocked_teleport_list = 10; + * @param values the unlockedTeleportList to add + * @return this */ - public boolean hasPLHHEJPGCNP() { + public GetSceneMapInfoScRsp addAllUnlockedTeleportList(final int... values) { + bitField0_ |= 0x00000008; + unlockedTeleportList.addAll(values); + return this; + } + + /** + * repeated uint32 lighten_section_list = 12; + * @return whether the lightenSectionList field is set + */ + public boolean hasLightenSectionList() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated uint32 PLHHEJPGCNP = 1; + * repeated uint32 lighten_section_list = 12; * @return this */ - public GetSceneMapInfoScRsp clearPLHHEJPGCNP() { + public GetSceneMapInfoScRsp clearLightenSectionList() { bitField0_ &= ~0x00000010; - pLHHEJPGCNP.clear(); + lightenSectionList.clear(); return this; } /** - * repeated uint32 PLHHEJPGCNP = 1; + * repeated uint32 lighten_section_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutablePLHHEJPGCNP()} if you want to modify it. + * Use {@link #getMutableLightenSectionList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getPLHHEJPGCNP() { - return pLHHEJPGCNP; + public RepeatedInt getLightenSectionList() { + return lightenSectionList; } /** - * repeated uint32 PLHHEJPGCNP = 1; + * repeated uint32 lighten_section_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -289,121 +295,53 @@ public final class GetSceneMapInfoScRspOuterClass { * * @return internal storage object for modifications */ - public RepeatedInt getMutablePLHHEJPGCNP() { + public RepeatedInt getMutableLightenSectionList() { bitField0_ |= 0x00000010; - return pLHHEJPGCNP; + return lightenSectionList; } /** - * repeated uint32 PLHHEJPGCNP = 1; - * @param value the pLHHEJPGCNP to add + * repeated uint32 lighten_section_list = 12; + * @param value the lightenSectionList to add * @return this */ - public GetSceneMapInfoScRsp addPLHHEJPGCNP(final int value) { + public GetSceneMapInfoScRsp addLightenSectionList(final int value) { bitField0_ |= 0x00000010; - pLHHEJPGCNP.add(value); + lightenSectionList.add(value); return this; } /** - * repeated uint32 PLHHEJPGCNP = 1; - * @param values the pLHHEJPGCNP to add + * repeated uint32 lighten_section_list = 12; + * @param values the lightenSectionList to add * @return this */ - public GetSceneMapInfoScRsp addAllPLHHEJPGCNP(final int... values) { + public GetSceneMapInfoScRsp addAllLightenSectionList(final int... values) { bitField0_ |= 0x00000010; - pLHHEJPGCNP.addAll(values); + lightenSectionList.addAll(values); return this; } /** - * repeated uint32 PEJMPFBLINI = 4; - * @return whether the pEJMPFBLINI field is set + * repeated .MazeProp maze_prop_list = 4; + * @return whether the mazePropList field is set */ - public boolean hasPEJMPFBLINI() { + public boolean hasMazePropList() { return (bitField0_ & 0x00000020) != 0; } /** - * repeated uint32 PEJMPFBLINI = 4; - * @return this - */ - public GetSceneMapInfoScRsp clearPEJMPFBLINI() { - bitField0_ &= ~0x00000020; - pEJMPFBLINI.clear(); - return this; - } - - /** - * repeated uint32 PEJMPFBLINI = 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 #getMutablePEJMPFBLINI()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getPEJMPFBLINI() { - return pEJMPFBLINI; - } - - /** - * repeated uint32 PEJMPFBLINI = 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 getMutablePEJMPFBLINI() { - bitField0_ |= 0x00000020; - return pEJMPFBLINI; - } - - /** - * repeated uint32 PEJMPFBLINI = 4; - * @param value the pEJMPFBLINI to add - * @return this - */ - public GetSceneMapInfoScRsp addPEJMPFBLINI(final int value) { - bitField0_ |= 0x00000020; - pEJMPFBLINI.add(value); - return this; - } - - /** - * repeated uint32 PEJMPFBLINI = 4; - * @param values the pEJMPFBLINI to add - * @return this - */ - public GetSceneMapInfoScRsp addAllPEJMPFBLINI(final int... values) { - bitField0_ |= 0x00000020; - pEJMPFBLINI.addAll(values); - return this; - } - - /** - * repeated .MazeProp maze_prop_list = 3; - * @return whether the mazePropList field is set - */ - public boolean hasMazePropList() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * repeated .MazeProp maze_prop_list = 3; + * repeated .MazeProp maze_prop_list = 4; * @return this */ public GetSceneMapInfoScRsp clearMazePropList() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000020; mazePropList.clear(); return this; } /** - * repeated .MazeProp maze_prop_list = 3; + * 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. @@ -417,7 +355,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeProp maze_prop_list = 3; + * 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 @@ -426,106 +364,38 @@ public final class GetSceneMapInfoScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMazePropList() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; return mazePropList; } /** - * repeated .MazeProp maze_prop_list = 3; + * repeated .MazeProp maze_prop_list = 4; * @param value the mazePropList to add * @return this */ public GetSceneMapInfoScRsp addMazePropList(final MazePropOuterClass.MazeProp value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; mazePropList.add(value); return this; } /** - * repeated .MazeProp maze_prop_list = 3; + * repeated .MazeProp maze_prop_list = 4; * @param values the mazePropList to add * @return this */ public GetSceneMapInfoScRsp addAllMazePropList(final MazePropOuterClass.MazeProp... values) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; mazePropList.addAll(values); return this; } - /** - * repeated .MazeGroup maze_group_list = 5; - * @return whether the mazeGroupList field is set - */ - public boolean hasMazeGroupList() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated .MazeGroup maze_group_list = 5; - * @return this - */ - public GetSceneMapInfoScRsp clearMazeGroupList() { - bitField0_ &= ~0x00000080; - mazeGroupList.clear(); - return this; - } - - /** - * repeated .MazeGroup maze_group_list = 5; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableMazeGroupList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMazeGroupList() { - return mazeGroupList; - } - - /** - * repeated .MazeGroup maze_group_list = 5; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableMazeGroupList() { - bitField0_ |= 0x00000080; - return mazeGroupList; - } - - /** - * repeated .MazeGroup maze_group_list = 5; - * @param value the mazeGroupList to add - * @return this - */ - public GetSceneMapInfoScRsp addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) { - bitField0_ |= 0x00000080; - mazeGroupList.add(value); - return this; - } - - /** - * repeated .MazeGroup maze_group_list = 5; - * @param values the mazeGroupList to add - * @return this - */ - public GetSceneMapInfoScRsp addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) { - bitField0_ |= 0x00000080; - mazeGroupList.addAll(values); - return this; - } - /** * repeated .MazeChest unlocked_chest_list = 6; * @return whether the unlockedChestList field is set */ public boolean hasUnlockedChestList() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000040) != 0; } /** @@ -533,7 +403,7 @@ public final class GetSceneMapInfoScRspOuterClass { * @return this */ public GetSceneMapInfoScRsp clearUnlockedChestList() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000040; unlockedChestList.clear(); return this; } @@ -562,7 +432,7 @@ public final class GetSceneMapInfoScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableUnlockedChestList() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; return unlockedChestList; } @@ -572,7 +442,7 @@ public final class GetSceneMapInfoScRspOuterClass { * @return this */ public GetSceneMapInfoScRsp addUnlockedChestList(final MazeChestOuterClass.MazeChest value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; unlockedChestList.add(value); return this; } @@ -584,7 +454,7 @@ public final class GetSceneMapInfoScRspOuterClass { */ public GetSceneMapInfoScRsp addAllUnlockedChestList( final MazeChestOuterClass.MazeChest... values) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; unlockedChestList.addAll(values); return this; } @@ -594,7 +464,7 @@ public final class GetSceneMapInfoScRspOuterClass { * @return whether the mapList field is set */ public boolean hasMapList() { - return (bitField0_ & 0x00000200) != 0; + return (bitField0_ & 0x00000080) != 0; } /** @@ -602,7 +472,7 @@ public final class GetSceneMapInfoScRspOuterClass { * @return this */ public GetSceneMapInfoScRsp clearMapList() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000080; mapList.clear(); return this; } @@ -631,7 +501,7 @@ public final class GetSceneMapInfoScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMapList() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; return mapList; } @@ -641,7 +511,7 @@ public final class GetSceneMapInfoScRspOuterClass { * @return this */ public GetSceneMapInfoScRsp addMapList(final MazeMapDataOuterClass.MazeMapData value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; mapList.add(value); return this; } @@ -652,26 +522,93 @@ public final class GetSceneMapInfoScRspOuterClass { * @return this */ public GetSceneMapInfoScRsp addAllMapList(final MazeMapDataOuterClass.MazeMapData... values) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; mapList.addAll(values); return this; } + /** + * repeated .MazeGroup maze_group_list = 11; + * @return whether the mazeGroupList field is set + */ + public boolean hasMazeGroupList() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * repeated .MazeGroup maze_group_list = 11; + * @return this + */ + public GetSceneMapInfoScRsp clearMazeGroupList() { + bitField0_ &= ~0x00000100; + mazeGroupList.clear(); + return this; + } + + /** + * repeated .MazeGroup maze_group_list = 11; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableMazeGroupList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMazeGroupList() { + return mazeGroupList; + } + + /** + * repeated .MazeGroup maze_group_list = 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 getMutableMazeGroupList() { + bitField0_ |= 0x00000100; + return mazeGroupList; + } + + /** + * repeated .MazeGroup maze_group_list = 11; + * @param value the mazeGroupList to add + * @return this + */ + public GetSceneMapInfoScRsp addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) { + bitField0_ |= 0x00000100; + mazeGroupList.add(value); + return this; + } + + /** + * repeated .MazeGroup maze_group_list = 11; + * @param values the mazeGroupList to add + * @return this + */ + public GetSceneMapInfoScRsp addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) { + bitField0_ |= 0x00000100; + mazeGroupList.addAll(values); + return this; + } + @Override public GetSceneMapInfoScRsp copyFrom(final GetSceneMapInfoScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - curMapEntryId = other.curMapEntryId; entryId = other.entryId; - dBHFEKHNIIH = other.dBHFEKHNIIH; - pLHHEJPGCNP.copyFrom(other.pLHHEJPGCNP); - pEJMPFBLINI.copyFrom(other.pEJMPFBLINI); + curMapEntryId = other.curMapEntryId; + unlockedTeleportList.copyFrom(other.unlockedTeleportList); + lightenSectionList.copyFrom(other.lightenSectionList); mazePropList.copyFrom(other.mazePropList); - mazeGroupList.copyFrom(other.mazeGroupList); unlockedChestList.copyFrom(other.unlockedChestList); mapList.copyFrom(other.mapList); + mazeGroupList.copyFrom(other.mazeGroupList); } return this; } @@ -685,33 +622,30 @@ public final class GetSceneMapInfoScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasCurMapEntryId()) { - setCurMapEntryId(other.curMapEntryId); - } if (other.hasEntryId()) { setEntryId(other.entryId); } - if (other.hasDBHFEKHNIIH()) { - setDBHFEKHNIIH(other.dBHFEKHNIIH); + if (other.hasCurMapEntryId()) { + setCurMapEntryId(other.curMapEntryId); } - if (other.hasPLHHEJPGCNP()) { - getMutablePLHHEJPGCNP().addAll(other.pLHHEJPGCNP); + if (other.hasUnlockedTeleportList()) { + getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList); } - if (other.hasPEJMPFBLINI()) { - getMutablePEJMPFBLINI().addAll(other.pEJMPFBLINI); + if (other.hasLightenSectionList()) { + getMutableLightenSectionList().addAll(other.lightenSectionList); } if (other.hasMazePropList()) { getMutableMazePropList().addAll(other.mazePropList); } - if (other.hasMazeGroupList()) { - getMutableMazeGroupList().addAll(other.mazeGroupList); - } if (other.hasUnlockedChestList()) { getMutableUnlockedChestList().addAll(other.unlockedChestList); } if (other.hasMapList()) { getMutableMapList().addAll(other.mapList); } + if (other.hasMazeGroupList()) { + getMutableMazeGroupList().addAll(other.mazeGroupList); + } return this; } @@ -723,15 +657,14 @@ public final class GetSceneMapInfoScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - curMapEntryId = 0; entryId = 0; - dBHFEKHNIIH = false; - pLHHEJPGCNP.clear(); - pEJMPFBLINI.clear(); + curMapEntryId = 0; + unlockedTeleportList.clear(); + lightenSectionList.clear(); mazePropList.clear(); - mazeGroupList.clear(); unlockedChestList.clear(); mapList.clear(); + mazeGroupList.clear(); return this; } @@ -742,12 +675,12 @@ public final class GetSceneMapInfoScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - pLHHEJPGCNP.clear(); - pEJMPFBLINI.clear(); + unlockedTeleportList.clear(); + lightenSectionList.clear(); mazePropList.clearQuick(); - mazeGroupList.clearQuick(); unlockedChestList.clearQuick(); mapList.clearQuick(); + mazeGroupList.clearQuick(); return this; } @@ -762,71 +695,66 @@ public final class GetSceneMapInfoScRspOuterClass { GetSceneMapInfoScRsp other = (GetSceneMapInfoScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId) && (!hasEntryId() || entryId == other.entryId) - && (!hasDBHFEKHNIIH() || dBHFEKHNIIH == other.dBHFEKHNIIH) - && (!hasPLHHEJPGCNP() || pLHHEJPGCNP.equals(other.pLHHEJPGCNP)) - && (!hasPEJMPFBLINI() || pEJMPFBLINI.equals(other.pEJMPFBLINI)) + && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId) + && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList)) + && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) && (!hasMazePropList() || mazePropList.equals(other.mazePropList)) - && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)) && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList)) - && (!hasMapList() || mapList.equals(other.mapList)); + && (!hasMapList() || mapList.equals(other.mapList)) + && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(curMapEntryId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(entryId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(curMapEntryId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); - output.writeBoolNoTag(dBHFEKHNIIH); + for (int i = 0; i < unlockedTeleportList.length(); i++) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(unlockedTeleportList.array()[i]); + } } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < pLHHEJPGCNP.length(); i++) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(pLHHEJPGCNP.array()[i]); + for (int i = 0; i < lightenSectionList.length(); i++) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(lightenSectionList.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < pEJMPFBLINI.length(); i++) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(pEJMPFBLINI.array()[i]); - } - } - if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < mazePropList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 34); output.writeMessageNoTag(mazePropList.get(i)); } } - if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < mazeGroupList.length(); i++) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(mazeGroupList.get(i)); - } - } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < unlockedChestList.length(); i++) { output.writeRawByte((byte) 50); output.writeMessageNoTag(unlockedChestList.get(i)); } } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000080) != 0) { for (int i = 0; i < mapList.length(); i++) { output.writeRawByte((byte) 58); output.writeMessageNoTag(mapList.get(i)); } } + if ((bitField0_ & 0x00000100) != 0) { + for (int i = 0; i < mazeGroupList.length(); i++) { + output.writeRawByte((byte) 90); + output.writeMessageNoTag(mazeGroupList.get(i)); + } + } } @Override @@ -836,32 +764,29 @@ public final class GetSceneMapInfoScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId); + } if ((bitField0_ & 0x00000008) != 0) { - size += 2; + size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * pLHHEJPGCNP.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(pLHHEJPGCNP); + size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * pEJMPFBLINI.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(pEJMPFBLINI); - } - if ((bitField0_ & 0x00000040) != 0) { size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); } - if ((bitField0_ & 0x00000080) != 0) { - size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); - } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000040) != 0) { size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000080) != 0) { size += (1 * mapList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mapList); } + if ((bitField0_ & 0x00000100) != 0) { + size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); + } return size; } @@ -872,45 +797,45 @@ public final class GetSceneMapInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 112) { break; } } - case 72: { - // curMapEntryId - curMapEntryId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 112: { // entryId entryId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // curMapEntryId + curMapEntryId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 80) { + if (tag != 82) { break; } } - case 80: { - // dBHFEKHNIIH - dBHFEKHNIIH = input.readBool(); + case 82: { + // unlockedTeleportList [packed=true] + input.readPackedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 10) { + if (tag != 98) { break; } } - case 10: { - // pLHHEJPGCNP [packed=true] - input.readPackedUInt32(pLHHEJPGCNP, tag); + case 98: { + // lightenSectionList [packed=true] + input.readPackedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 34) { @@ -918,26 +843,9 @@ public final class GetSceneMapInfoScRspOuterClass { } } case 34: { - // pEJMPFBLINI [packed=true] - input.readPackedUInt32(pEJMPFBLINI, tag); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 26) { - break; - } - } - case 26: { // mazePropList tag = input.readRepeatedMessage(mazePropList, tag); - bitField0_ |= 0x00000040; - if (tag != 42) { - break; - } - } - case 42: { - // mazeGroupList - tag = input.readRepeatedMessage(mazeGroupList, tag); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; if (tag != 50) { break; } @@ -945,7 +853,7 @@ public final class GetSceneMapInfoScRspOuterClass { case 50: { // unlockedChestList tag = input.readRepeatedMessage(unlockedChestList, tag); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; if (tag != 58) { break; } @@ -953,7 +861,15 @@ public final class GetSceneMapInfoScRspOuterClass { case 58: { // mapList tag = input.readRepeatedMessage(mapList, tag); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; + if (tag != 90) { + break; + } + } + case 90: { + // mazeGroupList + tag = input.readRepeatedMessage(mazeGroupList, tag); + bitField0_ |= 0x00000100; if (tag != 0) { break; } @@ -968,16 +884,16 @@ public final class GetSceneMapInfoScRspOuterClass { tag = input.readTag(); break; } - case 8: { - // pLHHEJPGCNP [packed=false] - tag = input.readRepeatedUInt32(pLHHEJPGCNP, tag); - bitField0_ |= 0x00000010; + case 80: { + // unlockedTeleportList [packed=false] + tag = input.readRepeatedUInt32(unlockedTeleportList, tag); + bitField0_ |= 0x00000008; break; } - case 32: { - // pEJMPFBLINI [packed=false] - tag = input.readRepeatedUInt32(pEJMPFBLINI, tag); - bitField0_ |= 0x00000020; + case 96: { + // lightenSectionList [packed=false] + tag = input.readRepeatedUInt32(lightenSectionList, tag); + bitField0_ |= 0x00000010; break; } } @@ -991,32 +907,29 @@ public final class GetSceneMapInfoScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.entryId, entryId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeBool(FieldNames.dBHFEKHNIIH, dBHFEKHNIIH); + output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedUInt32(FieldNames.pLHHEJPGCNP, pLHHEJPGCNP); + output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedUInt32(FieldNames.pEJMPFBLINI, pEJMPFBLINI); - } - if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); - } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000080) != 0) { output.writeRepeatedMessage(FieldNames.mapList, mapList); } + if ((bitField0_ & 0x00000100) != 0) { + output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); + } output.endObject(); } @@ -1038,11 +951,11 @@ public final class GetSceneMapInfoScRspOuterClass { } 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_ |= 0x00000002; } } else { @@ -1050,11 +963,11 @@ public final class GetSceneMapInfoScRspOuterClass { } 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_ |= 0x00000004; } } else { @@ -1062,10 +975,11 @@ public final class GetSceneMapInfoScRspOuterClass { } break; } - case 1755627008: { - if (input.isAtField(FieldNames.dBHFEKHNIIH)) { + case 856936684: + case -10753834: { + if (input.isAtField(FieldNames.unlockedTeleportList)) { if (!input.trySkipNullValue()) { - dBHFEKHNIIH = input.readBool(); + input.readRepeatedUInt32(unlockedTeleportList); bitField0_ |= 0x00000008; } } else { @@ -1073,10 +987,11 @@ public final class GetSceneMapInfoScRspOuterClass { } break; } - case -1128889619: { - if (input.isAtField(FieldNames.pLHHEJPGCNP)) { + case -1942343836: + case 1328850360: { + if (input.isAtField(FieldNames.lightenSectionList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(pLHHEJPGCNP); + input.readRepeatedUInt32(lightenSectionList); bitField0_ |= 0x00000010; } } else { @@ -1084,35 +999,12 @@ public final class GetSceneMapInfoScRspOuterClass { } break; } - case 2096195084: { - if (input.isAtField(FieldNames.pEJMPFBLINI)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(pEJMPFBLINI); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } case 1676123008: case 1875839866: { if (input.isAtField(FieldNames.mazePropList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(mazePropList); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } - case -317054274: - case 407435998: { - if (input.isAtField(FieldNames.mazeGroupList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(mazeGroupList); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -1124,7 +1016,7 @@ public final class GetSceneMapInfoScRspOuterClass { if (input.isAtField(FieldNames.unlockedChestList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(unlockedChestList); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -1136,7 +1028,19 @@ public final class GetSceneMapInfoScRspOuterClass { if (input.isAtField(FieldNames.mapList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(mapList); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; + } + } else { + input.skipUnknownField(); + } + break; + } + case -317054274: + case 407435998: { + if (input.isAtField(FieldNames.mazeGroupList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(mazeGroupList); + bitField0_ |= 0x00000100; } } else { input.skipUnknownField(); @@ -1198,23 +1102,21 @@ public final class GetSceneMapInfoScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id"); - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - static final FieldName dBHFEKHNIIH = FieldName.forField("DBHFEKHNIIH"); + static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id"); - static final FieldName pLHHEJPGCNP = FieldName.forField("PLHHEJPGCNP"); + static final FieldName unlockedTeleportList = FieldName.forField("unlockedTeleportList", "unlocked_teleport_list"); - static final FieldName pEJMPFBLINI = FieldName.forField("PEJMPFBLINI"); + static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); static final FieldName mazePropList = FieldName.forField("mazePropList", "maze_prop_list"); - static final FieldName mazeGroupList = FieldName.forField("mazeGroupList", "maze_group_list"); - static final FieldName unlockedChestList = FieldName.forField("unlockedChestList", "unlocked_chest_list"); 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 2394832..ad0df6e 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 = 7; + * optional uint32 shop_type = 10; */ private int shopType; @@ -34,7 +34,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 7; + * optional uint32 shop_type = 10; * @return whether the shopType field is set */ public boolean hasShopType() { @@ -42,7 +42,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 7; + * optional uint32 shop_type = 10; * @return this */ public GetShopListCsReq clearShopType() { @@ -52,7 +52,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 7; + * optional uint32 shop_type = 10; * @return the shopType */ public int getShopType() { @@ -60,7 +60,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 7; + * optional uint32 shop_type = 10; * @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) 56); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(shopType); } } @@ -150,7 +150,7 @@ public final class GetShopListCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 80: { // 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 c6b759a..8181405 100644 --- a/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java @@ -20,17 +20,17 @@ public final class GetShopListScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional uint32 shop_type = 14; + * optional uint32 shop_type = 3; */ private int shopType; /** - * repeated .Shop shop_list = 6; + * repeated .Shop shop_list = 9; */ private final RepeatedMessage shopList = RepeatedMessage.newEmptyInstance(ShopOuterClass.Shop.getFactory()); @@ -45,7 +45,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 1; * @return this */ public GetShopListScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 shop_type = 14; + * optional uint32 shop_type = 3; * @return whether the shopType field is set */ public boolean hasShopType() { @@ -90,7 +90,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 shop_type = 14; + * optional uint32 shop_type = 3; * @return this */ public GetShopListScRsp clearShopType() { @@ -100,7 +100,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 shop_type = 14; + * optional uint32 shop_type = 3; * @return the shopType */ public int getShopType() { @@ -108,7 +108,7 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 shop_type = 14; + * optional uint32 shop_type = 3; * @param value the shopType to set * @return this */ @@ -119,7 +119,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 6; + * repeated .Shop shop_list = 9; * @return whether the shopList field is set */ public boolean hasShopList() { @@ -127,7 +127,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 6; + * repeated .Shop shop_list = 9; * @return this */ public GetShopListScRsp clearShopList() { @@ -137,7 +137,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 6; + * repeated .Shop shop_list = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 6; + * repeated .Shop shop_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 6; + * repeated .Shop shop_list = 9; * @param value the shopList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 6; + * repeated .Shop shop_list = 9; * @param values the shopList to add * @return this */ @@ -258,16 +258,16 @@ public final class GetShopListScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(shopType); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < shopList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 74); output.writeMessageNoTag(shopList.get(i)); } } @@ -295,25 +295,25 @@ public final class GetShopListScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 24) { break; } } - case 112: { + case 24: { // shopType shopType = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 50) { + if (tag != 74) { break; } } - case 50: { + case 74: { // shopList tag = input.readRepeatedMessage(shopList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java b/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java index 1c6c770..c40e56a 100644 --- a/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java @@ -19,30 +19,30 @@ public final class GoodsOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 end_time = 7; + * optional sint64 end_time = 2; */ private long endTime; /** - * optional int64 begin_time = 12; + * optional sint64 begin_time = 9; */ private long beginTime; /** - * optional uint32 goods_id = 5; + * optional uint32 buy_times = 3; + */ + private int buyTimes; + + /** + * optional uint32 goods_id = 13; */ private int goodsId; /** - * optional uint32 item_id = 10; + * optional uint32 item_id = 14; */ private int itemId; - /** - * optional uint32 buy_times = 14; - */ - private int buyTimes; - private Goods() { } @@ -54,7 +54,7 @@ public final class GoodsOuterClass { } /** - * optional int64 end_time = 7; + * optional sint64 end_time = 2; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -62,7 +62,7 @@ public final class GoodsOuterClass { } /** - * optional int64 end_time = 7; + * optional sint64 end_time = 2; * @return this */ public Goods clearEndTime() { @@ -72,7 +72,7 @@ public final class GoodsOuterClass { } /** - * optional int64 end_time = 7; + * optional sint64 end_time = 2; * @return the endTime */ public long getEndTime() { @@ -80,7 +80,7 @@ public final class GoodsOuterClass { } /** - * optional int64 end_time = 7; + * optional sint64 end_time = 2; * @param value the endTime to set * @return this */ @@ -91,7 +91,7 @@ public final class GoodsOuterClass { } /** - * optional int64 begin_time = 12; + * optional sint64 begin_time = 9; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -99,7 +99,7 @@ public final class GoodsOuterClass { } /** - * optional int64 begin_time = 12; + * optional sint64 begin_time = 9; * @return this */ public Goods clearBeginTime() { @@ -109,7 +109,7 @@ public final class GoodsOuterClass { } /** - * optional int64 begin_time = 12; + * optional sint64 begin_time = 9; * @return the beginTime */ public long getBeginTime() { @@ -117,7 +117,7 @@ public final class GoodsOuterClass { } /** - * optional int64 begin_time = 12; + * optional sint64 begin_time = 9; * @param value the beginTime to set * @return this */ @@ -128,99 +128,25 @@ public final class GoodsOuterClass { } /** - * optional uint32 goods_id = 5; - * @return whether the goodsId field is set + * optional uint32 buy_times = 3; + * @return whether the buyTimes field is set */ - public boolean hasGoodsId() { + public boolean hasBuyTimes() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 goods_id = 5; - * @return this - */ - public Goods clearGoodsId() { - bitField0_ &= ~0x00000004; - goodsId = 0; - return this; - } - - /** - * optional uint32 goods_id = 5; - * @return the goodsId - */ - public int getGoodsId() { - return goodsId; - } - - /** - * optional uint32 goods_id = 5; - * @param value the goodsId to set - * @return this - */ - public Goods setGoodsId(final int value) { - bitField0_ |= 0x00000004; - goodsId = value; - return this; - } - - /** - * optional uint32 item_id = 10; - * @return whether the itemId field is set - */ - public boolean hasItemId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 item_id = 10; - * @return this - */ - public Goods clearItemId() { - bitField0_ &= ~0x00000008; - itemId = 0; - return this; - } - - /** - * optional uint32 item_id = 10; - * @return the itemId - */ - public int getItemId() { - return itemId; - } - - /** - * optional uint32 item_id = 10; - * @param value the itemId to set - * @return this - */ - public Goods setItemId(final int value) { - bitField0_ |= 0x00000008; - itemId = value; - return this; - } - - /** - * optional uint32 buy_times = 14; - * @return whether the buyTimes field is set - */ - public boolean hasBuyTimes() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 buy_times = 14; + * optional uint32 buy_times = 3; * @return this */ public Goods clearBuyTimes() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; buyTimes = 0; return this; } /** - * optional uint32 buy_times = 14; + * optional uint32 buy_times = 3; * @return the buyTimes */ public int getBuyTimes() { @@ -228,16 +154,90 @@ public final class GoodsOuterClass { } /** - * optional uint32 buy_times = 14; + * optional uint32 buy_times = 3; * @param value the buyTimes to set * @return this */ public Goods setBuyTimes(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; buyTimes = value; return this; } + /** + * optional uint32 goods_id = 13; + * @return whether the goodsId field is set + */ + public boolean hasGoodsId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 goods_id = 13; + * @return this + */ + public Goods clearGoodsId() { + bitField0_ &= ~0x00000008; + goodsId = 0; + return this; + } + + /** + * optional uint32 goods_id = 13; + * @return the goodsId + */ + public int getGoodsId() { + return goodsId; + } + + /** + * optional uint32 goods_id = 13; + * @param value the goodsId to set + * @return this + */ + public Goods setGoodsId(final int value) { + bitField0_ |= 0x00000008; + goodsId = value; + return this; + } + + /** + * optional uint32 item_id = 14; + * @return whether the itemId field is set + */ + public boolean hasItemId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 item_id = 14; + * @return this + */ + public Goods clearItemId() { + bitField0_ &= ~0x00000010; + itemId = 0; + return this; + } + + /** + * optional uint32 item_id = 14; + * @return the itemId + */ + public int getItemId() { + return itemId; + } + + /** + * optional uint32 item_id = 14; + * @param value the itemId to set + * @return this + */ + public Goods setItemId(final int value) { + bitField0_ |= 0x00000010; + itemId = value; + return this; + } + @Override public Goods copyFrom(final Goods other) { cachedSize = other.cachedSize; @@ -245,9 +245,9 @@ public final class GoodsOuterClass { bitField0_ = other.bitField0_; endTime = other.endTime; beginTime = other.beginTime; + buyTimes = other.buyTimes; goodsId = other.goodsId; itemId = other.itemId; - buyTimes = other.buyTimes; } return this; } @@ -264,15 +264,15 @@ public final class GoodsOuterClass { if (other.hasBeginTime()) { setBeginTime(other.beginTime); } + if (other.hasBuyTimes()) { + setBuyTimes(other.buyTimes); + } if (other.hasGoodsId()) { setGoodsId(other.goodsId); } if (other.hasItemId()) { setItemId(other.itemId); } - if (other.hasBuyTimes()) { - setBuyTimes(other.buyTimes); - } return this; } @@ -285,9 +285,9 @@ public final class GoodsOuterClass { bitField0_ = 0; endTime = 0L; beginTime = 0L; + buyTimes = 0; goodsId = 0; itemId = 0; - buyTimes = 0; return this; } @@ -313,32 +313,32 @@ public final class GoodsOuterClass { return bitField0_ == other.bitField0_ && (!hasEndTime() || endTime == other.endTime) && (!hasBeginTime() || beginTime == other.beginTime) + && (!hasBuyTimes() || buyTimes == other.buyTimes) && (!hasGoodsId() || goodsId == other.goodsId) - && (!hasItemId() || itemId == other.itemId) - && (!hasBuyTimes() || buyTimes == other.buyTimes); + && (!hasItemId() || itemId == other.itemId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeInt64NoTag(endTime); + output.writeRawByte((byte) 16); + output.writeSInt64NoTag(endTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeInt64NoTag(beginTime); + output.writeRawByte((byte) 72); + output.writeSInt64NoTag(beginTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(goodsId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(buyTimes); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(itemId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(goodsId); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(buyTimes); + output.writeUInt32NoTag(itemId); } } @@ -346,19 +346,19 @@ public final class GoodsOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); + size += 1 + ProtoSink.computeSInt64SizeNoTag(endTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); + size += 1 + ProtoSink.computeSInt64SizeNoTag(beginTime); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buyTimes); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(buyTimes); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } return size; } @@ -370,36 +370,36 @@ public final class GoodsOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 16: { // endTime - endTime = input.readInt64(); + endTime = input.readSInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 72) { break; } } - case 96: { + case 72: { // beginTime - beginTime = input.readInt64(); + beginTime = input.readSInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 24) { break; } } - case 40: { - // goodsId - goodsId = input.readUInt32(); + case 24: { + // buyTimes + buyTimes = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 80) { + if (tag != 104) { break; } } - case 80: { - // itemId - itemId = input.readUInt32(); + case 104: { + // goodsId + goodsId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 112) { @@ -407,8 +407,8 @@ public final class GoodsOuterClass { } } case 112: { - // buyTimes - buyTimes = input.readUInt32(); + // itemId + itemId = 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.endTime, endTime); + output.writeSInt64(FieldNames.endTime, endTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeInt64(FieldNames.beginTime, beginTime); + output.writeSInt64(FieldNames.beginTime, beginTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.goodsId, goodsId); + output.writeUInt32(FieldNames.buyTimes, buyTimes); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.goodsId, goodsId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.buyTimes, buyTimes); + output.writeUInt32(FieldNames.itemId, itemId); } output.endObject(); } @@ -461,7 +461,7 @@ public final class GoodsOuterClass { case 1725551537: { if (input.isAtField(FieldNames.endTime)) { if (!input.trySkipNullValue()) { - endTime = input.readInt64(); + endTime = input.readSInt64(); bitField0_ |= 0x00000001; } } else { @@ -473,7 +473,7 @@ public final class GoodsOuterClass { case 1112183971: { if (input.isAtField(FieldNames.beginTime)) { if (!input.trySkipNullValue()) { - beginTime = input.readInt64(); + beginTime = input.readSInt64(); bitField0_ |= 0x00000002; } } else { @@ -481,35 +481,35 @@ public final class GoodsOuterClass { } break; } - case 207037201: - case 2123207332: { - if (input.isAtField(FieldNames.goodsId)) { - if (!input.trySkipNullValue()) { - goodsId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1178662002: - case 2116204999: { - if (input.isAtField(FieldNames.itemId)) { - if (!input.trySkipNullValue()) { - itemId = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case -994591648: case -442602419: { if (input.isAtField(FieldNames.buyTimes)) { if (!input.trySkipNullValue()) { buyTimes = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 207037201: + case 2123207332: { + if (input.isAtField(FieldNames.goodsId)) { + if (!input.trySkipNullValue()) { + goodsId = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1178662002: + case 2116204999: { + if (input.isAtField(FieldNames.itemId)) { + if (!input.trySkipNullValue()) { + itemId = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -573,11 +573,11 @@ public final class GoodsOuterClass { static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); + static final FieldName buyTimes = FieldName.forField("buyTimes", "buy_times"); + static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); static final FieldName itemId = FieldName.forField("itemId", "item_id"); - - static final FieldName buyTimes = FieldName.forField("buyTimes", "buy_times"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java b/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java index fc48c20..be2a6b8 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 = 9; + * optional uint32 id = 4; */ private int id; @@ -34,7 +34,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 9; + * optional uint32 id = 4; * @return whether the id field is set */ public boolean hasId() { @@ -42,7 +42,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 9; + * optional uint32 id = 4; * @return this */ public HeadIcon clearId() { @@ -52,7 +52,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 9; + * optional uint32 id = 4; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 9; + * optional uint32 id = 4; * @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) 72); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public final class HeadIconOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 32: { // 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 1fc72aa..f00175d 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 = 14; + * optional uint32 rank = 7; */ private int rank; @@ -30,7 +30,7 @@ public final class HeroBasicTypeInfoOuterClass { private int basicType; /** - * repeated .AvatarSkillTree skill_tree_list = 15; + * repeated .AvatarSkillTree skill_tree_list = 5; */ private final RepeatedMessage skillTreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); @@ -45,7 +45,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional uint32 rank = 14; + * optional uint32 rank = 7; * @return whether the rank field is set */ public boolean hasRank() { @@ -53,7 +53,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional uint32 rank = 14; + * optional uint32 rank = 7; * @return this */ public HeroBasicTypeInfo clearRank() { @@ -63,7 +63,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional uint32 rank = 14; + * optional uint32 rank = 7; * @return the rank */ public int getRank() { @@ -71,7 +71,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional uint32 rank = 14; + * optional uint32 rank = 7; * @param value the rank to set * @return this */ @@ -144,7 +144,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 15; + * repeated .AvatarSkillTree skill_tree_list = 5; * @return whether the skillTreeList field is set */ public boolean hasSkillTreeList() { @@ -152,7 +152,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 15; + * repeated .AvatarSkillTree skill_tree_list = 5; * @return this */ public HeroBasicTypeInfo clearSkillTreeList() { @@ -162,7 +162,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 15; + * repeated .AvatarSkillTree skill_tree_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. @@ -176,7 +176,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 15; + * repeated .AvatarSkillTree skill_tree_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 @@ -190,7 +190,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 15; + * repeated .AvatarSkillTree skill_tree_list = 5; * @param value the skillTreeList to add * @return this */ @@ -202,7 +202,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 15; + * repeated .AvatarSkillTree skill_tree_list = 5; * @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) 112); + output.writeRawByte((byte) 56); 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) 122); + output.writeRawByte((byte) 42); output.writeMessageNoTag(skillTreeList.get(i)); } } @@ -322,7 +322,7 @@ public final class HeroBasicTypeInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 56: { // rank rank = input.readUInt32(); bitField0_ |= 0x00000001; @@ -339,11 +339,11 @@ public final class HeroBasicTypeInfoOuterClass { bitField0_ |= 0x00000002; } tag = input.readTag(); - if (tag != 122) { + if (tag != 42) { break; } } - case 122: { + case 42: { // skillTreeList tag = input.readRepeatedMessage(skillTreeList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java index 5187839..fc46dac 100644 --- a/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java @@ -19,15 +19,10 @@ public final class InteractPropCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 prop_entity_id = 6; + * optional uint32 prop_entity_id = 13; */ private int propEntityId; - /** - * optional uint32 CMCDABPKPGB = 12; - */ - private int cMCDABPKPGB; - private InteractPropCsReq() { } @@ -39,7 +34,7 @@ public final class InteractPropCsReqOuterClass { } /** - * optional uint32 prop_entity_id = 6; + * optional uint32 prop_entity_id = 13; * @return whether the propEntityId field is set */ public boolean hasPropEntityId() { @@ -47,7 +42,7 @@ public final class InteractPropCsReqOuterClass { } /** - * optional uint32 prop_entity_id = 6; + * optional uint32 prop_entity_id = 13; * @return this */ public InteractPropCsReq clearPropEntityId() { @@ -57,7 +52,7 @@ public final class InteractPropCsReqOuterClass { } /** - * optional uint32 prop_entity_id = 6; + * optional uint32 prop_entity_id = 13; * @return the propEntityId */ public int getPropEntityId() { @@ -65,7 +60,7 @@ public final class InteractPropCsReqOuterClass { } /** - * optional uint32 prop_entity_id = 6; + * optional uint32 prop_entity_id = 13; * @param value the propEntityId to set * @return this */ @@ -75,50 +70,12 @@ public final class InteractPropCsReqOuterClass { return this; } - /** - * optional uint32 CMCDABPKPGB = 12; - * @return whether the cMCDABPKPGB field is set - */ - public boolean hasCMCDABPKPGB() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 CMCDABPKPGB = 12; - * @return this - */ - public InteractPropCsReq clearCMCDABPKPGB() { - bitField0_ &= ~0x00000002; - cMCDABPKPGB = 0; - return this; - } - - /** - * optional uint32 CMCDABPKPGB = 12; - * @return the cMCDABPKPGB - */ - public int getCMCDABPKPGB() { - return cMCDABPKPGB; - } - - /** - * optional uint32 CMCDABPKPGB = 12; - * @param value the cMCDABPKPGB to set - * @return this - */ - public InteractPropCsReq setCMCDABPKPGB(final int value) { - bitField0_ |= 0x00000002; - cMCDABPKPGB = value; - return this; - } - @Override public InteractPropCsReq copyFrom(final InteractPropCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; propEntityId = other.propEntityId; - cMCDABPKPGB = other.cMCDABPKPGB; } return this; } @@ -132,9 +89,6 @@ public final class InteractPropCsReqOuterClass { if (other.hasPropEntityId()) { setPropEntityId(other.propEntityId); } - if (other.hasCMCDABPKPGB()) { - setCMCDABPKPGB(other.cMCDABPKPGB); - } return this; } @@ -146,7 +100,6 @@ public final class InteractPropCsReqOuterClass { cachedSize = -1; bitField0_ = 0; propEntityId = 0; - cMCDABPKPGB = 0; return this; } @@ -170,20 +123,15 @@ public final class InteractPropCsReqOuterClass { } InteractPropCsReq other = (InteractPropCsReq) o; return bitField0_ == other.bitField0_ - && (!hasPropEntityId() || propEntityId == other.propEntityId) - && (!hasCMCDABPKPGB() || cMCDABPKPGB == other.cMCDABPKPGB); + && (!hasPropEntityId() || propEntityId == other.propEntityId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(propEntityId); } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(cMCDABPKPGB); - } } @Override @@ -192,9 +140,6 @@ public final class InteractPropCsReqOuterClass { if ((bitField0_ & 0x00000001) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cMCDABPKPGB); - } return size; } @@ -205,20 +150,11 @@ public final class InteractPropCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 104: { // propEntityId propEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // cMCDABPKPGB - cMCDABPKPGB = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 0) { break; } @@ -243,9 +179,6 @@ public final class InteractPropCsReqOuterClass { if ((bitField0_ & 0x00000001) != 0) { output.writeUInt32(FieldNames.propEntityId, propEntityId); } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.cMCDABPKPGB, cMCDABPKPGB); - } output.endObject(); } @@ -268,17 +201,6 @@ public final class InteractPropCsReqOuterClass { } break; } - case -1152757468: { - if (input.isAtField(FieldNames.cMCDABPKPGB)) { - if (!input.trySkipNullValue()) { - cMCDABPKPGB = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } default: { input.skipUnknownField(); break; @@ -333,8 +255,6 @@ public final class InteractPropCsReqOuterClass { */ static class FieldNames { static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); - - static final FieldName cMCDABPKPGB = FieldName.forField("CMCDABPKPGB"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java index a4b3eb0..9571d8f 100644 --- a/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java @@ -19,17 +19,17 @@ public final class InteractPropScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 prop_entity_id = 1; + * optional uint32 prop_entity_id = 3; */ private int propEntityId; /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional uint32 prop_state = 3; + * optional uint32 prop_state = 12; */ private int propState; @@ -44,7 +44,7 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 prop_entity_id = 1; + * optional uint32 prop_entity_id = 3; * @return whether the propEntityId field is set */ public boolean hasPropEntityId() { @@ -52,7 +52,7 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 prop_entity_id = 1; + * optional uint32 prop_entity_id = 3; * @return this */ public InteractPropScRsp clearPropEntityId() { @@ -62,7 +62,7 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 prop_entity_id = 1; + * optional uint32 prop_entity_id = 3; * @return the propEntityId */ public int getPropEntityId() { @@ -70,7 +70,7 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 prop_entity_id = 1; + * optional uint32 prop_entity_id = 3; * @param value the propEntityId to set * @return this */ @@ -81,7 +81,7 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -89,7 +89,7 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 6; * @return this */ public InteractPropScRsp clearRetcode() { @@ -99,7 +99,7 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -107,7 +107,7 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -118,7 +118,7 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 prop_state = 3; + * optional uint32 prop_state = 12; * @return whether the propState field is set */ public boolean hasPropState() { @@ -126,7 +126,7 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 prop_state = 3; + * optional uint32 prop_state = 12; * @return this */ public InteractPropScRsp clearPropState() { @@ -136,7 +136,7 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 prop_state = 3; + * optional uint32 prop_state = 12; * @return the propState */ public int getPropState() { @@ -144,7 +144,7 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 prop_state = 3; + * optional uint32 prop_state = 12; * @param value the propState to set * @return this */ @@ -225,15 +225,15 @@ public final class InteractPropScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(propState); } } @@ -260,25 +260,25 @@ public final class InteractPropScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 24: { // propEntityId propEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 48) { break; } } - case 16: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 24) { + if (tag != 96) { break; } } - case 24: { + case 96: { // propState propState = input.readUInt32(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java index 1c62993..41d4497 100644 --- a/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java @@ -20,7 +20,7 @@ public final class ItemCostListOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .ItemCost item_list = 11; + * repeated .ItemCost item_list = 1; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory()); @@ -35,7 +35,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 11; + * repeated .ItemCost item_list = 1; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -43,7 +43,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 11; + * repeated .ItemCost item_list = 1; * @return this */ public ItemCostList clearItemList() { @@ -53,7 +53,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 11; + * repeated .ItemCost 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. @@ -67,7 +67,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 11; + * repeated .ItemCost 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 @@ -81,7 +81,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 11; + * repeated .ItemCost item_list = 1; * @param value the itemList to add * @return this */ @@ -92,7 +92,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 11; + * repeated .ItemCost item_list = 1; * @param values the itemList to add * @return this */ @@ -163,7 +163,7 @@ public final class ItemCostListOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 10); output.writeMessageNoTag(itemList.get(i)); } } @@ -185,7 +185,7 @@ public final class ItemCostListOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 90: { + case 10: { // 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 276f528..3f7831d 100644 --- a/src/generated/main/emu/lunarcore/proto/ItemCostOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ItemCostOuterClass.java @@ -19,7 +19,7 @@ public final class ItemCostOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 relic_unique_id = 5; + * optional uint32 relic_unique_id = 7; */ private int relicUniqueId; @@ -29,7 +29,7 @@ public final class ItemCostOuterClass { private int equipmentUniqueId; /** - * optional .PileItem pile_item = 7; + * optional .PileItem pile_item = 1; */ private final PileItemOuterClass.PileItem pileItem = PileItemOuterClass.PileItem.newInstance(); @@ -78,7 +78,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 relic_unique_id = 5; + * optional uint32 relic_unique_id = 7; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -86,7 +86,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 relic_unique_id = 5; + * optional uint32 relic_unique_id = 7; * @return this */ public ItemCost clearRelicUniqueId() { @@ -96,7 +96,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 relic_unique_id = 5; + * optional uint32 relic_unique_id = 7; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -104,7 +104,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 relic_unique_id = 5; + * optional uint32 relic_unique_id = 7; * @param value the relicUniqueId to set * @return this */ @@ -154,7 +154,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 7; + * optional .PileItem pile_item = 1; * @return whether the pileItem field is set */ public boolean hasPileItem() { @@ -162,7 +162,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 7; + * optional .PileItem pile_item = 1; * @return this */ public ItemCost clearPileItem() { @@ -172,7 +172,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 7; + * optional .PileItem pile_item = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -186,7 +186,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 7; + * optional .PileItem pile_item = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -201,7 +201,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 7; + * optional .PileItem pile_item = 1; * @param value the pileItem to set * @return this */ @@ -284,7 +284,7 @@ public final class ItemCostOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { @@ -292,7 +292,7 @@ public final class ItemCostOuterClass { output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 10); output.writeMessageNoTag(pileItem); } } @@ -319,7 +319,7 @@ public final class ItemCostOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 56: { // relicUniqueId clearItemCaseOtherRelicUniqueId(); relicUniqueId = input.readUInt32(); @@ -335,11 +335,11 @@ public final class ItemCostOuterClass { equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 10) { break; } } - case 58: { + case 10: { // pileItem clearItemCaseOtherPileItem(); input.readMessage(pileItem); diff --git a/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java index 915412f..f6c4d48 100644 --- a/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java @@ -20,7 +20,7 @@ public final class ItemListOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .Item item_list = 5; + * repeated .Item item_list = 15; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemOuterClass.Item.getFactory()); @@ -35,7 +35,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 5; + * repeated .Item item_list = 15; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -43,7 +43,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 5; + * repeated .Item item_list = 15; * @return this */ public ItemList clearItemList() { @@ -53,7 +53,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 5; + * repeated .Item item_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 5; + * repeated .Item item_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 5; + * repeated .Item item_list = 15; * @param value the itemList to add * @return this */ @@ -92,7 +92,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 5; + * repeated .Item item_list = 15; * @param values the itemList to add * @return this */ @@ -163,7 +163,7 @@ public final class ItemListOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 122); output.writeMessageNoTag(itemList.get(i)); } } @@ -185,7 +185,7 @@ public final class ItemListOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 42: { + case 122: { // itemList tag = input.readRepeatedMessage(itemList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java index 40c926e..c4d8763 100644 --- a/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java @@ -19,29 +19,24 @@ public final class ItemOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 unique_id = 2; + * optional uint32 rank = 1; */ - private int uniqueId; + private int rank; /** - * optional uint32 promotion = 6; - */ - private int promotion; - - /** - * optional uint32 main_affix_id = 7; + * optional uint32 main_affix_id = 3; */ private int mainAffixId; /** - * optional uint32 item_id = 8; + * optional uint32 unique_id = 4; */ - private int itemId; + private int uniqueId; /** - * optional uint32 level = 9; + * optional uint32 promotion = 7; */ - private int level; + private int promotion; /** * optional uint32 num = 12; @@ -49,9 +44,14 @@ public final class ItemOuterClass { private int num; /** - * optional uint32 rank = 14; + * optional uint32 level = 13; */ - private int rank; + private int level; + + /** + * optional uint32 item_id = 15; + */ + private int itemId; private Item() { } @@ -64,99 +64,62 @@ public final class ItemOuterClass { } /** - * optional uint32 unique_id = 2; - * @return whether the uniqueId field is set + * optional uint32 rank = 1; + * @return whether the rank field is set */ - public boolean hasUniqueId() { + public boolean hasRank() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 unique_id = 2; + * optional uint32 rank = 1; * @return this */ - public Item clearUniqueId() { + public Item clearRank() { bitField0_ &= ~0x00000001; - uniqueId = 0; + rank = 0; return this; } /** - * optional uint32 unique_id = 2; - * @return the uniqueId + * optional uint32 rank = 1; + * @return the rank */ - public int getUniqueId() { - return uniqueId; + public int getRank() { + return rank; } /** - * optional uint32 unique_id = 2; - * @param value the uniqueId to set + * optional uint32 rank = 1; + * @param value the rank to set * @return this */ - public Item setUniqueId(final int value) { + public Item setRank(final int value) { bitField0_ |= 0x00000001; - uniqueId = value; + rank = value; return this; } /** - * optional uint32 promotion = 6; - * @return whether the promotion field is set + * optional uint32 main_affix_id = 3; + * @return whether the mainAffixId field is set */ - public boolean hasPromotion() { + public boolean hasMainAffixId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 promotion = 6; - * @return this - */ - public Item clearPromotion() { - bitField0_ &= ~0x00000002; - promotion = 0; - return this; - } - - /** - * optional uint32 promotion = 6; - * @return the promotion - */ - public int getPromotion() { - return promotion; - } - - /** - * optional uint32 promotion = 6; - * @param value the promotion to set - * @return this - */ - public Item setPromotion(final int value) { - bitField0_ |= 0x00000002; - promotion = value; - return this; - } - - /** - * optional uint32 main_affix_id = 7; - * @return whether the mainAffixId field is set - */ - public boolean hasMainAffixId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 main_affix_id = 7; + * optional uint32 main_affix_id = 3; * @return this */ public Item clearMainAffixId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; mainAffixId = 0; return this; } /** - * optional uint32 main_affix_id = 7; + * optional uint32 main_affix_id = 3; * @return the mainAffixId */ public int getMainAffixId() { @@ -164,87 +127,87 @@ public final class ItemOuterClass { } /** - * optional uint32 main_affix_id = 7; + * optional uint32 main_affix_id = 3; * @param value the mainAffixId to set * @return this */ public Item setMainAffixId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; mainAffixId = value; return this; } /** - * optional uint32 item_id = 8; - * @return whether the itemId field is set + * optional uint32 unique_id = 4; + * @return whether the uniqueId field is set */ - public boolean hasItemId() { + public boolean hasUniqueId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 unique_id = 4; + * @return this + */ + public Item clearUniqueId() { + bitField0_ &= ~0x00000004; + uniqueId = 0; + return this; + } + + /** + * optional uint32 unique_id = 4; + * @return the uniqueId + */ + public int getUniqueId() { + return uniqueId; + } + + /** + * optional uint32 unique_id = 4; + * @param value the uniqueId to set + * @return this + */ + public Item setUniqueId(final int value) { + bitField0_ |= 0x00000004; + uniqueId = value; + return this; + } + + /** + * optional uint32 promotion = 7; + * @return whether the promotion field is set + */ + public boolean hasPromotion() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 item_id = 8; + * optional uint32 promotion = 7; * @return this */ - public Item clearItemId() { + public Item clearPromotion() { bitField0_ &= ~0x00000008; - itemId = 0; + promotion = 0; return this; } /** - * optional uint32 item_id = 8; - * @return the itemId + * optional uint32 promotion = 7; + * @return the promotion */ - public int getItemId() { - return itemId; + public int getPromotion() { + return promotion; } /** - * optional uint32 item_id = 8; - * @param value the itemId to set + * optional uint32 promotion = 7; + * @param value the promotion to set * @return this */ - public Item setItemId(final int value) { + public Item setPromotion(final int value) { bitField0_ |= 0x00000008; - itemId = value; - return this; - } - - /** - * optional uint32 level = 9; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 level = 9; - * @return this - */ - public Item clearLevel() { - bitField0_ &= ~0x00000010; - level = 0; - return this; - } - - /** - * optional uint32 level = 9; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 9; - * @param value the level to set - * @return this - */ - public Item setLevel(final int value) { - bitField0_ |= 0x00000010; - level = value; + promotion = value; return this; } @@ -253,7 +216,7 @@ public final class ItemOuterClass { * @return whether the num field is set */ public boolean hasNum() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000010) != 0; } /** @@ -261,7 +224,7 @@ public final class ItemOuterClass { * @return this */ public Item clearNum() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; num = 0; return this; } @@ -280,45 +243,82 @@ public final class ItemOuterClass { * @return this */ public Item setNum(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; num = value; return this; } /** - * optional uint32 rank = 14; - * @return whether the rank field is set + * optional uint32 level = 13; + * @return whether the level field is set */ - public boolean hasRank() { - return (bitField0_ & 0x00000040) != 0; + public boolean hasLevel() { + return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 rank = 14; + * optional uint32 level = 13; * @return this */ - public Item clearRank() { - bitField0_ &= ~0x00000040; - rank = 0; + public Item clearLevel() { + bitField0_ &= ~0x00000020; + level = 0; return this; } /** - * optional uint32 rank = 14; - * @return the rank + * optional uint32 level = 13; + * @return the level */ - public int getRank() { - return rank; + public int getLevel() { + return level; } /** - * optional uint32 rank = 14; - * @param value the rank to set + * optional uint32 level = 13; + * @param value the level to set * @return this */ - public Item setRank(final int value) { + public Item setLevel(final int value) { + bitField0_ |= 0x00000020; + level = value; + return this; + } + + /** + * optional uint32 item_id = 15; + * @return whether the itemId field is set + */ + public boolean hasItemId() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional uint32 item_id = 15; + * @return this + */ + public Item clearItemId() { + bitField0_ &= ~0x00000040; + itemId = 0; + return this; + } + + /** + * optional uint32 item_id = 15; + * @return the itemId + */ + public int getItemId() { + return itemId; + } + + /** + * optional uint32 item_id = 15; + * @param value the itemId to set + * @return this + */ + public Item setItemId(final int value) { bitField0_ |= 0x00000040; - rank = value; + itemId = value; return this; } @@ -327,13 +327,13 @@ public final class ItemOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + rank = other.rank; + mainAffixId = other.mainAffixId; uniqueId = other.uniqueId; promotion = other.promotion; - mainAffixId = other.mainAffixId; - itemId = other.itemId; - level = other.level; num = other.num; - rank = other.rank; + level = other.level; + itemId = other.itemId; } return this; } @@ -344,26 +344,26 @@ public final class ItemOuterClass { return this; } cachedSize = -1; + if (other.hasRank()) { + setRank(other.rank); + } + if (other.hasMainAffixId()) { + setMainAffixId(other.mainAffixId); + } if (other.hasUniqueId()) { setUniqueId(other.uniqueId); } if (other.hasPromotion()) { setPromotion(other.promotion); } - if (other.hasMainAffixId()) { - setMainAffixId(other.mainAffixId); - } - if (other.hasItemId()) { - setItemId(other.itemId); + if (other.hasNum()) { + setNum(other.num); } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasNum()) { - setNum(other.num); - } - if (other.hasRank()) { - setRank(other.rank); + if (other.hasItemId()) { + setItemId(other.itemId); } return this; } @@ -375,13 +375,13 @@ public final class ItemOuterClass { } cachedSize = -1; bitField0_ = 0; + rank = 0; + mainAffixId = 0; uniqueId = 0; promotion = 0; - mainAffixId = 0; - itemId = 0; - level = 0; num = 0; - rank = 0; + level = 0; + itemId = 0; return this; } @@ -405,44 +405,44 @@ public final class ItemOuterClass { } Item other = (Item) o; return bitField0_ == other.bitField0_ + && (!hasRank() || rank == other.rank) + && (!hasMainAffixId() || mainAffixId == other.mainAffixId) && (!hasUniqueId() || uniqueId == other.uniqueId) && (!hasPromotion() || promotion == other.promotion) - && (!hasMainAffixId() || mainAffixId == other.mainAffixId) - && (!hasItemId() || itemId == other.itemId) - && (!hasLevel() || level == other.level) && (!hasNum() || num == other.num) - && (!hasRank() || rank == other.rank); + && (!hasLevel() || level == other.level) + && (!hasItemId() || itemId == other.itemId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(uniqueId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(promotion); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(mainAffixId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(uniqueId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(itemId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 96); output.writeUInt32NoTag(num); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(level); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(rank); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(itemId); } } @@ -450,25 +450,25 @@ public final class ItemOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); + } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(num); } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } return size; } @@ -480,47 +480,38 @@ public final class ItemOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // uniqueId - uniqueId = input.readUInt32(); + case 8: { + // rank + rank = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 24) { break; } } - case 48: { - // promotion - promotion = input.readUInt32(); + case 24: { + // mainAffixId + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // uniqueId + uniqueId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 56) { break; } } case 56: { - // mainAffixId - mainAffixId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { - // itemId - itemId = input.readUInt32(); + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); if (tag != 96) { break; } @@ -528,15 +519,24 @@ public final class ItemOuterClass { case 96: { // num num = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { - // rank - rank = input.readUInt32(); + case 104: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // itemId + itemId = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 0) { @@ -561,25 +561,25 @@ public final class ItemOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.uniqueId, uniqueId); + output.writeUInt32(FieldNames.rank, rank); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.mainAffixId, mainAffixId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.uniqueId, uniqueId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.promotion, promotion); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.num, num); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.level, level); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.rank, rank); + output.writeUInt32(FieldNames.itemId, itemId); } output.endObject(); } @@ -591,11 +591,10 @@ public final class ItemOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -603,22 +602,23 @@ public final class ItemOuterClass { } break; } - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { - if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -1973876974: case -1426712144: { if (input.isAtField(FieldNames.mainAffixId)) { if (!input.trySkipNullValue()) { mainAffixId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -294460212: + case -538310583: { + if (input.isAtField(FieldNames.uniqueId)) { + if (!input.trySkipNullValue()) { + uniqueId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -626,44 +626,44 @@ public final class ItemOuterClass { } break; } + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { + if (!input.trySkipNullValue()) { + promotion = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 109446: { + if (input.isAtField(FieldNames.num)) { + if (!input.trySkipNullValue()) { + num = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } case -1178662002: case 2116204999: { if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { itemId = 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 109446: { - if (input.isAtField(FieldNames.num)) { - if (!input.trySkipNullValue()) { - num = input.readUInt32(); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } - case 3492908: { - if (input.isAtField(FieldNames.rank)) { - if (!input.trySkipNullValue()) { - rank = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -723,19 +723,19 @@ public final class ItemOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName rank = FieldName.forField("rank"); + + static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); + static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); static final FieldName promotion = FieldName.forField("promotion"); - static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_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 num = FieldName.forField("num"); - - static final FieldName rank = FieldName.forField("rank"); + static final FieldName itemId = FieldName.forField("itemId", "item_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java index af25fc1..c3fbc07 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 = 3; - */ - private int index; - - /** - * optional uint32 base_avatar_id = 6; + * optional uint32 base_avatar_id = 8; */ private int baseAvatarId; /** - * optional uint32 plane_id = 11; - */ - private int planeId; - - /** - * optional uint32 slot = 13; + * optional uint32 slot = 12; */ private int slot; /** - * optional .AvatarType avatar_type = 2; + * optional uint32 index = 13; */ - private int avatarType; + private int index; /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional uint32 plane_id = 14; + */ + private int planeId; + + /** + * optional .ExtraLineupType extra_lineup_type = 9; */ private int extraLineupType; /** - * optional bool is_virtual = 9; + * optional .AvatarType avatar_type = 15; + */ + private int avatarType; + + /** + * optional bool is_virtual = 10; */ private boolean isVirtual; @@ -64,62 +64,25 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 index = 3; - * @return whether the index field is set + * optional uint32 base_avatar_id = 8; + * @return whether the baseAvatarId field is set */ - public boolean hasIndex() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 index = 3; - * @return this - */ - public JoinLineupCsReq clearIndex() { - bitField0_ &= ~0x00000001; - index = 0; - return this; - } - - /** - * optional uint32 index = 3; - * @return the index - */ - public int getIndex() { - return index; - } - - /** - * optional uint32 index = 3; - * @param value the index to set - * @return this - */ - public JoinLineupCsReq setIndex(final int value) { - bitField0_ |= 0x00000001; - index = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 6; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 base_avatar_id = 6; + * optional uint32 base_avatar_id = 8; * @return this */ public JoinLineupCsReq clearBaseAvatarId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; baseAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 6; + * optional uint32 base_avatar_id = 8; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -127,73 +90,36 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 6; + * optional uint32 base_avatar_id = 8; * @param value the baseAvatarId to set * @return this */ public JoinLineupCsReq setBaseAvatarId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; baseAvatarId = value; return this; } /** - * optional uint32 plane_id = 11; - * @return whether the planeId field is set - */ - public boolean hasPlaneId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 plane_id = 11; - * @return this - */ - public JoinLineupCsReq clearPlaneId() { - bitField0_ &= ~0x00000004; - planeId = 0; - return this; - } - - /** - * optional uint32 plane_id = 11; - * @return the planeId - */ - public int getPlaneId() { - return planeId; - } - - /** - * optional uint32 plane_id = 11; - * @param value the planeId to set - * @return this - */ - public JoinLineupCsReq setPlaneId(final int value) { - bitField0_ |= 0x00000004; - planeId = value; - return this; - } - - /** - * optional uint32 slot = 13; + * optional uint32 slot = 12; * @return whether the slot field is set */ public boolean hasSlot() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 slot = 13; + * optional uint32 slot = 12; * @return this */ public JoinLineupCsReq clearSlot() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; slot = 0; return this; } /** - * optional uint32 slot = 13; + * optional uint32 slot = 12; * @return the slot */ public int getSlot() { @@ -201,98 +127,110 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 slot = 13; + * optional uint32 slot = 12; * @param value the slot to set * @return this */ public JoinLineupCsReq setSlot(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; slot = value; return this; } /** - * optional .AvatarType avatar_type = 2; - * @return whether the avatarType field is set + * optional uint32 index = 13; + * @return whether the index field is set */ - public boolean hasAvatarType() { + public boolean hasIndex() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 index = 13; + * @return this + */ + public JoinLineupCsReq clearIndex() { + bitField0_ &= ~0x00000004; + index = 0; + return this; + } + + /** + * optional uint32 index = 13; + * @return the index + */ + public int getIndex() { + return index; + } + + /** + * optional uint32 index = 13; + * @param value the index to set + * @return this + */ + public JoinLineupCsReq setIndex(final int value) { + bitField0_ |= 0x00000004; + index = value; + return this; + } + + /** + * optional uint32 plane_id = 14; + * @return whether the planeId field is set + */ + public boolean hasPlaneId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 plane_id = 14; + * @return this + */ + public JoinLineupCsReq clearPlaneId() { + bitField0_ &= ~0x00000008; + planeId = 0; + return this; + } + + /** + * optional uint32 plane_id = 14; + * @return the planeId + */ + public int getPlaneId() { + return planeId; + } + + /** + * optional uint32 plane_id = 14; + * @param value the planeId to set + * @return this + */ + public JoinLineupCsReq setPlaneId(final int value) { + bitField0_ |= 0x00000008; + planeId = value; + return this; + } + + /** + * optional .ExtraLineupType extra_lineup_type = 9; + * @return whether the extraLineupType field is set + */ + public boolean hasExtraLineupType() { return (bitField0_ & 0x00000010) != 0; } /** - * optional .AvatarType avatar_type = 2; - * @return this - */ - public JoinLineupCsReq clearAvatarType() { - bitField0_ &= ~0x00000010; - avatarType = 0; - return this; - } - - /** - * optional .AvatarType avatar_type = 2; - * @return the avatarType - */ - public AvatarTypeOuterClass.AvatarType getAvatarType() { - return AvatarTypeOuterClass.AvatarType.forNumber(avatarType); - } - - /** - * Gets the value of the internal enum store. The result is - * equivalent to {@link JoinLineupCsReq#getAvatarType()}.getNumber(). - * - * @return numeric wire representation - */ - public int getAvatarTypeValue() { - return avatarType; - } - - /** - * Sets the value of the internal enum store. This does not - * do any validity checks, so be sure to use appropriate value - * constants from {@link AvatarTypeOuterClass.AvatarType}. Setting an invalid value - * can cause {@link JoinLineupCsReq#getAvatarType()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public JoinLineupCsReq setAvatarTypeValue(final int value) { - bitField0_ |= 0x00000010; - avatarType = value; - return this; - } - - /** - * optional .AvatarType avatar_type = 2; - * @param value the avatarType to set - * @return this - */ - public JoinLineupCsReq setAvatarType(final AvatarTypeOuterClass.AvatarType value) { - bitField0_ |= 0x00000010; - avatarType = value.getNumber(); - return this; - } - - /** - * optional .ExtraLineupType extra_lineup_type = 7; - * @return whether the extraLineupType field is set - */ - public boolean hasExtraLineupType() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 9; * @return this */ public JoinLineupCsReq clearExtraLineupType() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; extraLineupType = 0; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 9; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -319,25 +257,87 @@ public final class JoinLineupCsReqOuterClass { * @return this */ public JoinLineupCsReq setExtraLineupTypeValue(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; extraLineupType = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 9; * @param value the extraLineupType to set * @return this */ public JoinLineupCsReq setExtraLineupType( final ExtraLineupTypeOuterClass.ExtraLineupType value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; extraLineupType = value.getNumber(); return this; } /** - * optional bool is_virtual = 9; + * optional .AvatarType avatar_type = 15; + * @return whether the avatarType field is set + */ + public boolean hasAvatarType() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional .AvatarType avatar_type = 15; + * @return this + */ + public JoinLineupCsReq clearAvatarType() { + bitField0_ &= ~0x00000020; + avatarType = 0; + return this; + } + + /** + * optional .AvatarType avatar_type = 15; + * @return the avatarType + */ + public AvatarTypeOuterClass.AvatarType getAvatarType() { + return AvatarTypeOuterClass.AvatarType.forNumber(avatarType); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link JoinLineupCsReq#getAvatarType()}.getNumber(). + * + * @return numeric wire representation + */ + public int getAvatarTypeValue() { + return avatarType; + } + + /** + * Sets the value of the internal enum store. This does not + * do any validity checks, so be sure to use appropriate value + * constants from {@link AvatarTypeOuterClass.AvatarType}. Setting an invalid value + * can cause {@link JoinLineupCsReq#getAvatarType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public JoinLineupCsReq setAvatarTypeValue(final int value) { + bitField0_ |= 0x00000020; + avatarType = value; + return this; + } + + /** + * optional .AvatarType avatar_type = 15; + * @param value the avatarType to set + * @return this + */ + public JoinLineupCsReq setAvatarType(final AvatarTypeOuterClass.AvatarType value) { + bitField0_ |= 0x00000020; + avatarType = value.getNumber(); + return this; + } + + /** + * optional bool is_virtual = 10; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -345,7 +345,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional bool is_virtual = 9; + * optional bool is_virtual = 10; * @return this */ public JoinLineupCsReq clearIsVirtual() { @@ -355,7 +355,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional bool is_virtual = 9; + * optional bool is_virtual = 10; * @return the isVirtual */ public boolean getIsVirtual() { @@ -363,7 +363,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional bool is_virtual = 9; + * optional bool is_virtual = 10; * @param value the isVirtual to set * @return this */ @@ -378,12 +378,12 @@ public final class JoinLineupCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - index = other.index; baseAvatarId = other.baseAvatarId; - planeId = other.planeId; slot = other.slot; - avatarType = other.avatarType; + index = other.index; + planeId = other.planeId; extraLineupType = other.extraLineupType; + avatarType = other.avatarType; isVirtual = other.isVirtual; } return this; @@ -395,24 +395,24 @@ public final class JoinLineupCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasIndex()) { - setIndex(other.index); - } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } - if (other.hasPlaneId()) { - setPlaneId(other.planeId); - } if (other.hasSlot()) { setSlot(other.slot); } - if (other.hasAvatarType()) { - setAvatarTypeValue(other.avatarType); + if (other.hasIndex()) { + setIndex(other.index); + } + if (other.hasPlaneId()) { + setPlaneId(other.planeId); } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); } + if (other.hasAvatarType()) { + setAvatarTypeValue(other.avatarType); + } if (other.hasIsVirtual()) { setIsVirtual(other.isVirtual); } @@ -426,12 +426,12 @@ public final class JoinLineupCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - index = 0; baseAvatarId = 0; - planeId = 0; slot = 0; - avatarType = 0; + index = 0; + planeId = 0; extraLineupType = 0; + avatarType = 0; isVirtual = false; return this; } @@ -456,43 +456,43 @@ public final class JoinLineupCsReqOuterClass { } JoinLineupCsReq other = (JoinLineupCsReq) o; return bitField0_ == other.bitField0_ - && (!hasIndex() || index == other.index) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasPlaneId() || planeId == other.planeId) && (!hasSlot() || slot == other.slot) - && (!hasAvatarType() || avatarType == other.avatarType) + && (!hasIndex() || index == other.index) + && (!hasPlaneId() || planeId == other.planeId) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) + && (!hasAvatarType() || avatarType == other.avatarType) && (!hasIsVirtual() || isVirtual == other.isVirtual); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(index); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(baseAvatarId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(planeId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 96); output.writeUInt32NoTag(slot); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 16); - output.writeEnumNoTag(avatarType); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(index); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 56); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(planeId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 72); output.writeEnumNoTag(extraLineupType); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 120); + output.writeEnumNoTag(avatarType); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 80); output.writeBoolNoTag(isVirtual); } } @@ -501,22 +501,22 @@ public final class JoinLineupCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); - } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); + size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); + size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); } if ((bitField0_ & 0x00000040) != 0) { size += 2; @@ -531,67 +531,67 @@ public final class JoinLineupCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // index - index = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { + case 64: { // baseAvatarId baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { - // planeId - planeId = input.readUInt32(); - bitField0_ |= 0x00000004; + case 96: { + // slot + slot = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // slot - slot = input.readUInt32(); + // index + index = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { - // avatarType - final int value = input.readInt32(); - if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { - avatarType = value; - bitField0_ |= 0x00000010; - } - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // extraLineupType - final int value = input.readInt32(); - if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { - extraLineupType = value; - bitField0_ |= 0x00000020; - } - tag = input.readTag(); if (tag != 72) { break; } } case 72: { + // extraLineupType + final int value = input.readInt32(); + if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { + extraLineupType = value; + bitField0_ |= 0x00000010; + } + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // avatarType + final int value = input.readInt32(); + if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { + avatarType = value; + bitField0_ |= 0x00000020; + } + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000040; @@ -618,22 +618,22 @@ public final class JoinLineupCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.index, index); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); - } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.slot, slot); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.index, index); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.planeId, planeId); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); + output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); } if ((bitField0_ & 0x00000020) != 0) { - output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); + output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); } if ((bitField0_ & 0x00000040) != 0) { output.writeBool(FieldNames.isVirtual, isVirtual); @@ -648,10 +648,11 @@ public final class JoinLineupCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -659,11 +660,10 @@ public final class JoinLineupCsReqOuterClass { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -671,22 +671,22 @@ public final class JoinLineupCsReqOuterClass { } break; } + case 100346066: { + if (input.isAtField(FieldNames.index)) { + if (!input.trySkipNullValue()) { + index = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } 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 3533310: { - if (input.isAtField(FieldNames.slot)) { - if (!input.trySkipNullValue()) { - slot = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -694,23 +694,6 @@ public final class JoinLineupCsReqOuterClass { } break; } - case -403148749: - case 397309536: { - if (input.isAtField(FieldNames.avatarType)) { - if (!input.trySkipNullValue()) { - final AvatarTypeOuterClass.AvatarType value = input.readEnum(AvatarTypeOuterClass.AvatarType.converter()); - if (value != null) { - avatarType = value.getNumber(); - bitField0_ |= 0x00000010; - } else { - input.skipUnknownEnumValue(); - } - } - } else { - input.skipUnknownField(); - } - break; - } case -468135527: case -1144475077: { if (input.isAtField(FieldNames.extraLineupType)) { @@ -718,6 +701,23 @@ public final class JoinLineupCsReqOuterClass { final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter()); if (value != null) { extraLineupType = value.getNumber(); + bitField0_ |= 0x00000010; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + case -403148749: + case 397309536: { + if (input.isAtField(FieldNames.avatarType)) { + if (!input.trySkipNullValue()) { + final AvatarTypeOuterClass.AvatarType value = input.readEnum(AvatarTypeOuterClass.AvatarType.converter()); + if (value != null) { + avatarType = value.getNumber(); bitField0_ |= 0x00000020; } else { input.skipUnknownEnumValue(); @@ -793,18 +793,18 @@ public final class JoinLineupCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName index = FieldName.forField("index"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName slot = FieldName.forField("slot"); - static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); + static final FieldName index = FieldName.forField("index"); + + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); + static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); + static final FieldName isVirtual = FieldName.forField("isVirtual", "is_virtual"); } } diff --git a/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java index 4bc5b92..9e14adf 100644 --- a/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java @@ -19,52 +19,32 @@ public final class LineupAvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 slot = 7; - */ - private int slot; - - /** - * 
-     *  +44
-     *
- * - * optional uint32 hp = 9; - */ - private int hp; - - /** - * 
-     *  + 32
-     *
- * - * optional uint32 id = 10; - */ - private int id; - - /** - * 
-     *  +48
-     *
- * - * optional uint32 satiety = 13; + * optional uint32 satiety = 4; */ private int satiety; /** - * 
-     *  +40
-     *
- * - * optional .AvatarType avatar_type = 8; + * optional uint32 hp = 7; + */ + private int hp; + + /** + * optional uint32 slot = 8; + */ + private int slot; + + /** + * optional uint32 id = 11; + */ + private int id; + + /** + * optional .AvatarType avatar_type = 2; */ private int avatarType; /** - * 
-     *  +24
-     *
- * - * optional .SpBarInfo sp_bar = 2; + * optional .SpBarInfo sp_bar = 14; */ private final SpBarInfoOuterClass.SpBarInfo spBar = SpBarInfoOuterClass.SpBarInfo.newInstance(); @@ -79,48 +59,44 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 slot = 7; - * @return whether the slot field is set + * optional uint32 satiety = 4; + * @return whether the satiety field is set */ - public boolean hasSlot() { + public boolean hasSatiety() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 slot = 7; + * optional uint32 satiety = 4; * @return this */ - public LineupAvatar clearSlot() { + public LineupAvatar clearSatiety() { bitField0_ &= ~0x00000001; - slot = 0; + satiety = 0; return this; } /** - * optional uint32 slot = 7; - * @return the slot + * optional uint32 satiety = 4; + * @return the satiety */ - public int getSlot() { - return slot; + public int getSatiety() { + return satiety; } /** - * optional uint32 slot = 7; - * @param value the slot to set + * optional uint32 satiety = 4; + * @param value the satiety to set * @return this */ - public LineupAvatar setSlot(final int value) { + public LineupAvatar setSatiety(final int value) { bitField0_ |= 0x00000001; - slot = value; + satiety = value; return this; } /** - * 
-     *  +44
-     *
- * - * optional uint32 hp = 9; + * optional uint32 hp = 7; * @return whether the hp field is set */ public boolean hasHp() { @@ -128,11 +104,7 @@ public final class LineupAvatarOuterClass { } /** - * 
-     *  +44
-     *
- * - * optional uint32 hp = 9; + * optional uint32 hp = 7; * @return this */ public LineupAvatar clearHp() { @@ -142,11 +114,7 @@ public final class LineupAvatarOuterClass { } /** - * 
-     *  +44
-     *
- * - * optional uint32 hp = 9; + * optional uint32 hp = 7; * @return the hp */ public int getHp() { @@ -154,11 +122,7 @@ public final class LineupAvatarOuterClass { } /** - * 
-     *  +44
-     *
- * - * optional uint32 hp = 9; + * optional uint32 hp = 7; * @param value the hp to set * @return this */ @@ -169,37 +133,62 @@ public final class LineupAvatarOuterClass { } /** - * 
-     *  + 32
-     *
- * - * optional uint32 id = 10; - * @return whether the id field is set + * optional uint32 slot = 8; + * @return whether the slot field is set */ - public boolean hasId() { + public boolean hasSlot() { return (bitField0_ & 0x00000004) != 0; } /** - * 
-     *  + 32
-     *
- * - * optional uint32 id = 10; + * optional uint32 slot = 8; + * @return this + */ + public LineupAvatar clearSlot() { + bitField0_ &= ~0x00000004; + slot = 0; + return this; + } + + /** + * optional uint32 slot = 8; + * @return the slot + */ + public int getSlot() { + return slot; + } + + /** + * optional uint32 slot = 8; + * @param value the slot to set + * @return this + */ + public LineupAvatar setSlot(final int value) { + bitField0_ |= 0x00000004; + slot = value; + return this; + } + + /** + * optional uint32 id = 11; + * @return whether the id field is set + */ + public boolean hasId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 id = 11; * @return this */ public LineupAvatar clearId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; id = 0; return this; } /** - * 
-     *  + 32
-     *
- * - * optional uint32 id = 10; + * optional uint32 id = 11; * @return the id */ public int getId() { @@ -207,79 +196,18 @@ public final class LineupAvatarOuterClass { } /** - * 
-     *  + 32
-     *
- * - * optional uint32 id = 10; + * optional uint32 id = 11; * @param value the id to set * @return this */ public LineupAvatar setId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; id = value; return this; } /** - * 
-     *  +48
-     *
- * - * optional uint32 satiety = 13; - * @return whether the satiety field is set - */ - public boolean hasSatiety() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * 
-     *  +48
-     *
- * - * optional uint32 satiety = 13; - * @return this - */ - public LineupAvatar clearSatiety() { - bitField0_ &= ~0x00000008; - satiety = 0; - return this; - } - - /** - * 
-     *  +48
-     *
- * - * optional uint32 satiety = 13; - * @return the satiety - */ - public int getSatiety() { - return satiety; - } - - /** - * 
-     *  +48
-     *
- * - * optional uint32 satiety = 13; - * @param value the satiety to set - * @return this - */ - public LineupAvatar setSatiety(final int value) { - bitField0_ |= 0x00000008; - satiety = value; - return this; - } - - /** - * 
-     *  +40
-     *
- * - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 2; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -287,11 +215,7 @@ public final class LineupAvatarOuterClass { } /** - * 
-     *  +40
-     *
- * - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 2; * @return this */ public LineupAvatar clearAvatarType() { @@ -301,11 +225,7 @@ public final class LineupAvatarOuterClass { } /** - * 
-     *  +40
-     *
- * - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 2; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -338,11 +258,7 @@ public final class LineupAvatarOuterClass { } /** - * 
-     *  +40
-     *
- * - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 2; * @param value the avatarType to set * @return this */ @@ -353,11 +269,7 @@ public final class LineupAvatarOuterClass { } /** - * 
-     *  +24
-     *
- * - * optional .SpBarInfo sp_bar = 2; + * optional .SpBarInfo sp_bar = 14; * @return whether the spBar field is set */ public boolean hasSpBar() { @@ -365,11 +277,7 @@ public final class LineupAvatarOuterClass { } /** - * 
-     *  +24
-     *
- * - * optional .SpBarInfo sp_bar = 2; + * optional .SpBarInfo sp_bar = 14; * @return this */ public LineupAvatar clearSpBar() { @@ -379,11 +287,7 @@ public final class LineupAvatarOuterClass { } /** - * 
-     *  +24
-     *
- * - * optional .SpBarInfo sp_bar = 2; + * optional .SpBarInfo sp_bar = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -397,11 +301,7 @@ public final class LineupAvatarOuterClass { } /** - * 
-     *  +24
-     *
- * - * optional .SpBarInfo sp_bar = 2; + * optional .SpBarInfo sp_bar = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -415,11 +315,7 @@ public final class LineupAvatarOuterClass { } /** - * 
-     *  +24
-     *
- * - * optional .SpBarInfo sp_bar = 2; + * optional .SpBarInfo sp_bar = 14; * @param value the spBar to set * @return this */ @@ -434,10 +330,10 @@ public final class LineupAvatarOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - slot = other.slot; - hp = other.hp; - id = other.id; satiety = other.satiety; + hp = other.hp; + slot = other.slot; + id = other.id; avatarType = other.avatarType; spBar.copyFrom(other.spBar); } @@ -450,18 +346,18 @@ public final class LineupAvatarOuterClass { return this; } cachedSize = -1; - if (other.hasSlot()) { - setSlot(other.slot); + if (other.hasSatiety()) { + setSatiety(other.satiety); } if (other.hasHp()) { setHp(other.hp); } + if (other.hasSlot()) { + setSlot(other.slot); + } if (other.hasId()) { setId(other.id); } - if (other.hasSatiety()) { - setSatiety(other.satiety); - } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); } @@ -478,10 +374,10 @@ public final class LineupAvatarOuterClass { } cachedSize = -1; bitField0_ = 0; - slot = 0; - hp = 0; - id = 0; satiety = 0; + hp = 0; + slot = 0; + id = 0; avatarType = 0; spBar.clear(); return this; @@ -508,10 +404,10 @@ public final class LineupAvatarOuterClass { } LineupAvatar other = (LineupAvatar) o; return bitField0_ == other.bitField0_ - && (!hasSlot() || slot == other.slot) - && (!hasHp() || hp == other.hp) - && (!hasId() || id == other.id) && (!hasSatiety() || satiety == other.satiety) + && (!hasHp() || hp == other.hp) + && (!hasSlot() || slot == other.slot) + && (!hasId() || id == other.id) && (!hasAvatarType() || avatarType == other.avatarType) && (!hasSpBar() || spBar.equals(other.spBar)); } @@ -519,27 +415,27 @@ public final class LineupAvatarOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(slot); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(satiety); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(hp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(id); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(satiety); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 16); output.writeEnumNoTag(avatarType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 114); output.writeMessageNoTag(spBar); } } @@ -548,16 +444,16 @@ public final class LineupAvatarOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(satiety); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(hp); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(satiety); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); @@ -575,43 +471,43 @@ public final class LineupAvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // slot - slot = input.readUInt32(); + case 32: { + // satiety + satiety = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 56) { break; } } - case 72: { + case 56: { // hp hp = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // id - id = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // satiety - satiety = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); if (tag != 64) { break; } } case 64: { + // slot + slot = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // id + id = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -619,11 +515,11 @@ public final class LineupAvatarOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 18) { + if (tag != 114) { break; } } - case 18: { + case 114: { // spBar input.readMessage(spBar); bitField0_ |= 0x00000020; @@ -650,16 +546,16 @@ public final class LineupAvatarOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.satiety, satiety); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.hp, hp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.satiety, satiety); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); @@ -677,10 +573,10 @@ public final class LineupAvatarOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case 1871093127: { + if (input.isAtField(FieldNames.satiety)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + satiety = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -699,10 +595,10 @@ public final class LineupAvatarOuterClass { } break; } - case 3355: { - if (input.isAtField(FieldNames.id)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - id = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -710,10 +606,10 @@ public final class LineupAvatarOuterClass { } break; } - case 1871093127: { - if (input.isAtField(FieldNames.satiety)) { + case 3355: { + if (input.isAtField(FieldNames.id)) { if (!input.trySkipNullValue()) { - satiety = input.readUInt32(); + id = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -802,13 +698,13 @@ public final class LineupAvatarOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName slot = FieldName.forField("slot"); + static final FieldName satiety = FieldName.forField("satiety"); static final FieldName hp = FieldName.forField("hp"); - static final FieldName id = FieldName.forField("id"); + static final FieldName slot = FieldName.forField("slot"); - static final FieldName satiety = FieldName.forField("satiety"); + static final FieldName id = FieldName.forField("id"); 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 45aab9b..e16ff7d 100644 --- a/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java @@ -21,47 +21,47 @@ public final class LineupInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 index = 5; - */ - private int index; - - /** - * optional uint32 max_mp = 6; - */ - private int maxMp; - - /** - * optional uint32 mp = 8; - */ - private int mp; - - /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 1; */ private int planeId; /** - * optional uint32 leader_slot = 12; + * optional uint32 mp = 5; + */ + private int mp; + + /** + * optional uint32 leader_slot = 10; */ private int leaderSlot; + /** + * optional uint32 index = 11; + */ + private int index; + + /** + * optional uint32 max_mp = 12; + */ + private int maxMp; + /** * optional .ExtraLineupType extra_lineup_type = 2; */ private int extraLineupType; /** - * optional bool is_virtual = 14; + * optional bool is_virtual = 4; */ private boolean isVirtual; /** - * optional string name = 3; + * optional string name = 15; */ private final Utf8String name = Utf8String.newEmptyInstance(); /** - * repeated .LineupAvatar avatar_list = 9; + * repeated .LineupAvatar avatar_list = 13; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(LineupAvatarOuterClass.LineupAvatar.getFactory()); @@ -76,136 +76,25 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 index = 5; - * @return whether the index field is set + * optional uint32 plane_id = 1; + * @return whether the planeId field is set */ - public boolean hasIndex() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 index = 5; - * @return this - */ - public LineupInfo clearIndex() { - bitField0_ &= ~0x00000001; - index = 0; - return this; - } - - /** - * optional uint32 index = 5; - * @return the index - */ - public int getIndex() { - return index; - } - - /** - * optional uint32 index = 5; - * @param value the index to set - * @return this - */ - public LineupInfo setIndex(final int value) { - bitField0_ |= 0x00000001; - index = value; - return this; - } - - /** - * optional uint32 max_mp = 6; - * @return whether the maxMp field is set - */ - public boolean hasMaxMp() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 max_mp = 6; - * @return this - */ - public LineupInfo clearMaxMp() { - bitField0_ &= ~0x00000002; - maxMp = 0; - return this; - } - - /** - * optional uint32 max_mp = 6; - * @return the maxMp - */ - public int getMaxMp() { - return maxMp; - } - - /** - * optional uint32 max_mp = 6; - * @param value the maxMp to set - * @return this - */ - public LineupInfo setMaxMp(final int value) { - bitField0_ |= 0x00000002; - maxMp = value; - return this; - } - - /** - * optional uint32 mp = 8; - * @return whether the mp field is set - */ - public boolean hasMp() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 mp = 8; - * @return this - */ - public LineupInfo clearMp() { - bitField0_ &= ~0x00000004; - 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_ |= 0x00000004; - mp = value; - return this; - } - - /** - * optional uint32 plane_id = 10; - * @return whether the planeId field is set - */ - public boolean hasPlaneId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 1; * @return this */ public LineupInfo clearPlaneId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; planeId = 0; return this; } /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 1; * @return the planeId */ public int getPlaneId() { @@ -213,36 +102,73 @@ 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_ |= 0x00000008; + bitField0_ |= 0x00000001; planeId = value; return this; } /** - * optional uint32 leader_slot = 12; - * @return whether the leaderSlot field is set + * optional uint32 mp = 5; + * @return whether the mp field is set */ - public boolean hasLeaderSlot() { - return (bitField0_ & 0x00000010) != 0; + public boolean hasMp() { + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 leader_slot = 12; + * optional uint32 mp = 5; + * @return this + */ + public LineupInfo clearMp() { + bitField0_ &= ~0x00000002; + mp = 0; + return this; + } + + /** + * optional uint32 mp = 5; + * @return the mp + */ + public int getMp() { + return mp; + } + + /** + * optional uint32 mp = 5; + * @param value the mp to set + * @return this + */ + public LineupInfo setMp(final int value) { + bitField0_ |= 0x00000002; + mp = value; + return this; + } + + /** + * optional uint32 leader_slot = 10; + * @return whether the leaderSlot field is set + */ + public boolean hasLeaderSlot() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 leader_slot = 10; * @return this */ public LineupInfo clearLeaderSlot() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; leaderSlot = 0; return this; } /** - * optional uint32 leader_slot = 12; + * optional uint32 leader_slot = 10; * @return the leaderSlot */ public int getLeaderSlot() { @@ -250,16 +176,90 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 leader_slot = 12; + * optional uint32 leader_slot = 10; * @param value the leaderSlot to set * @return this */ public LineupInfo setLeaderSlot(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; leaderSlot = value; return this; } + /** + * optional uint32 index = 11; + * @return whether the index field is set + */ + public boolean hasIndex() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 index = 11; + * @return this + */ + public LineupInfo clearIndex() { + bitField0_ &= ~0x00000008; + 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 LineupInfo setIndex(final int value) { + bitField0_ |= 0x00000008; + index = value; + return this; + } + + /** + * optional uint32 max_mp = 12; + * @return whether the maxMp field is set + */ + public boolean hasMaxMp() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 max_mp = 12; + * @return this + */ + public LineupInfo clearMaxMp() { + bitField0_ &= ~0x00000010; + maxMp = 0; + return this; + } + + /** + * optional uint32 max_mp = 12; + * @return the maxMp + */ + public int getMaxMp() { + return maxMp; + } + + /** + * optional uint32 max_mp = 12; + * @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 = 2; * @return whether the extraLineupType field is set @@ -323,7 +323,7 @@ public final class LineupInfoOuterClass { } /** - * optional bool is_virtual = 14; + * optional bool is_virtual = 4; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -331,7 +331,7 @@ public final class LineupInfoOuterClass { } /** - * optional bool is_virtual = 14; + * optional bool is_virtual = 4; * @return this */ public LineupInfo clearIsVirtual() { @@ -341,7 +341,7 @@ public final class LineupInfoOuterClass { } /** - * optional bool is_virtual = 14; + * optional bool is_virtual = 4; * @return the isVirtual */ public boolean getIsVirtual() { @@ -349,7 +349,7 @@ public final class LineupInfoOuterClass { } /** - * optional bool is_virtual = 14; + * optional bool is_virtual = 4; * @param value the isVirtual to set * @return this */ @@ -360,7 +360,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 3; + * 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 = 3; + * optional string name = 15; * @return this */ public LineupInfo clearName() { @@ -378,7 +378,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 3; + * optional string name = 15; * @return the name */ public String getName() { @@ -386,7 +386,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 3; + * 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 = 3; + * 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 = 3; + * optional string name = 15; * @param value the name to set * @return this */ @@ -414,7 +414,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 3; + * optional string name = 15; * @param value the name to set * @return this */ @@ -425,7 +425,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 9; + * repeated .LineupAvatar avatar_list = 13; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -433,7 +433,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 9; + * repeated .LineupAvatar avatar_list = 13; * @return this */ public LineupInfo clearAvatarList() { @@ -443,7 +443,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 9; + * repeated .LineupAvatar 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. @@ -457,7 +457,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 9; + * repeated .LineupAvatar 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 @@ -471,7 +471,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 9; + * repeated .LineupAvatar avatar_list = 13; * @param value the avatarList to add * @return this */ @@ -482,7 +482,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 9; + * repeated .LineupAvatar avatar_list = 13; * @param values the avatarList to add * @return this */ @@ -497,11 +497,11 @@ public final class LineupInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + planeId = other.planeId; + mp = other.mp; + leaderSlot = other.leaderSlot; index = other.index; maxMp = other.maxMp; - mp = other.mp; - planeId = other.planeId; - leaderSlot = other.leaderSlot; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; name.copyFrom(other.name); @@ -516,21 +516,21 @@ public final class LineupInfoOuterClass { return this; } cachedSize = -1; + if (other.hasPlaneId()) { + setPlaneId(other.planeId); + } + if (other.hasMp()) { + setMp(other.mp); + } + if (other.hasLeaderSlot()) { + setLeaderSlot(other.leaderSlot); + } if (other.hasIndex()) { setIndex(other.index); } if (other.hasMaxMp()) { setMaxMp(other.maxMp); } - if (other.hasMp()) { - setMp(other.mp); - } - if (other.hasPlaneId()) { - setPlaneId(other.planeId); - } - 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; + mp = 0; + leaderSlot = 0; index = 0; maxMp = 0; - mp = 0; - planeId = 0; - leaderSlot = 0; extraLineupType = 0; isVirtual = false; name.clear(); @@ -587,11 +587,11 @@ public final class LineupInfoOuterClass { } LineupInfo other = (LineupInfo) o; return bitField0_ == other.bitField0_ + && (!hasPlaneId() || planeId == other.planeId) + && (!hasMp() || mp == other.mp) + && (!hasLeaderSlot() || leaderSlot == other.leaderSlot) && (!hasIndex() || index == other.index) && (!hasMaxMp() || maxMp == other.maxMp) - && (!hasMp() || mp == other.mp) - && (!hasPlaneId() || planeId == other.planeId) - && (!hasLeaderSlot() || leaderSlot == other.leaderSlot) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual) && (!hasName() || name.equals(other.name)) @@ -601,40 +601,40 @@ public final class LineupInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(index); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(maxMp); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(mp); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 80); - output.writeUInt32NoTag(planeId); + output.writeUInt32NoTag(leaderSlot); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(leaderSlot); + output.writeUInt32NoTag(maxMp); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 16); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 32); output.writeBoolNoTag(isVirtual); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 122); output.writeStringNoTag(name); } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 106); output.writeMessageNoTag(avatarList.get(i)); } } @@ -644,20 +644,20 @@ public final class LineupInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(maxMp); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mp); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(mp); + } + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(maxMp); + } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); } @@ -680,36 +680,36 @@ public final class LineupInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // index - index = input.readUInt32(); + case 8: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 40) { break; } } - case 48: { - // maxMp - maxMp = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 40: { // mp mp = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 80) { break; } } case 80: { - // planeId - planeId = input.readUInt32(); + // leaderSlot + leaderSlot = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // index + index = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 96) { @@ -717,8 +717,8 @@ public final class LineupInfoOuterClass { } } case 96: { - // leaderSlot - leaderSlot = input.readUInt32(); + // maxMp + maxMp = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 16) { @@ -733,29 +733,29 @@ public final class LineupInfoOuterClass { bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 112) { + if (tag != 32) { break; } } - case 112: { + case 32: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 26) { + if (tag != 122) { break; } } - case 26: { + case 122: { // name input.readString(name); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 74) { + if (tag != 106) { break; } } - case 74: { + case 106: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000100; @@ -781,20 +781,20 @@ public final class LineupInfoOuterClass { 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.maxMp, maxMp); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.mp, mp); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.planeId, planeId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.mp, mp); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.leaderSlot, leaderSlot); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.index, index); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.maxMp, maxMp); + } if ((bitField0_ & 0x00000020) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); } @@ -817,10 +817,11 @@ public final class LineupInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + planeId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -828,35 +829,11 @@ public final class LineupInfoOuterClass { } break; } - case 103671335: - case -1081138594: { - if (input.isAtField(FieldNames.maxMp)) { - if (!input.trySkipNullValue()) { - maxMp = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 3491: { if (input.isAtField(FieldNames.mp)) { if (!input.trySkipNullValue()) { mp = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { - if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -868,6 +845,29 @@ public final class LineupInfoOuterClass { if (input.isAtField(FieldNames.leaderSlot)) { if (!input.trySkipNullValue()) { leaderSlot = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 100346066: { + if (input.isAtField(FieldNames.index)) { + if (!input.trySkipNullValue()) { + index = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 103671335: + case -1081138594: { + if (input.isAtField(FieldNames.maxMp)) { + if (!input.trySkipNullValue()) { + maxMp = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -979,16 +979,16 @@ public final class LineupInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName index = FieldName.forField("index"); - - static final FieldName maxMp = FieldName.forField("maxMp", "max_mp"); + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); static final FieldName mp = FieldName.forField("mp"); - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName leaderSlot = FieldName.forField("leaderSlot", "leader_slot"); + static final FieldName index = FieldName.forField("index"); + + static final FieldName maxMp = FieldName.forField("maxMp", "max_mp"); + static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); static final FieldName isVirtual = FieldName.forField("isVirtual", "is_virtual"); diff --git a/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java index f6b297d..28c71e5 100644 --- a/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java @@ -18,18 +18,18 @@ public final class LineupSlotDataOuterClass { public static final class LineupSlotData extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 slot = 7; + */ + private int slot; + /** * optional uint32 id = 11; */ private int id; /** - * optional uint32 slot = 14; - */ - private int slot; - - /** - * optional .AvatarType avatar_type = 13; + * optional .AvatarType avatar_type = 6; */ private int avatarType; @@ -43,12 +43,49 @@ public final class LineupSlotDataOuterClass { return new LineupSlotData(); } + /** + * optional uint32 slot = 7; + * @return whether the slot field is set + */ + public boolean hasSlot() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 slot = 7; + * @return this + */ + public LineupSlotData clearSlot() { + bitField0_ &= ~0x00000001; + slot = 0; + return this; + } + + /** + * optional uint32 slot = 7; + * @return the slot + */ + public int getSlot() { + return slot; + } + + /** + * optional uint32 slot = 7; + * @param value the slot to set + * @return this + */ + public LineupSlotData setSlot(final int value) { + bitField0_ |= 0x00000001; + slot = value; + return this; + } + /** * optional uint32 id = 11; * @return whether the id field is set */ public boolean hasId() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -56,7 +93,7 @@ public final class LineupSlotDataOuterClass { * @return this */ public LineupSlotData clearId() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; id = 0; return this; } @@ -75,50 +112,13 @@ public final class LineupSlotDataOuterClass { * @return this */ public LineupSlotData setId(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; id = value; return this; } /** - * optional uint32 slot = 14; - * @return whether the slot field is set - */ - public boolean hasSlot() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 slot = 14; - * @return this - */ - public LineupSlotData clearSlot() { - bitField0_ &= ~0x00000002; - slot = 0; - return this; - } - - /** - * optional uint32 slot = 14; - * @return the slot - */ - public int getSlot() { - return slot; - } - - /** - * optional uint32 slot = 14; - * @param value the slot to set - * @return this - */ - public LineupSlotData setSlot(final int value) { - bitField0_ |= 0x00000002; - slot = value; - return this; - } - - /** - * optional .AvatarType avatar_type = 13; + * optional .AvatarType avatar_type = 6; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -126,7 +126,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional .AvatarType avatar_type = 13; + * optional .AvatarType avatar_type = 6; * @return this */ public LineupSlotData clearAvatarType() { @@ -136,7 +136,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional .AvatarType avatar_type = 13; + * optional .AvatarType avatar_type = 6; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -169,7 +169,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional .AvatarType avatar_type = 13; + * optional .AvatarType avatar_type = 6; * @param value the avatarType to set * @return this */ @@ -184,8 +184,8 @@ public final class LineupSlotDataOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - id = other.id; slot = other.slot; + id = other.id; avatarType = other.avatarType; } return this; @@ -197,12 +197,12 @@ public final class LineupSlotDataOuterClass { 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 LineupSlotDataOuterClass { } cachedSize = -1; bitField0_ = 0; - id = 0; slot = 0; + id = 0; avatarType = 0; return this; } @@ -242,23 +242,23 @@ public final class LineupSlotDataOuterClass { } LineupSlotData other = (LineupSlotData) 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) 56); + output.writeUInt32NoTag(slot); + } + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 88); output.writeUInt32NoTag(id); } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(slot); - } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 48); output.writeEnumNoTag(avatarType); } } @@ -267,10 +267,10 @@ public final class LineupSlotDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(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 LineupSlotDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { + case 56: { + // slot + slot = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 88) { + break; + } + } case 88: { // id id = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // slot - slot = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 48) { break; } } - case 104: { + case 48: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -333,10 +333,10 @@ public final class LineupSlotDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.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 LineupSlotDataOuterClass { } 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 LineupSlotDataOuterClass { } 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 LineupSlotDataOuterClass { * 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/LockEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java index 6364101..9896f79 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 = 9; + * optional uint32 equipment_unique_id = 5; */ private int equipmentUniqueId; /** - * optional bool is_protected = 15; + * optional bool is_protected = 9; */ private boolean isProtected; @@ -39,7 +39,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 9; + * optional uint32 equipment_unique_id = 5; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 9; + * optional uint32 equipment_unique_id = 5; * @return this */ public LockEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 9; + * optional uint32 equipment_unique_id = 5; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 9; + * optional uint32 equipment_unique_id = 5; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 15; + * optional bool is_protected = 9; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -84,7 +84,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 15; + * optional bool is_protected = 9; * @return this */ public LockEquipmentCsReq clearIsProtected() { @@ -94,7 +94,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 15; + * optional bool is_protected = 9; * @return the isProtected */ public boolean getIsProtected() { @@ -102,7 +102,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 15; + * optional bool is_protected = 9; * @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) 72); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 72); output.writeBoolNoTag(isProtected); } } @@ -205,16 +205,16 @@ public final class LockEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 40: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 72) { break; } } - case 120: { + case 72: { // 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 f471e1a..5c4a4de 100644 --- a/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java @@ -19,15 +19,15 @@ public final class LockEquipmentScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 equipment_unique_id = 5; - */ - private int equipmentUniqueId; - - /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 2; */ private int retcode; + /** + * optional uint32 equipment_unique_id = 8; + */ + private int equipmentUniqueId; + private LockEquipmentScRsp() { } @@ -39,62 +39,25 @@ public final class LockEquipmentScRspOuterClass { } /** - * optional uint32 equipment_unique_id = 5; - * @return whether the equipmentUniqueId field is set + * optional uint32 retcode = 2; + * @return whether the retcode field is set */ - public boolean hasEquipmentUniqueId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 equipment_unique_id = 5; - * @return this - */ - public LockEquipmentScRsp clearEquipmentUniqueId() { - bitField0_ &= ~0x00000001; - equipmentUniqueId = 0; - return this; - } - - /** - * optional uint32 equipment_unique_id = 5; - * @return the equipmentUniqueId - */ - public int getEquipmentUniqueId() { - return equipmentUniqueId; - } - - /** - * optional uint32 equipment_unique_id = 5; - * @param value the equipmentUniqueId to set - * @return this - */ - public LockEquipmentScRsp setEquipmentUniqueId(final int value) { - bitField0_ |= 0x00000001; - equipmentUniqueId = value; - return this; - } - - /** - * optional uint32 retcode = 6; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 2; * @return this */ public LockEquipmentScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -102,23 +65,60 @@ public final class LockEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ public LockEquipmentScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } + /** + * optional uint32 equipment_unique_id = 8; + * @return whether the equipmentUniqueId field is set + */ + public boolean hasEquipmentUniqueId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 equipment_unique_id = 8; + * @return this + */ + public LockEquipmentScRsp clearEquipmentUniqueId() { + bitField0_ &= ~0x00000002; + equipmentUniqueId = 0; + return this; + } + + /** + * optional uint32 equipment_unique_id = 8; + * @return the equipmentUniqueId + */ + public int getEquipmentUniqueId() { + return equipmentUniqueId; + } + + /** + * optional uint32 equipment_unique_id = 8; + * @param value the equipmentUniqueId to set + * @return this + */ + public LockEquipmentScRsp setEquipmentUniqueId(final int value) { + bitField0_ |= 0x00000002; + equipmentUniqueId = value; + return this; + } + @Override public LockEquipmentScRsp copyFrom(final LockEquipmentScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - equipmentUniqueId = other.equipmentUniqueId; retcode = other.retcode; + equipmentUniqueId = other.equipmentUniqueId; } return this; } @@ -129,12 +129,12 @@ public final class LockEquipmentScRspOuterClass { return this; } cachedSize = -1; - if (other.hasEquipmentUniqueId()) { - setEquipmentUniqueId(other.equipmentUniqueId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasEquipmentUniqueId()) { + setEquipmentUniqueId(other.equipmentUniqueId); + } return this; } @@ -145,8 +145,8 @@ public final class LockEquipmentScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - equipmentUniqueId = 0; retcode = 0; + equipmentUniqueId = 0; return this; } @@ -170,19 +170,19 @@ public final class LockEquipmentScRspOuterClass { } LockEquipmentScRsp other = (LockEquipmentScRsp) o; return bitField0_ == other.bitField0_ - && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(equipmentUniqueId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(equipmentUniqueId); } } @@ -190,10 +190,10 @@ public final class LockEquipmentScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); } return size; } @@ -205,18 +205,18 @@ public final class LockEquipmentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // equipmentUniqueId - equipmentUniqueId = input.readUInt32(); + case 16: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 64) { break; } } - case 48: { - // retcode - retcode = input.readUInt32(); + case 64: { + // equipmentUniqueId + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class LockEquipmentScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); } output.endObject(); } @@ -256,11 +256,10 @@ public final class LockEquipmentScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1867136902: - case 760467160: { - if (input.isAtField(FieldNames.equipmentUniqueId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - equipmentUniqueId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,10 +267,11 @@ public final class LockEquipmentScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1867136902: + case 760467160: { + if (input.isAtField(FieldNames.equipmentUniqueId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ 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"); + + static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java index d15e828..b161018 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 = 4; + * optional uint32 relic_unique_id = 7; */ private int relicUniqueId; /** - * optional bool is_protected = 9; + * optional bool is_protected = 1; */ private boolean isProtected; @@ -39,7 +39,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 4; + * optional uint32 relic_unique_id = 7; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -47,7 +47,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 4; + * optional uint32 relic_unique_id = 7; * @return this */ public LockRelicCsReq clearRelicUniqueId() { @@ -57,7 +57,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 4; + * optional uint32 relic_unique_id = 7; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -65,7 +65,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 4; + * optional uint32 relic_unique_id = 7; * @param value the relicUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 9; + * optional bool is_protected = 1; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -84,7 +84,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 9; + * optional bool is_protected = 1; * @return this */ public LockRelicCsReq clearIsProtected() { @@ -94,7 +94,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 9; + * optional bool is_protected = 1; * @return the isProtected */ public boolean getIsProtected() { @@ -102,7 +102,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 9; + * optional bool is_protected = 1; * @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) 32); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 8); output.writeBoolNoTag(isProtected); } } @@ -205,16 +205,16 @@ public final class LockRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 56: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 8) { break; } } - case 72: { + case 8: { // 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 368223f..ea3e9a8 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 retcode = 1; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 8; */ private int relicUniqueId; @@ -39,7 +39,7 @@ public final class LockRelicScRspOuterClass { } /** - * 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 LockRelicScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 2; * @return this */ public LockRelicScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 8; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -84,7 +84,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 8; * @return this */ public LockRelicScRsp clearRelicUniqueId() { @@ -94,7 +94,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 8; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -102,7 +102,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 8; * @param value the relicUniqueId 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) 8); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(relicUniqueId); } } @@ -205,16 +205,16 @@ public final class LockRelicScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 64) { break; } } - case 88: { + case 64: { // relicUniqueId relicUniqueId = 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 a1f5ffb..38896b5 100644 --- a/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java @@ -19,20 +19,20 @@ public final class MaterialOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 JFHKDOLIJDI = 9; + * optional uint64 LIFACBDIHGM = 13; */ - private long jFHKDOLIJDI; - - /** - * optional uint32 tid = 4; - */ - private int tid; + private long lIFACBDIHGM; /** * optional uint32 num = 5; */ private int num; + /** + * optional uint32 tid = 9; + */ + private int tid; + private Material() { } @@ -44,76 +44,39 @@ public final class MaterialOuterClass { } /** - * optional uint64 JFHKDOLIJDI = 9; - * @return whether the jFHKDOLIJDI field is set + * optional uint64 LIFACBDIHGM = 13; + * @return whether the lIFACBDIHGM field is set */ - public boolean hasJFHKDOLIJDI() { + public boolean hasLIFACBDIHGM() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint64 JFHKDOLIJDI = 9; + * optional uint64 LIFACBDIHGM = 13; * @return this */ - public Material clearJFHKDOLIJDI() { + public Material clearLIFACBDIHGM() { bitField0_ &= ~0x00000001; - jFHKDOLIJDI = 0L; + lIFACBDIHGM = 0L; return this; } /** - * optional uint64 JFHKDOLIJDI = 9; - * @return the jFHKDOLIJDI + * optional uint64 LIFACBDIHGM = 13; + * @return the lIFACBDIHGM */ - public long getJFHKDOLIJDI() { - return jFHKDOLIJDI; + public long getLIFACBDIHGM() { + return lIFACBDIHGM; } /** - * optional uint64 JFHKDOLIJDI = 9; - * @param value the jFHKDOLIJDI to set + * optional uint64 LIFACBDIHGM = 13; + * @param value the lIFACBDIHGM to set * @return this */ - public Material setJFHKDOLIJDI(final long value) { + public Material setLIFACBDIHGM(final long value) { bitField0_ |= 0x00000001; - jFHKDOLIJDI = value; - return this; - } - - /** - * optional uint32 tid = 4; - * @return whether the tid field is set - */ - public boolean hasTid() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 tid = 4; - * @return this - */ - public Material clearTid() { - bitField0_ &= ~0x00000002; - tid = 0; - return this; - } - - /** - * optional uint32 tid = 4; - * @return the tid - */ - public int getTid() { - return tid; - } - - /** - * optional uint32 tid = 4; - * @param value the tid to set - * @return this - */ - public Material setTid(final int value) { - bitField0_ |= 0x00000002; - tid = value; + lIFACBDIHGM = value; return this; } @@ -122,7 +85,7 @@ public final class MaterialOuterClass { * @return whether the num field is set */ public boolean hasNum() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -130,7 +93,7 @@ public final class MaterialOuterClass { * @return this */ public Material clearNum() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; num = 0; return this; } @@ -149,19 +112,56 @@ public final class MaterialOuterClass { * @return this */ public Material setNum(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; num = value; return this; } + /** + * optional uint32 tid = 9; + * @return whether the tid field is set + */ + public boolean hasTid() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 tid = 9; + * @return this + */ + public Material clearTid() { + bitField0_ &= ~0x00000004; + tid = 0; + return this; + } + + /** + * optional uint32 tid = 9; + * @return the tid + */ + public int getTid() { + return tid; + } + + /** + * optional uint32 tid = 9; + * @param value the tid to set + * @return this + */ + public Material setTid(final int value) { + bitField0_ |= 0x00000004; + tid = value; + return this; + } + @Override public Material copyFrom(final Material other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - jFHKDOLIJDI = other.jFHKDOLIJDI; - tid = other.tid; + lIFACBDIHGM = other.lIFACBDIHGM; num = other.num; + tid = other.tid; } return this; } @@ -172,15 +172,15 @@ public final class MaterialOuterClass { return this; } cachedSize = -1; - if (other.hasJFHKDOLIJDI()) { - setJFHKDOLIJDI(other.jFHKDOLIJDI); - } - if (other.hasTid()) { - setTid(other.tid); + if (other.hasLIFACBDIHGM()) { + setLIFACBDIHGM(other.lIFACBDIHGM); } if (other.hasNum()) { setNum(other.num); } + if (other.hasTid()) { + setTid(other.tid); + } return this; } @@ -191,9 +191,9 @@ public final class MaterialOuterClass { } cachedSize = -1; bitField0_ = 0; - jFHKDOLIJDI = 0L; - tid = 0; + lIFACBDIHGM = 0L; num = 0; + tid = 0; return this; } @@ -217,38 +217,38 @@ public final class MaterialOuterClass { } Material other = (Material) o; return bitField0_ == other.bitField0_ - && (!hasJFHKDOLIJDI() || jFHKDOLIJDI == other.jFHKDOLIJDI) - && (!hasTid() || tid == other.tid) - && (!hasNum() || num == other.num); + && (!hasLIFACBDIHGM() || lIFACBDIHGM == other.lIFACBDIHGM) + && (!hasNum() || num == other.num) + && (!hasTid() || tid == other.tid); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt64NoTag(jFHKDOLIJDI); + output.writeRawByte((byte) 104); + output.writeUInt64NoTag(lIFACBDIHGM); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(tid); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 40); output.writeUInt32NoTag(num); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(tid); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(jFHKDOLIJDI); + size += 1 + ProtoSink.computeUInt64SizeNoTag(lIFACBDIHGM); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(num); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(num); + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } return size; } @@ -260,20 +260,11 @@ public final class MaterialOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // jFHKDOLIJDI - jFHKDOLIJDI = input.readUInt64(); + case 104: { + // lIFACBDIHGM + lIFACBDIHGM = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // tid - tid = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 40) { break; } @@ -281,6 +272,15 @@ public final class MaterialOuterClass { case 40: { // num num = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // tid + tid = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public final class MaterialOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt64(FieldNames.jFHKDOLIJDI, jFHKDOLIJDI); + output.writeUInt64(FieldNames.lIFACBDIHGM, lIFACBDIHGM); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.tid, tid); + output.writeUInt32(FieldNames.num, num); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.num, num); + output.writeUInt32(FieldNames.tid, tid); } output.endObject(); } @@ -323,10 +323,10 @@ public final class MaterialOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1867524632: { - if (input.isAtField(FieldNames.jFHKDOLIJDI)) { + case 343601554: { + if (input.isAtField(FieldNames.lIFACBDIHGM)) { if (!input.trySkipNullValue()) { - jFHKDOLIJDI = input.readUInt64(); + lIFACBDIHGM = input.readUInt64(); bitField0_ |= 0x00000001; } } else { @@ -334,21 +334,21 @@ public final class MaterialOuterClass { } break; } - case 114831: { - if (input.isAtField(FieldNames.tid)) { - if (!input.trySkipNullValue()) { - tid = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 109446: { if (input.isAtField(FieldNames.num)) { if (!input.trySkipNullValue()) { num = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 114831: { + if (input.isAtField(FieldNames.tid)) { + if (!input.trySkipNullValue()) { + tid = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -408,11 +408,11 @@ public final class MaterialOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName jFHKDOLIJDI = FieldName.forField("JFHKDOLIJDI"); - - static final FieldName tid = FieldName.forField("tid"); + static final FieldName lIFACBDIHGM = FieldName.forField("LIFACBDIHGM"); static final FieldName num = FieldName.forField("num"); + + static final FieldName tid = FieldName.forField("tid"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java index c1eb519..40894c7 100644 --- a/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java @@ -19,17 +19,7 @@ public final class MazeChestOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 POGFOPELNMK = 14; - */ - private int pOGFOPELNMK; - - /** - * optional uint32 GKHHBPAINAO = 15; - */ - private int gKHHBPAINAO; - - /** - * optional .MapInfoChestType map_info_chest_Type = 3; + * optional .MapInfoChestType map_info_chest_type = 4; */ private int mapInfoChestType; @@ -44,99 +34,25 @@ public final class MazeChestOuterClass { } /** - * optional uint32 POGFOPELNMK = 14; - * @return whether the pOGFOPELNMK field is set + * optional .MapInfoChestType map_info_chest_type = 4; + * @return whether the mapInfoChestType field is set */ - public boolean hasPOGFOPELNMK() { + public boolean hasMapInfoChestType() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 POGFOPELNMK = 14; - * @return this - */ - public MazeChest clearPOGFOPELNMK() { - bitField0_ &= ~0x00000001; - pOGFOPELNMK = 0; - return this; - } - - /** - * optional uint32 POGFOPELNMK = 14; - * @return the pOGFOPELNMK - */ - public int getPOGFOPELNMK() { - return pOGFOPELNMK; - } - - /** - * optional uint32 POGFOPELNMK = 14; - * @param value the pOGFOPELNMK to set - * @return this - */ - public MazeChest setPOGFOPELNMK(final int value) { - bitField0_ |= 0x00000001; - pOGFOPELNMK = value; - return this; - } - - /** - * optional uint32 GKHHBPAINAO = 15; - * @return whether the gKHHBPAINAO field is set - */ - public boolean hasGKHHBPAINAO() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 GKHHBPAINAO = 15; - * @return this - */ - public MazeChest clearGKHHBPAINAO() { - bitField0_ &= ~0x00000002; - gKHHBPAINAO = 0; - return this; - } - - /** - * optional uint32 GKHHBPAINAO = 15; - * @return the gKHHBPAINAO - */ - public int getGKHHBPAINAO() { - return gKHHBPAINAO; - } - - /** - * optional uint32 GKHHBPAINAO = 15; - * @param value the gKHHBPAINAO to set - * @return this - */ - public MazeChest setGKHHBPAINAO(final int value) { - bitField0_ |= 0x00000002; - gKHHBPAINAO = value; - return this; - } - - /** - * optional .MapInfoChestType map_info_chest_Type = 3; - * @return whether the mapInfoChestType field is set - */ - public boolean hasMapInfoChestType() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .MapInfoChestType map_info_chest_Type = 3; + * optional .MapInfoChestType map_info_chest_type = 4; * @return this */ public MazeChest clearMapInfoChestType() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; mapInfoChestType = 0; return this; } /** - * optional .MapInfoChestType map_info_chest_Type = 3; + * optional .MapInfoChestType map_info_chest_type = 4; * @return the mapInfoChestType */ public MapInfoChestTypeOuterClass.MapInfoChestType getMapInfoChestType() { @@ -163,18 +79,18 @@ public final class MazeChestOuterClass { * @return this */ public MazeChest setMapInfoChestTypeValue(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; mapInfoChestType = value; return this; } /** - * optional .MapInfoChestType map_info_chest_Type = 3; + * optional .MapInfoChestType map_info_chest_type = 4; * @param value the mapInfoChestType to set * @return this */ public MazeChest setMapInfoChestType(final MapInfoChestTypeOuterClass.MapInfoChestType value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; mapInfoChestType = value.getNumber(); return this; } @@ -184,8 +100,6 @@ public final class MazeChestOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - pOGFOPELNMK = other.pOGFOPELNMK; - gKHHBPAINAO = other.gKHHBPAINAO; mapInfoChestType = other.mapInfoChestType; } return this; @@ -197,12 +111,6 @@ public final class MazeChestOuterClass { return this; } cachedSize = -1; - if (other.hasPOGFOPELNMK()) { - setPOGFOPELNMK(other.pOGFOPELNMK); - } - if (other.hasGKHHBPAINAO()) { - setGKHHBPAINAO(other.gKHHBPAINAO); - } if (other.hasMapInfoChestType()) { setMapInfoChestTypeValue(other.mapInfoChestType); } @@ -216,8 +124,6 @@ public final class MazeChestOuterClass { } cachedSize = -1; bitField0_ = 0; - pOGFOPELNMK = 0; - gKHHBPAINAO = 0; mapInfoChestType = 0; return this; } @@ -242,23 +148,13 @@ public final class MazeChestOuterClass { } MazeChest other = (MazeChest) o; return bitField0_ == other.bitField0_ - && (!hasPOGFOPELNMK() || pOGFOPELNMK == other.pOGFOPELNMK) - && (!hasGKHHBPAINAO() || gKHHBPAINAO == other.gKHHBPAINAO) && (!hasMapInfoChestType() || mapInfoChestType == other.mapInfoChestType); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(pOGFOPELNMK); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(gKHHBPAINAO); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 32); output.writeEnumNoTag(mapInfoChestType); } } @@ -267,12 +163,6 @@ public final class MazeChestOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pOGFOPELNMK); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gKHHBPAINAO); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(mapInfoChestType); } return size; @@ -285,30 +175,12 @@ public final class MazeChestOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { - // pOGFOPELNMK - pOGFOPELNMK = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // gKHHBPAINAO - gKHHBPAINAO = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { + case 32: { // mapInfoChestType final int value = input.readInt32(); if (MapInfoChestTypeOuterClass.MapInfoChestType.forNumber(value) != null) { mapInfoChestType = value; - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } tag = input.readTag(); if (tag != 0) { @@ -333,12 +205,6 @@ public final class MazeChestOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.pOGFOPELNMK, pOGFOPELNMK); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.gKHHBPAINAO, gKHHBPAINAO); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeEnum(FieldNames.mapInfoChestType, mapInfoChestType, MapInfoChestTypeOuterClass.MapInfoChestType.converter()); } output.endObject(); @@ -351,36 +217,14 @@ public final class MazeChestOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1345248838: { - if (input.isAtField(FieldNames.pOGFOPELNMK)) { - if (!input.trySkipNullValue()) { - pOGFOPELNMK = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case -149234974: { - if (input.isAtField(FieldNames.gKHHBPAINAO)) { - if (!input.trySkipNullValue()) { - gKHHBPAINAO = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 602980561: - case -764040922: { + case -763087610: { if (input.isAtField(FieldNames.mapInfoChestType)) { if (!input.trySkipNullValue()) { final MapInfoChestTypeOuterClass.MapInfoChestType value = input.readEnum(MapInfoChestTypeOuterClass.MapInfoChestType.converter()); if (value != null) { mapInfoChestType = value.getNumber(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } else { input.skipUnknownEnumValue(); } @@ -442,11 +286,7 @@ public final class MazeChestOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName pOGFOPELNMK = FieldName.forField("POGFOPELNMK"); - - static final FieldName gKHHBPAINAO = FieldName.forField("GKHHBPAINAO"); - - static final FieldName mapInfoChestType = FieldName.forField("mapInfoChestType", "map_info_chest_Type"); + static final FieldName mapInfoChestType = FieldName.forField("mapInfoChestType", "map_info_chest_type"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java index f396e92..479514d 100644 --- a/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.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 MazeGroupOuterClass { /** @@ -19,26 +18,11 @@ public final class MazeGroupOuterClass { public static final class MazeGroup extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional int64 MCKACFLLDHL = 7; - */ - private long mCKACFLLDHL; - /** * optional uint32 group_id = 10; */ private int groupId; - /** - * optional bool BENLBEGJIMH = 6; - */ - private boolean bENLBEGJIMH; - - /** - * repeated uint32 ALDIKBFEFNM = 4; - */ - private final RepeatedInt aLDIKBFEFNM = RepeatedInt.newEmptyInstance(); - private MazeGroup() { } @@ -49,49 +33,12 @@ public final class MazeGroupOuterClass { return new MazeGroup(); } - /** - * optional int64 MCKACFLLDHL = 7; - * @return whether the mCKACFLLDHL field is set - */ - public boolean hasMCKACFLLDHL() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional int64 MCKACFLLDHL = 7; - * @return this - */ - public MazeGroup clearMCKACFLLDHL() { - bitField0_ &= ~0x00000001; - mCKACFLLDHL = 0L; - return this; - } - - /** - * optional int64 MCKACFLLDHL = 7; - * @return the mCKACFLLDHL - */ - public long getMCKACFLLDHL() { - return mCKACFLLDHL; - } - - /** - * optional int64 MCKACFLLDHL = 7; - * @param value the mCKACFLLDHL to set - * @return this - */ - public MazeGroup setMCKACFLLDHL(final long value) { - bitField0_ |= 0x00000001; - mCKACFLLDHL = value; - return this; - } - /** * optional uint32 group_id = 10; * @return whether the groupId field is set */ public boolean hasGroupId() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -99,7 +46,7 @@ public final class MazeGroupOuterClass { * @return this */ public MazeGroup clearGroupId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; groupId = 0; return this; } @@ -118,125 +65,17 @@ public final class MazeGroupOuterClass { * @return this */ public MazeGroup setGroupId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; groupId = value; return this; } - /** - * optional bool BENLBEGJIMH = 6; - * @return whether the bENLBEGJIMH field is set - */ - public boolean hasBENLBEGJIMH() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional bool BENLBEGJIMH = 6; - * @return this - */ - public MazeGroup clearBENLBEGJIMH() { - bitField0_ &= ~0x00000004; - bENLBEGJIMH = false; - return this; - } - - /** - * optional bool BENLBEGJIMH = 6; - * @return the bENLBEGJIMH - */ - public boolean getBENLBEGJIMH() { - return bENLBEGJIMH; - } - - /** - * optional bool BENLBEGJIMH = 6; - * @param value the bENLBEGJIMH to set - * @return this - */ - public MazeGroup setBENLBEGJIMH(final boolean value) { - bitField0_ |= 0x00000004; - bENLBEGJIMH = value; - return this; - } - - /** - * repeated uint32 ALDIKBFEFNM = 4; - * @return whether the aLDIKBFEFNM field is set - */ - public boolean hasALDIKBFEFNM() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated uint32 ALDIKBFEFNM = 4; - * @return this - */ - public MazeGroup clearALDIKBFEFNM() { - bitField0_ &= ~0x00000008; - aLDIKBFEFNM.clear(); - return this; - } - - /** - * repeated uint32 ALDIKBFEFNM = 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 #getMutableALDIKBFEFNM()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getALDIKBFEFNM() { - return aLDIKBFEFNM; - } - - /** - * repeated uint32 ALDIKBFEFNM = 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 getMutableALDIKBFEFNM() { - bitField0_ |= 0x00000008; - return aLDIKBFEFNM; - } - - /** - * repeated uint32 ALDIKBFEFNM = 4; - * @param value the aLDIKBFEFNM to add - * @return this - */ - public MazeGroup addALDIKBFEFNM(final int value) { - bitField0_ |= 0x00000008; - aLDIKBFEFNM.add(value); - return this; - } - - /** - * repeated uint32 ALDIKBFEFNM = 4; - * @param values the aLDIKBFEFNM to add - * @return this - */ - public MazeGroup addAllALDIKBFEFNM(final int... values) { - bitField0_ |= 0x00000008; - aLDIKBFEFNM.addAll(values); - return this; - } - @Override public MazeGroup copyFrom(final MazeGroup other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - mCKACFLLDHL = other.mCKACFLLDHL; groupId = other.groupId; - bENLBEGJIMH = other.bENLBEGJIMH; - aLDIKBFEFNM.copyFrom(other.aLDIKBFEFNM); } return this; } @@ -247,18 +86,9 @@ public final class MazeGroupOuterClass { return this; } cachedSize = -1; - if (other.hasMCKACFLLDHL()) { - setMCKACFLLDHL(other.mCKACFLLDHL); - } if (other.hasGroupId()) { setGroupId(other.groupId); } - if (other.hasBENLBEGJIMH()) { - setBENLBEGJIMH(other.bENLBEGJIMH); - } - if (other.hasALDIKBFEFNM()) { - getMutableALDIKBFEFNM().addAll(other.aLDIKBFEFNM); - } return this; } @@ -269,10 +99,7 @@ public final class MazeGroupOuterClass { } cachedSize = -1; bitField0_ = 0; - mCKACFLLDHL = 0L; groupId = 0; - bENLBEGJIMH = false; - aLDIKBFEFNM.clear(); return this; } @@ -283,7 +110,6 @@ public final class MazeGroupOuterClass { } cachedSize = -1; bitField0_ = 0; - aLDIKBFEFNM.clear(); return this; } @@ -297,49 +123,23 @@ public final class MazeGroupOuterClass { } MazeGroup other = (MazeGroup) o; return bitField0_ == other.bitField0_ - && (!hasMCKACFLLDHL() || mCKACFLLDHL == other.mCKACFLLDHL) - && (!hasGroupId() || groupId == other.groupId) - && (!hasBENLBEGJIMH() || bENLBEGJIMH == other.bENLBEGJIMH) - && (!hasALDIKBFEFNM() || aLDIKBFEFNM.equals(other.aLDIKBFEFNM)); + && (!hasGroupId() || groupId == other.groupId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeInt64NoTag(mCKACFLLDHL); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 80); output.writeUInt32NoTag(groupId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); - output.writeBoolNoTag(bENLBEGJIMH); - } - if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < aLDIKBFEFNM.length(); i++) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(aLDIKBFEFNM.array()[i]); - } - } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(mCKACFLLDHL); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } - if ((bitField0_ & 0x00000004) != 0) { - size += 2; - } - if ((bitField0_ & 0x00000008) != 0) { - size += (1 * aLDIKBFEFNM.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(aLDIKBFEFNM); - } return size; } @@ -350,37 +150,10 @@ public final class MazeGroupOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // mCKACFLLDHL - mCKACFLLDHL = input.readInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } case 80: { // groupId groupId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // bENLBEGJIMH - bENLBEGJIMH = input.readBool(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 34) { - break; - } - } - case 34: { - // aLDIKBFEFNM [packed=true] - input.readPackedUInt32(aLDIKBFEFNM, tag); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { break; @@ -396,12 +169,6 @@ public final class MazeGroupOuterClass { tag = input.readTag(); break; } - case 32: { - // aLDIKBFEFNM [packed=false] - tag = input.readRepeatedUInt32(aLDIKBFEFNM, tag); - bitField0_ |= 0x00000008; - break; - } } } } @@ -410,17 +177,8 @@ public final class MazeGroupOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.mCKACFLLDHL, mCKACFLLDHL); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.groupId, groupId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeBool(FieldNames.bENLBEGJIMH, bENLBEGJIMH); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.aLDIKBFEFNM, aLDIKBFEFNM); - } output.endObject(); } @@ -431,45 +189,12 @@ public final class MazeGroupOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -599616167: { - if (input.isAtField(FieldNames.mCKACFLLDHL)) { - if (!input.trySkipNullValue()) { - mCKACFLLDHL = input.readInt64(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 293428218: case 506361563: { if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { groupId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1536795933: { - if (input.isAtField(FieldNames.bENLBEGJIMH)) { - if (!input.trySkipNullValue()) { - bENLBEGJIMH = input.readBool(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1230000255: { - if (input.isAtField(FieldNames.aLDIKBFEFNM)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(aLDIKBFEFNM); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -528,13 +253,7 @@ public final class MazeGroupOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName mCKACFLLDHL = FieldName.forField("MCKACFLLDHL"); - static final FieldName groupId = FieldName.forField("groupId", "group_id"); - - static final FieldName bENLBEGJIMH = FieldName.forField("BENLBEGJIMH"); - - static final FieldName aLDIKBFEFNM = FieldName.forField("ALDIKBFEFNM"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java index f86fcba..9f6fbc9 100644 --- a/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java @@ -20,50 +20,46 @@ public final class MazeMapDataOuterClass { public static final class MazeMapData extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 cur_map_entry_id = 1; + */ + private int curMapEntryId; + /** * optional uint32 retcode = 3; */ private int retcode; /** - * optional uint32 cur_map_entry_id = 13; - */ - private int curMapEntryId; - - /** - * 
-     * map KOCFNLDMPHI = 8; // 76
-     *
- * - * optional uint32 entry_id = 14; + * optional uint32 entry_id = 6; */ private int entryId; /** - * repeated uint32 unlocked_teleport_list = 2; - */ - private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 lighten_section_list = 8; + * repeated uint32 lighten_section_list = 4; */ private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); /** - * repeated .MazeChest unlocked_chest_list = 1; + * repeated uint32 unlocked_teleport_list = 11; + */ + private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); + + /** + * repeated .MazeProp maze_prop_list = 5; + */ + private final RepeatedMessage mazePropList = RepeatedMessage.newEmptyInstance(MazePropOuterClass.MazeProp.getFactory()); + + /** + * repeated .MazeChest unlocked_chest_list = 7; */ private final RepeatedMessage unlockedChestList = RepeatedMessage.newEmptyInstance(MazeChestOuterClass.MazeChest.getFactory()); /** - * repeated .MazeGroup maze_group_list = 5; + * repeated .MazeGroup maze_group_list = 14; */ private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory()); - /** - * repeated .MazeProp maze_prop_list = 7; - */ - private final RepeatedMessage mazePropList = RepeatedMessage.newEmptyInstance(MazePropOuterClass.MazeProp.getFactory()); - private MazeMapData() { } @@ -74,12 +70,49 @@ public final class MazeMapDataOuterClass { return new MazeMapData(); } + /** + * optional uint32 cur_map_entry_id = 1; + * @return whether the curMapEntryId field is set + */ + public boolean hasCurMapEntryId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 cur_map_entry_id = 1; + * @return this + */ + public MazeMapData clearCurMapEntryId() { + bitField0_ &= ~0x00000001; + curMapEntryId = 0; + return this; + } + + /** + * optional uint32 cur_map_entry_id = 1; + * @return the curMapEntryId + */ + public int getCurMapEntryId() { + return curMapEntryId; + } + + /** + * optional uint32 cur_map_entry_id = 1; + * @param value the curMapEntryId to set + * @return this + */ + public MazeMapData setCurMapEntryId(final int value) { + bitField0_ |= 0x00000001; + curMapEntryId = value; + return this; + } + /** * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -87,7 +120,7 @@ public final class MazeMapDataOuterClass { * @return this */ public MazeMapData clearRetcode() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; retcode = 0; return this; } @@ -106,54 +139,13 @@ public final class MazeMapDataOuterClass { * @return this */ public MazeMapData setRetcode(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; retcode = value; return this; } /** - * optional uint32 cur_map_entry_id = 13; - * @return whether the curMapEntryId field is set - */ - public boolean hasCurMapEntryId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cur_map_entry_id = 13; - * @return this - */ - public MazeMapData clearCurMapEntryId() { - bitField0_ &= ~0x00000002; - curMapEntryId = 0; - return this; - } - - /** - * optional uint32 cur_map_entry_id = 13; - * @return the curMapEntryId - */ - public int getCurMapEntryId() { - return curMapEntryId; - } - - /** - * optional uint32 cur_map_entry_id = 13; - * @param value the curMapEntryId to set - * @return this - */ - public MazeMapData setCurMapEntryId(final int value) { - bitField0_ |= 0x00000002; - curMapEntryId = value; - return this; - } - - /** - * 
-     * map KOCFNLDMPHI = 8; // 76
-     *
- * - * optional uint32 entry_id = 14; + * optional uint32 entry_id = 6; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -161,11 +153,7 @@ public final class MazeMapDataOuterClass { } /** - * 
-     * map KOCFNLDMPHI = 8; // 76
-     *
- * - * optional uint32 entry_id = 14; + * optional uint32 entry_id = 6; * @return this */ public MazeMapData clearEntryId() { @@ -175,11 +163,7 @@ public final class MazeMapDataOuterClass { } /** - * 
-     * map KOCFNLDMPHI = 8; // 76
-     *
- * - * optional uint32 entry_id = 14; + * optional uint32 entry_id = 6; * @return the entryId */ public int getEntryId() { @@ -187,11 +171,7 @@ public final class MazeMapDataOuterClass { } /** - * 
-     * map KOCFNLDMPHI = 8; // 76
-     *
- * - * optional uint32 entry_id = 14; + * optional uint32 entry_id = 6; * @param value the entryId to set * @return this */ @@ -202,93 +182,25 @@ public final class MazeMapDataOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 2; - * @return whether the unlockedTeleportList field is set + * repeated uint32 lighten_section_list = 4; + * @return whether the lightenSectionList field is set */ - public boolean hasUnlockedTeleportList() { + public boolean hasLightenSectionList() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated uint32 unlocked_teleport_list = 2; - * @return this - */ - public MazeMapData clearUnlockedTeleportList() { - bitField0_ &= ~0x00000008; - unlockedTeleportList.clear(); - return this; - } - - /** - * 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. - * - * Use {@link #getMutableUnlockedTeleportList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getUnlockedTeleportList() { - return unlockedTeleportList; - } - - /** - * repeated uint32 unlocked_teleport_list = 2; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableUnlockedTeleportList() { - bitField0_ |= 0x00000008; - return unlockedTeleportList; - } - - /** - * repeated uint32 unlocked_teleport_list = 2; - * @param value the unlockedTeleportList to add - * @return this - */ - public MazeMapData addUnlockedTeleportList(final int value) { - bitField0_ |= 0x00000008; - unlockedTeleportList.add(value); - return this; - } - - /** - * repeated uint32 unlocked_teleport_list = 2; - * @param values the unlockedTeleportList to add - * @return this - */ - public MazeMapData addAllUnlockedTeleportList(final int... values) { - bitField0_ |= 0x00000008; - unlockedTeleportList.addAll(values); - return this; - } - - /** - * repeated uint32 lighten_section_list = 8; - * @return whether the lightenSectionList field is set - */ - public boolean hasLightenSectionList() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated uint32 lighten_section_list = 8; + * repeated uint32 lighten_section_list = 4; * @return this */ public MazeMapData clearLightenSectionList() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; lightenSectionList.clear(); return this; } /** - * repeated uint32 lighten_section_list = 8; + * repeated uint32 lighten_section_list = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -302,7 +214,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated uint32 lighten_section_list = 8; + * repeated uint32 lighten_section_list = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -311,188 +223,120 @@ public final class MazeMapDataOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableLightenSectionList() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return lightenSectionList; } /** - * repeated uint32 lighten_section_list = 8; + * repeated uint32 lighten_section_list = 4; * @param value the lightenSectionList to add * @return this */ public MazeMapData addLightenSectionList(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; lightenSectionList.add(value); return this; } /** - * repeated uint32 lighten_section_list = 8; + * repeated uint32 lighten_section_list = 4; * @param values the lightenSectionList to add * @return this */ public MazeMapData addAllLightenSectionList(final int... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; lightenSectionList.addAll(values); return this; } /** - * repeated .MazeChest unlocked_chest_list = 1; - * @return whether the unlockedChestList field is set + * repeated uint32 unlocked_teleport_list = 11; + * @return whether the unlockedTeleportList field is set */ - public boolean hasUnlockedChestList() { + public boolean hasUnlockedTeleportList() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * repeated uint32 unlocked_teleport_list = 11; + * @return this + */ + public MazeMapData clearUnlockedTeleportList() { + bitField0_ &= ~0x00000010; + unlockedTeleportList.clear(); + return this; + } + + /** + * repeated uint32 unlocked_teleport_list = 11; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableUnlockedTeleportList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getUnlockedTeleportList() { + return unlockedTeleportList; + } + + /** + * repeated uint32 unlocked_teleport_list = 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 getMutableUnlockedTeleportList() { + bitField0_ |= 0x00000010; + return unlockedTeleportList; + } + + /** + * repeated uint32 unlocked_teleport_list = 11; + * @param value the unlockedTeleportList to add + * @return this + */ + public MazeMapData addUnlockedTeleportList(final int value) { + bitField0_ |= 0x00000010; + unlockedTeleportList.add(value); + return this; + } + + /** + * repeated uint32 unlocked_teleport_list = 11; + * @param values the unlockedTeleportList to add + * @return this + */ + public MazeMapData addAllUnlockedTeleportList(final int... values) { + bitField0_ |= 0x00000010; + unlockedTeleportList.addAll(values); + return this; + } + + /** + * repeated .MazeProp maze_prop_list = 5; + * @return whether the mazePropList field is set + */ + public boolean hasMazePropList() { return (bitField0_ & 0x00000020) != 0; } /** - * repeated .MazeChest unlocked_chest_list = 1; - * @return this - */ - public MazeMapData clearUnlockedChestList() { - bitField0_ &= ~0x00000020; - unlockedChestList.clear(); - return this; - } - - /** - * repeated .MazeChest unlocked_chest_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 #getMutableUnlockedChestList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getUnlockedChestList() { - return unlockedChestList; - } - - /** - * repeated .MazeChest unlocked_chest_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 getMutableUnlockedChestList() { - bitField0_ |= 0x00000020; - return unlockedChestList; - } - - /** - * repeated .MazeChest unlocked_chest_list = 1; - * @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 = 1; - * @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 = 5; - * @return whether the mazeGroupList field is set - */ - public boolean hasMazeGroupList() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * repeated .MazeGroup maze_group_list = 5; - * @return this - */ - public MazeMapData clearMazeGroupList() { - bitField0_ &= ~0x00000040; - mazeGroupList.clear(); - return this; - } - - /** - * repeated .MazeGroup maze_group_list = 5; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableMazeGroupList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMazeGroupList() { - return mazeGroupList; - } - - /** - * repeated .MazeGroup maze_group_list = 5; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableMazeGroupList() { - bitField0_ |= 0x00000040; - return mazeGroupList; - } - - /** - * repeated .MazeGroup maze_group_list = 5; - * @param value the mazeGroupList to add - * @return this - */ - public MazeMapData addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) { - bitField0_ |= 0x00000040; - mazeGroupList.add(value); - return this; - } - - /** - * repeated .MazeGroup maze_group_list = 5; - * @param values the mazeGroupList to add - * @return this - */ - public MazeMapData addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) { - bitField0_ |= 0x00000040; - mazeGroupList.addAll(values); - return this; - } - - /** - * repeated .MazeProp maze_prop_list = 7; - * @return whether the mazePropList field is set - */ - public boolean hasMazePropList() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated .MazeProp maze_prop_list = 7; + * repeated .MazeProp maze_prop_list = 5; * @return this */ public MazeMapData clearMazePropList() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000020; mazePropList.clear(); return this; } /** - * repeated .MazeProp maze_prop_list = 7; + * repeated .MazeProp maze_prop_list = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -506,7 +350,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated .MazeProp maze_prop_list = 7; + * repeated .MazeProp maze_prop_list = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -515,45 +359,181 @@ public final class MazeMapDataOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMazePropList() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; return mazePropList; } /** - * repeated .MazeProp maze_prop_list = 7; + * repeated .MazeProp maze_prop_list = 5; * @param value the mazePropList to add * @return this */ public MazeMapData addMazePropList(final MazePropOuterClass.MazeProp value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; mazePropList.add(value); return this; } /** - * repeated .MazeProp maze_prop_list = 7; + * repeated .MazeProp maze_prop_list = 5; * @param values the mazePropList to add * @return this */ public MazeMapData addAllMazePropList(final MazePropOuterClass.MazeProp... values) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; mazePropList.addAll(values); return this; } + /** + * repeated .MazeChest unlocked_chest_list = 7; + * @return whether the unlockedChestList field is set + */ + public boolean hasUnlockedChestList() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * repeated .MazeChest unlocked_chest_list = 7; + * @return this + */ + public MazeMapData clearUnlockedChestList() { + bitField0_ &= ~0x00000040; + unlockedChestList.clear(); + return this; + } + + /** + * repeated .MazeChest unlocked_chest_list = 7; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableUnlockedChestList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getUnlockedChestList() { + return unlockedChestList; + } + + /** + * repeated .MazeChest unlocked_chest_list = 7; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableUnlockedChestList() { + bitField0_ |= 0x00000040; + return unlockedChestList; + } + + /** + * repeated .MazeChest unlocked_chest_list = 7; + * @param value the unlockedChestList to add + * @return this + */ + public MazeMapData addUnlockedChestList(final MazeChestOuterClass.MazeChest value) { + bitField0_ |= 0x00000040; + unlockedChestList.add(value); + return this; + } + + /** + * repeated .MazeChest unlocked_chest_list = 7; + * @param values the unlockedChestList to add + * @return this + */ + public MazeMapData addAllUnlockedChestList(final MazeChestOuterClass.MazeChest... values) { + bitField0_ |= 0x00000040; + unlockedChestList.addAll(values); + return this; + } + + /** + * repeated .MazeGroup maze_group_list = 14; + * @return whether the mazeGroupList field is set + */ + public boolean hasMazeGroupList() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * repeated .MazeGroup maze_group_list = 14; + * @return this + */ + public MazeMapData clearMazeGroupList() { + bitField0_ &= ~0x00000080; + mazeGroupList.clear(); + return this; + } + + /** + * repeated .MazeGroup maze_group_list = 14; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableMazeGroupList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMazeGroupList() { + return mazeGroupList; + } + + /** + * repeated .MazeGroup maze_group_list = 14; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableMazeGroupList() { + bitField0_ |= 0x00000080; + return mazeGroupList; + } + + /** + * repeated .MazeGroup maze_group_list = 14; + * @param value the mazeGroupList to add + * @return this + */ + public MazeMapData addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) { + bitField0_ |= 0x00000080; + mazeGroupList.add(value); + return this; + } + + /** + * repeated .MazeGroup maze_group_list = 14; + * @param values the mazeGroupList to add + * @return this + */ + public MazeMapData addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) { + bitField0_ |= 0x00000080; + mazeGroupList.addAll(values); + return this; + } + @Override public MazeMapData copyFrom(final MazeMapData other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; curMapEntryId = other.curMapEntryId; + retcode = other.retcode; entryId = other.entryId; - unlockedTeleportList.copyFrom(other.unlockedTeleportList); lightenSectionList.copyFrom(other.lightenSectionList); + unlockedTeleportList.copyFrom(other.unlockedTeleportList); + mazePropList.copyFrom(other.mazePropList); unlockedChestList.copyFrom(other.unlockedChestList); mazeGroupList.copyFrom(other.mazeGroupList); - mazePropList.copyFrom(other.mazePropList); } return this; } @@ -564,20 +544,23 @@ public final class MazeMapDataOuterClass { 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); } + if (other.hasLightenSectionList()) { + getMutableLightenSectionList().addAll(other.lightenSectionList); + } if (other.hasUnlockedTeleportList()) { getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList); } - if (other.hasLightenSectionList()) { - getMutableLightenSectionList().addAll(other.lightenSectionList); + if (other.hasMazePropList()) { + getMutableMazePropList().addAll(other.mazePropList); } if (other.hasUnlockedChestList()) { getMutableUnlockedChestList().addAll(other.unlockedChestList); @@ -585,9 +568,6 @@ public final class MazeMapDataOuterClass { if (other.hasMazeGroupList()) { getMutableMazeGroupList().addAll(other.mazeGroupList); } - if (other.hasMazePropList()) { - getMutableMazePropList().addAll(other.mazePropList); - } return this; } @@ -598,14 +578,14 @@ public final class MazeMapDataOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; curMapEntryId = 0; + retcode = 0; entryId = 0; - unlockedTeleportList.clear(); lightenSectionList.clear(); + unlockedTeleportList.clear(); + mazePropList.clear(); unlockedChestList.clear(); mazeGroupList.clear(); - mazePropList.clear(); return this; } @@ -616,11 +596,11 @@ public final class MazeMapDataOuterClass { } cachedSize = -1; bitField0_ = 0; - unlockedTeleportList.clear(); lightenSectionList.clear(); + unlockedTeleportList.clear(); + mazePropList.clearQuick(); unlockedChestList.clearQuick(); mazeGroupList.clearQuick(); - mazePropList.clearQuick(); return this; } @@ -634,58 +614,58 @@ public final class MazeMapDataOuterClass { } MazeMapData other = (MazeMapData) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId) + && (!hasRetcode() || retcode == other.retcode) && (!hasEntryId() || entryId == other.entryId) - && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList)) && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) + && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList)) + && (!hasMazePropList() || mazePropList.equals(other.mazePropList)) && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList)) - && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)) - && (!hasMazePropList() || mazePropList.equals(other.mazePropList)); + && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(curMapEntryId); + } + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(curMapEntryId); - } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < unlockedTeleportList.length(); i++) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(unlockedTeleportList.array()[i]); - } - } - if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < lightenSectionList.length(); i++) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(lightenSectionList.array()[i]); } } + if ((bitField0_ & 0x00000010) != 0) { + for (int i = 0; i < unlockedTeleportList.length(); i++) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(unlockedTeleportList.array()[i]); + } + } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < unlockedChestList.length(); i++) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(unlockedChestList.get(i)); + for (int i = 0; i < mazePropList.length(); i++) { + output.writeRawByte((byte) 42); + output.writeMessageNoTag(mazePropList.get(i)); } } if ((bitField0_ & 0x00000040) != 0) { - for (int i = 0; i < mazeGroupList.length(); i++) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(mazeGroupList.get(i)); + for (int i = 0; i < unlockedChestList.length(); i++) { + output.writeRawByte((byte) 58); + output.writeMessageNoTag(unlockedChestList.get(i)); } } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < mazePropList.length(); i++) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(mazePropList.get(i)); + for (int i = 0; i < mazeGroupList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(mazeGroupList.get(i)); } } } @@ -694,28 +674,28 @@ public final class MazeMapDataOuterClass { 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); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList); - } - if ((bitField0_ & 0x00000010) != 0) { size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); } + if ((bitField0_ & 0x00000010) != 0) { + size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList); + } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); + size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); } if ((bitField0_ & 0x00000040) != 0) { - size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); + size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); + size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); } return size; } @@ -727,70 +707,70 @@ public final class MazeMapDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { + case 8: { + // curMapEntryId + curMapEntryId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 24) { + break; + } + } case 24: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // curMapEntryId - curMapEntryId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 48) { break; } } - case 112: { + case 48: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 18) { + if (tag != 34) { break; } } - case 18: { - // unlockedTeleportList [packed=true] - input.readPackedUInt32(unlockedTeleportList, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { + case 34: { // lightenSectionList [packed=true] input.readPackedUInt32(lightenSectionList, tag); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 10) { + if (tag != 90) { break; } } - case 10: { - // unlockedChestList - tag = input.readRepeatedMessage(unlockedChestList, tag); - bitField0_ |= 0x00000020; + case 90: { + // unlockedTeleportList [packed=true] + input.readPackedUInt32(unlockedTeleportList, tag); + bitField0_ |= 0x00000010; + tag = input.readTag(); if (tag != 42) { break; } } case 42: { - // mazeGroupList - tag = input.readRepeatedMessage(mazeGroupList, tag); - bitField0_ |= 0x00000040; + // mazePropList + tag = input.readRepeatedMessage(mazePropList, tag); + bitField0_ |= 0x00000020; if (tag != 58) { break; } } case 58: { - // mazePropList - tag = input.readRepeatedMessage(mazePropList, tag); + // unlockedChestList + tag = input.readRepeatedMessage(unlockedChestList, tag); + bitField0_ |= 0x00000040; + if (tag != 114) { + break; + } + } + case 114: { + // mazeGroupList + tag = input.readRepeatedMessage(mazeGroupList, tag); bitField0_ |= 0x00000080; if (tag != 0) { break; @@ -806,15 +786,15 @@ public final class MazeMapDataOuterClass { tag = input.readTag(); break; } - case 16: { - // unlockedTeleportList [packed=false] - tag = input.readRepeatedUInt32(unlockedTeleportList, tag); + case 32: { + // lightenSectionList [packed=false] + tag = input.readRepeatedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000008; break; } - case 64: { - // lightenSectionList [packed=false] - tag = input.readRepeatedUInt32(lightenSectionList, tag); + case 88: { + // unlockedTeleportList [packed=false] + tag = input.readRepeatedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000010; break; } @@ -826,28 +806,28 @@ public final class MazeMapDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.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); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList); - } - if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); + output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); + output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); + output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); } output.endObject(); } @@ -859,10 +839,11 @@ public final class MazeMapDataOuterClass { } 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 { @@ -870,11 +851,10 @@ public final class MazeMapDataOuterClass { } 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 { @@ -894,11 +874,11 @@ public final class MazeMapDataOuterClass { } break; } - case 856936684: - case -10753834: { - if (input.isAtField(FieldNames.unlockedTeleportList)) { + case -1942343836: + case 1328850360: { + if (input.isAtField(FieldNames.lightenSectionList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(unlockedTeleportList); + input.readRepeatedUInt32(lightenSectionList); bitField0_ |= 0x00000008; } } else { @@ -906,11 +886,11 @@ public final class MazeMapDataOuterClass { } break; } - case -1942343836: - case 1328850360: { - if (input.isAtField(FieldNames.lightenSectionList)) { + case 856936684: + case -10753834: { + if (input.isAtField(FieldNames.unlockedTeleportList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(lightenSectionList); + input.readRepeatedUInt32(unlockedTeleportList); bitField0_ |= 0x00000010; } } else { @@ -918,35 +898,35 @@ 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; - } - } else { - input.skipUnknownField(); - } - break; - } case 1676123008: case 1875839866: { if (input.isAtField(FieldNames.mazePropList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(mazePropList); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case -337762404: + case 231688696: { + if (input.isAtField(FieldNames.unlockedChestList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(unlockedChestList); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } + case -317054274: + case 407435998: { + if (input.isAtField(FieldNames.mazeGroupList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(mazeGroupList); bitField0_ |= 0x00000080; } } else { @@ -1006,21 +986,21 @@ public final class MazeMapDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id"); + static final FieldName 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 lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); + static final FieldName mazePropList = FieldName.forField("mazePropList", "maze_prop_list"); static final FieldName unlockedChestList = FieldName.forField("unlockedChestList", "unlocked_chest_list"); static final FieldName mazeGroupList = FieldName.forField("mazeGroupList", "maze_group_list"); - - static final FieldName mazePropList = FieldName.forField("mazePropList", "maze_prop_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java index e8645fe..9a33394 100644 --- a/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java @@ -19,19 +19,19 @@ public final class MazePropOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 state = 3; + * optional uint32 group_id = 2; */ - private int state; + private int groupId; /** - * optional uint32 config_id = 10; + * optional uint32 config_id = 5; */ private int configId; /** - * optional uint32 group_id = 15; + * optional uint32 state = 6; */ - private int groupId; + private int state; private MazeProp() { } @@ -44,44 +44,44 @@ public final class MazePropOuterClass { } /** - * optional uint32 state = 3; - * @return whether the state field is set + * optional uint32 group_id = 2; + * @return whether the groupId field is set */ - public boolean hasState() { + public boolean hasGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 state = 3; + * optional uint32 group_id = 2; * @return this */ - public MazeProp clearState() { + public MazeProp clearGroupId() { bitField0_ &= ~0x00000001; - state = 0; + groupId = 0; return this; } /** - * optional uint32 state = 3; - * @return the state + * optional uint32 group_id = 2; + * @return the groupId */ - public int getState() { - return state; + public int getGroupId() { + return groupId; } /** - * optional uint32 state = 3; - * @param value the state to set + * optional uint32 group_id = 2; + * @param value the groupId to set * @return this */ - public MazeProp setState(final int value) { + public MazeProp setGroupId(final int value) { bitField0_ |= 0x00000001; - state = value; + groupId = value; return this; } /** - * optional uint32 config_id = 10; + * optional uint32 config_id = 5; * @return whether the configId field is set */ public boolean hasConfigId() { @@ -89,7 +89,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 config_id = 10; + * optional uint32 config_id = 5; * @return this */ public MazeProp clearConfigId() { @@ -99,7 +99,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 config_id = 10; + * optional uint32 config_id = 5; * @return the configId */ public int getConfigId() { @@ -107,7 +107,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 config_id = 10; + * optional uint32 config_id = 5; * @param value the configId to set * @return this */ @@ -118,39 +118,39 @@ public final class MazePropOuterClass { } /** - * optional uint32 group_id = 15; - * @return whether the groupId field is set + * optional uint32 state = 6; + * @return whether the state field is set */ - public boolean hasGroupId() { + public boolean hasState() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 group_id = 15; + * optional uint32 state = 6; * @return this */ - public MazeProp clearGroupId() { + public MazeProp clearState() { bitField0_ &= ~0x00000004; - groupId = 0; + state = 0; return this; } /** - * optional uint32 group_id = 15; - * @return the groupId + * optional uint32 state = 6; + * @return the state */ - public int getGroupId() { - return groupId; + public int getState() { + return state; } /** - * optional uint32 group_id = 15; - * @param value the groupId to set + * optional uint32 state = 6; + * @param value the state to set * @return this */ - public MazeProp setGroupId(final int value) { + public MazeProp setState(final int value) { bitField0_ |= 0x00000004; - groupId = value; + state = value; return this; } @@ -159,9 +159,9 @@ public final class MazePropOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - state = other.state; - configId = other.configId; groupId = other.groupId; + configId = other.configId; + state = other.state; } return this; } @@ -172,14 +172,14 @@ public final class MazePropOuterClass { return this; } cachedSize = -1; - if (other.hasState()) { - setState(other.state); + if (other.hasGroupId()) { + setGroupId(other.groupId); } if (other.hasConfigId()) { setConfigId(other.configId); } - if (other.hasGroupId()) { - setGroupId(other.groupId); + if (other.hasState()) { + setState(other.state); } return this; } @@ -191,9 +191,9 @@ public final class MazePropOuterClass { } cachedSize = -1; bitField0_ = 0; - state = 0; - configId = 0; groupId = 0; + configId = 0; + state = 0; return this; } @@ -217,24 +217,24 @@ public final class MazePropOuterClass { } MazeProp other = (MazeProp) o; return bitField0_ == other.bitField0_ - && (!hasState() || state == other.state) + && (!hasGroupId() || groupId == other.groupId) && (!hasConfigId() || configId == other.configId) - && (!hasGroupId() || groupId == other.groupId); + && (!hasState() || state == other.state); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(state); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(configId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 48); + 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(state); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { 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 24: { - // state - state = input.readUInt32(); + case 16: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 40) { break; } } - case 80: { + case 40: { // configId configId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 120) { + if (tag != 48) { break; } } - case 120: { - // groupId - groupId = input.readUInt32(); + case 48: { + // 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.state, state); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.configId, configId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.state, state); } output.endObject(); } @@ -323,10 +323,11 @@ public final class MazePropOuterClass { } 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 { @@ -346,11 +347,10 @@ public final class MazePropOuterClass { } 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_ |= 0x00000004; } } else { @@ -410,11 +410,11 @@ public final class MazePropOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName state = FieldName.forField("state"); + static final FieldName groupId = FieldName.forField("groupId", "group_id"); static final FieldName configId = FieldName.forField("configId", "config_id"); - static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName state = FieldName.forField("state"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java b/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java index 4f3728a..1db9dda 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 = 14; - */ - private int progress; - - /** - * optional uint32 id = 15; + * optional uint32 id = 5; */ private int id; /** - * optional .MissionStatus status = 8; + * optional uint32 progress = 15; + */ + private int progress; + + /** + * optional .MissionStatus status = 1; */ private int status; @@ -44,62 +44,25 @@ public final class MissionOuterClass { } /** - * optional uint32 progress = 14; - * @return whether the progress field is set + * optional uint32 id = 5; + * @return whether the id field is set */ - public boolean hasProgress() { + public boolean hasId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 progress = 14; - * @return this - */ - public Mission clearProgress() { - bitField0_ &= ~0x00000001; - progress = 0; - return this; - } - - /** - * optional uint32 progress = 14; - * @return the progress - */ - public int getProgress() { - return progress; - } - - /** - * optional uint32 progress = 14; - * @param value the progress to set - * @return this - */ - public Mission setProgress(final int value) { - bitField0_ |= 0x00000001; - progress = value; - return this; - } - - /** - * optional uint32 id = 15; - * @return whether the id field is set - */ - public boolean hasId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 id = 15; + * optional uint32 id = 5; * @return this */ public Mission clearId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; id = 0; return this; } /** - * optional uint32 id = 15; + * optional uint32 id = 5; * @return the id */ public int getId() { @@ -107,18 +70,55 @@ public final class MissionOuterClass { } /** - * optional uint32 id = 15; + * optional uint32 id = 5; * @param value the id to set * @return this */ public Mission setId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; id = value; return this; } /** - * optional .MissionStatus status = 8; + * optional uint32 progress = 15; + * @return whether the progress field is set + */ + public boolean hasProgress() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 progress = 15; + * @return this + */ + public Mission clearProgress() { + bitField0_ &= ~0x00000002; + progress = 0; + return this; + } + + /** + * optional uint32 progress = 15; + * @return the progress + */ + public int getProgress() { + return progress; + } + + /** + * optional uint32 progress = 15; + * @param value the progress to set + * @return this + */ + public Mission setProgress(final int value) { + bitField0_ |= 0x00000002; + progress = value; + return this; + } + + /** + * 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 */ @@ -184,8 +184,8 @@ public final class MissionOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - progress = other.progress; id = other.id; + progress = other.progress; status = other.status; } return this; @@ -197,12 +197,12 @@ public final class MissionOuterClass { return this; } cachedSize = -1; - if (other.hasProgress()) { - setProgress(other.progress); - } if (other.hasId()) { setId(other.id); } + if (other.hasProgress()) { + setProgress(other.progress); + } if (other.hasStatus()) { setStatusValue(other.status); } @@ -216,8 +216,8 @@ public final class MissionOuterClass { } cachedSize = -1; bitField0_ = 0; - progress = 0; id = 0; + progress = 0; status = 0; return this; } @@ -242,23 +242,23 @@ public final class MissionOuterClass { } Mission other = (Mission) o; return bitField0_ == other.bitField0_ - && (!hasProgress() || progress == other.progress) && (!hasId() || id == other.id) + && (!hasProgress() || progress == other.progress) && (!hasStatus() || status == other.status); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(progress); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(id); + output.writeUInt32NoTag(progress); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 8); output.writeEnumNoTag(status); } } @@ -267,10 +267,10 @@ public final class MissionOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(progress); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(progress); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(status); @@ -285,9 +285,9 @@ public final class MissionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { - // progress - progress = input.readUInt32(); + case 40: { + // id + id = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 120) { @@ -295,15 +295,15 @@ public final class MissionOuterClass { } } case 120: { - // id - id = input.readUInt32(); + // progress + progress = 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) { @@ -333,10 +333,10 @@ public final class MissionOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.progress, progress); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.progress, progress); } if ((bitField0_ & 0x00000004) != 0) { output.writeEnum(FieldNames.status, status, MissionStatusOuterClass.MissionStatus.converter()); @@ -351,10 +351,10 @@ public final class MissionOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1001078227: { - if (input.isAtField(FieldNames.progress)) { + case 3355: { + if (input.isAtField(FieldNames.id)) { if (!input.trySkipNullValue()) { - progress = input.readUInt32(); + id = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -362,10 +362,10 @@ public final class MissionOuterClass { } break; } - case 3355: { - if (input.isAtField(FieldNames.id)) { + case -1001078227: { + if (input.isAtField(FieldNames.progress)) { if (!input.trySkipNullValue()) { - id = input.readUInt32(); + progress = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -441,10 +441,10 @@ public final class MissionOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName progress = FieldName.forField("progress"); - static final FieldName id = FieldName.forField("id"); + static final FieldName progress = FieldName.forField("progress"); + static final FieldName status = FieldName.forField("status"); } } diff --git a/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java index 8648ae7..8113e3b 100644 --- a/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java @@ -19,15 +19,15 @@ public final class MotionInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .Vector rot = 4; - */ - private final VectorOuterClass.Vector rot = VectorOuterClass.Vector.newInstance(); - - /** - * optional .Vector pos = 13; + * optional .Vector pos = 1; */ private final VectorOuterClass.Vector pos = VectorOuterClass.Vector.newInstance(); + /** + * optional .Vector rot = 3; + */ + private final VectorOuterClass.Vector rot = VectorOuterClass.Vector.newInstance(); + private MotionInfo() { } @@ -39,82 +39,25 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector rot = 4; - * @return whether the rot field is set + * optional .Vector pos = 1; + * @return whether the pos field is set */ - public boolean hasRot() { + public boolean hasPos() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .Vector rot = 4; - * @return this - */ - public MotionInfo clearRot() { - bitField0_ &= ~0x00000001; - rot.clear(); - return this; - } - - /** - * optional .Vector rot = 4; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRot()} if you want to modify it. - * - * @return internal storage object for reading - */ - public VectorOuterClass.Vector getRot() { - return rot; - } - - /** - * optional .Vector rot = 4; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public VectorOuterClass.Vector getMutableRot() { - bitField0_ |= 0x00000001; - return rot; - } - - /** - * optional .Vector rot = 4; - * @param value the rot to set - * @return this - */ - public MotionInfo setRot(final VectorOuterClass.Vector value) { - bitField0_ |= 0x00000001; - rot.copyFrom(value); - return this; - } - - /** - * optional .Vector pos = 13; - * @return whether the pos field is set - */ - public boolean hasPos() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .Vector pos = 13; + * optional .Vector pos = 1; * @return this */ public MotionInfo clearPos() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; pos.clear(); return this; } /** - * optional .Vector pos = 13; + * optional .Vector pos = 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. @@ -128,7 +71,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector pos = 13; + * optional .Vector pos = 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 @@ -137,28 +80,85 @@ public final class MotionInfoOuterClass { * @return internal storage object for modifications */ public VectorOuterClass.Vector getMutablePos() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return pos; } /** - * optional .Vector pos = 13; + * optional .Vector pos = 1; * @param value the pos to set * @return this */ public MotionInfo setPos(final VectorOuterClass.Vector value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; pos.copyFrom(value); return this; } + /** + * optional .Vector rot = 3; + * @return whether the rot field is set + */ + public boolean hasRot() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .Vector rot = 3; + * @return this + */ + public MotionInfo clearRot() { + bitField0_ &= ~0x00000002; + rot.clear(); + return this; + } + + /** + * optional .Vector rot = 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 #getMutableRot()} if you want to modify it. + * + * @return internal storage object for reading + */ + public VectorOuterClass.Vector getRot() { + return rot; + } + + /** + * optional .Vector rot = 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 VectorOuterClass.Vector getMutableRot() { + bitField0_ |= 0x00000002; + return rot; + } + + /** + * optional .Vector rot = 3; + * @param value the rot to set + * @return this + */ + public MotionInfo setRot(final VectorOuterClass.Vector value) { + bitField0_ |= 0x00000002; + rot.copyFrom(value); + return this; + } + @Override public MotionInfo copyFrom(final MotionInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rot.copyFrom(other.rot); pos.copyFrom(other.pos); + rot.copyFrom(other.rot); } return this; } @@ -169,12 +169,12 @@ public final class MotionInfoOuterClass { return this; } cachedSize = -1; - if (other.hasRot()) { - getMutableRot().mergeFrom(other.rot); - } if (other.hasPos()) { getMutablePos().mergeFrom(other.pos); } + if (other.hasRot()) { + getMutableRot().mergeFrom(other.rot); + } return this; } @@ -185,8 +185,8 @@ public final class MotionInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rot.clear(); pos.clear(); + rot.clear(); return this; } @@ -197,8 +197,8 @@ public final class MotionInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rot.clearQuick(); pos.clearQuick(); + rot.clearQuick(); return this; } @@ -212,19 +212,19 @@ public final class MotionInfoOuterClass { } MotionInfo other = (MotionInfo) o; return bitField0_ == other.bitField0_ - && (!hasRot() || rot.equals(other.rot)) - && (!hasPos() || pos.equals(other.pos)); + && (!hasPos() || pos.equals(other.pos)) + && (!hasRot() || rot.equals(other.rot)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(rot); + output.writeRawByte((byte) 10); + output.writeMessageNoTag(pos); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); - output.writeMessageNoTag(pos); + output.writeRawByte((byte) 26); + output.writeMessageNoTag(rot); } } @@ -232,10 +232,10 @@ public final class MotionInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rot); + size += 1 + ProtoSink.computeMessageSizeNoTag(pos); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(pos); + size += 1 + ProtoSink.computeMessageSizeNoTag(rot); } return size; } @@ -247,18 +247,18 @@ public final class MotionInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { - // rot - input.readMessage(rot); + case 10: { + // pos + input.readMessage(pos); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 26) { break; } } - case 106: { - // pos - input.readMessage(pos); + case 26: { + // rot + input.readMessage(rot); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -283,10 +283,10 @@ public final class MotionInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.rot, rot); + output.writeMessage(FieldNames.pos, pos); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.pos, pos); + output.writeMessage(FieldNames.rot, rot); } output.endObject(); } @@ -298,10 +298,10 @@ public final class MotionInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 113111: { - if (input.isAtField(FieldNames.rot)) { + case 111188: { + if (input.isAtField(FieldNames.pos)) { if (!input.trySkipNullValue()) { - input.readMessage(rot); + input.readMessage(pos); bitField0_ |= 0x00000001; } } else { @@ -309,10 +309,10 @@ public final class MotionInfoOuterClass { } break; } - case 111188: { - if (input.isAtField(FieldNames.pos)) { + case 113111: { + if (input.isAtField(FieldNames.rot)) { if (!input.trySkipNullValue()) { - input.readMessage(pos); + input.readMessage(rot); bitField0_ |= 0x00000002; } } else { @@ -372,9 +372,9 @@ public final class MotionInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rot = FieldName.forField("rot"); - static final FieldName pos = FieldName.forField("pos"); + + static final FieldName rot = FieldName.forField("rot"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java index 9b63928..a6d3880 100644 --- a/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java @@ -12,7 +12,6 @@ import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; import us.hebi.quickbuf.RepeatedByte; import us.hebi.quickbuf.RepeatedMessage; -import us.hebi.quickbuf.Utf8String; public final class PVEBattleResultCsReqOuterClass { /** @@ -22,52 +21,37 @@ public final class PVEBattleResultCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 KIGBBBPDKEB = 2; + * optional uint32 cost_time = 4; */ - private int kIGBBBPDKEB; + private int costTime; /** - * optional uint32 stage_id = 3; + * optional uint32 stage_id = 6; */ private int stageId; /** - * optional uint32 CKGDEAKGMLJ = 7; - */ - private int cKGDEAKGMLJ; - - /** - * optional uint32 battle_id = 10; + * optional uint32 battle_id = 9; */ private int battleId; /** - * optional uint32 client_res_version = 11; + * optional uint32 client_res_version = 14; */ private int clientResVersion; /** - * optional uint32 KBHKHHAKPND = 14; - */ - private int kBHKHHAKPND; - - /** - * optional .BattleEndStatus end_status = 4; + * optional .BattleEndStatus end_status = 15; */ private int endStatus; /** - * optional bool OKEOKGAICEL = 6; - */ - private boolean oKEOKGAICEL; - - /** - * optional bool is_ai_consider_ultra_skill = 13; + * optional bool is_ai_consider_ultra_skill = 12; */ private boolean isAiConsiderUltraSkill; /** - * optional .BattleStatistics stt = 15; + * optional .BattleStatistics stt = 10; */ private final BattleStatisticsOuterClass.BattleStatistics stt = BattleStatisticsOuterClass.BattleStatistics.newInstance(); @@ -76,21 +60,11 @@ public final class PVEBattleResultCsReqOuterClass { */ private final RepeatedByte turnSnapshotHash = RepeatedByte.newEmptyInstance(); - /** - * optional string CAIAOBGAECF = 9; - */ - private final Utf8String cAIAOBGAECF = Utf8String.newEmptyInstance(); - /** * repeated .BattleOp op_list = 5; */ private final RepeatedMessage opList = RepeatedMessage.newEmptyInstance(BattleOpOuterClass.BattleOp.getFactory()); - /** - * repeated .PVEBattleResultCsReq.GGLJGEMBGDHEntry GGLJGEMBGDH = 12; - */ - private final RepeatedMessage gGLJGEMBGDH = RepeatedMessage.newEmptyInstance(GGLJGEMBGDHEntry.getFactory()); - private PVEBattleResultCsReq() { } @@ -102,44 +76,44 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 KIGBBBPDKEB = 2; - * @return whether the kIGBBBPDKEB field is set + * optional uint32 cost_time = 4; + * @return whether the costTime field is set */ - public boolean hasKIGBBBPDKEB() { + public boolean hasCostTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 KIGBBBPDKEB = 2; + * optional uint32 cost_time = 4; * @return this */ - public PVEBattleResultCsReq clearKIGBBBPDKEB() { + public PVEBattleResultCsReq clearCostTime() { bitField0_ &= ~0x00000001; - kIGBBBPDKEB = 0; + costTime = 0; return this; } /** - * optional uint32 KIGBBBPDKEB = 2; - * @return the kIGBBBPDKEB + * optional uint32 cost_time = 4; + * @return the costTime */ - public int getKIGBBBPDKEB() { - return kIGBBBPDKEB; + public int getCostTime() { + return costTime; } /** - * optional uint32 KIGBBBPDKEB = 2; - * @param value the kIGBBBPDKEB to set + * optional uint32 cost_time = 4; + * @param value the costTime to set * @return this */ - public PVEBattleResultCsReq setKIGBBBPDKEB(final int value) { + public PVEBattleResultCsReq setCostTime(final int value) { bitField0_ |= 0x00000001; - kIGBBBPDKEB = value; + costTime = value; return this; } /** - * optional uint32 stage_id = 3; + * optional uint32 stage_id = 6; * @return whether the stageId field is set */ public boolean hasStageId() { @@ -147,7 +121,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 stage_id = 3; + * optional uint32 stage_id = 6; * @return this */ public PVEBattleResultCsReq clearStageId() { @@ -157,7 +131,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 stage_id = 3; + * optional uint32 stage_id = 6; * @return the stageId */ public int getStageId() { @@ -165,7 +139,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 stage_id = 3; + * optional uint32 stage_id = 6; * @param value the stageId to set * @return this */ @@ -176,62 +150,25 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 CKGDEAKGMLJ = 7; - * @return whether the cKGDEAKGMLJ field is set + * optional uint32 battle_id = 9; + * @return whether the battleId field is set */ - public boolean hasCKGDEAKGMLJ() { + public boolean hasBattleId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 CKGDEAKGMLJ = 7; - * @return this - */ - public PVEBattleResultCsReq clearCKGDEAKGMLJ() { - bitField0_ &= ~0x00000004; - cKGDEAKGMLJ = 0; - return this; - } - - /** - * optional uint32 CKGDEAKGMLJ = 7; - * @return the cKGDEAKGMLJ - */ - public int getCKGDEAKGMLJ() { - return cKGDEAKGMLJ; - } - - /** - * optional uint32 CKGDEAKGMLJ = 7; - * @param value the cKGDEAKGMLJ to set - * @return this - */ - public PVEBattleResultCsReq setCKGDEAKGMLJ(final int value) { - bitField0_ |= 0x00000004; - cKGDEAKGMLJ = value; - return this; - } - - /** - * optional uint32 battle_id = 10; - * @return whether the battleId field is set - */ - public boolean hasBattleId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 battle_id = 10; + * optional uint32 battle_id = 9; * @return this */ public PVEBattleResultCsReq clearBattleId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; battleId = 0; return this; } /** - * optional uint32 battle_id = 10; + * optional uint32 battle_id = 9; * @return the battleId */ public int getBattleId() { @@ -239,36 +176,36 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 battle_id = 10; + * optional uint32 battle_id = 9; * @param value the battleId to set * @return this */ public PVEBattleResultCsReq setBattleId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; battleId = value; return this; } /** - * optional uint32 client_res_version = 11; + * optional uint32 client_res_version = 14; * @return whether the clientResVersion field is set */ public boolean hasClientResVersion() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 client_res_version = 11; + * optional uint32 client_res_version = 14; * @return this */ public PVEBattleResultCsReq clearClientResVersion() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; clientResVersion = 0; return this; } /** - * optional uint32 client_res_version = 11; + * optional uint32 client_res_version = 14; * @return the clientResVersion */ public int getClientResVersion() { @@ -276,73 +213,36 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 client_res_version = 11; + * optional uint32 client_res_version = 14; * @param value the clientResVersion to set * @return this */ public PVEBattleResultCsReq setClientResVersion(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; clientResVersion = value; return this; } /** - * optional uint32 KBHKHHAKPND = 14; - * @return whether the kBHKHHAKPND field is set - */ - public boolean hasKBHKHHAKPND() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 KBHKHHAKPND = 14; - * @return this - */ - public PVEBattleResultCsReq clearKBHKHHAKPND() { - bitField0_ &= ~0x00000020; - kBHKHHAKPND = 0; - return this; - } - - /** - * optional uint32 KBHKHHAKPND = 14; - * @return the kBHKHHAKPND - */ - public int getKBHKHHAKPND() { - return kBHKHHAKPND; - } - - /** - * optional uint32 KBHKHHAKPND = 14; - * @param value the kBHKHHAKPND to set - * @return this - */ - public PVEBattleResultCsReq setKBHKHHAKPND(final int value) { - bitField0_ |= 0x00000020; - kBHKHHAKPND = value; - return this; - } - - /** - * optional .BattleEndStatus end_status = 4; + * optional .BattleEndStatus end_status = 15; * @return whether the endStatus field is set */ public boolean hasEndStatus() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000010) != 0; } /** - * optional .BattleEndStatus end_status = 4; + * optional .BattleEndStatus end_status = 15; * @return this */ public PVEBattleResultCsReq clearEndStatus() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000010; endStatus = 0; return this; } /** - * optional .BattleEndStatus end_status = 4; + * optional .BattleEndStatus end_status = 15; * @return the endStatus */ public BattleEndStatusOuterClass.BattleEndStatus getEndStatus() { @@ -369,80 +269,43 @@ public final class PVEBattleResultCsReqOuterClass { * @return this */ public PVEBattleResultCsReq setEndStatusValue(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; endStatus = value; return this; } /** - * optional .BattleEndStatus end_status = 4; + * optional .BattleEndStatus end_status = 15; * @param value the endStatus to set * @return this */ public PVEBattleResultCsReq setEndStatus( final BattleEndStatusOuterClass.BattleEndStatus value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; endStatus = value.getNumber(); return this; } /** - * optional bool OKEOKGAICEL = 6; - * @return whether the oKEOKGAICEL field is set - */ - public boolean hasOKEOKGAICEL() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional bool OKEOKGAICEL = 6; - * @return this - */ - public PVEBattleResultCsReq clearOKEOKGAICEL() { - bitField0_ &= ~0x00000080; - oKEOKGAICEL = false; - return this; - } - - /** - * optional bool OKEOKGAICEL = 6; - * @return the oKEOKGAICEL - */ - public boolean getOKEOKGAICEL() { - return oKEOKGAICEL; - } - - /** - * optional bool OKEOKGAICEL = 6; - * @param value the oKEOKGAICEL to set - * @return this - */ - public PVEBattleResultCsReq setOKEOKGAICEL(final boolean value) { - bitField0_ |= 0x00000080; - oKEOKGAICEL = value; - return this; - } - - /** - * optional bool is_ai_consider_ultra_skill = 13; + * optional bool is_ai_consider_ultra_skill = 12; * @return whether the isAiConsiderUltraSkill field is set */ public boolean hasIsAiConsiderUltraSkill() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000020) != 0; } /** - * optional bool is_ai_consider_ultra_skill = 13; + * optional bool is_ai_consider_ultra_skill = 12; * @return this */ public PVEBattleResultCsReq clearIsAiConsiderUltraSkill() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000020; isAiConsiderUltraSkill = false; return this; } /** - * optional bool is_ai_consider_ultra_skill = 13; + * optional bool is_ai_consider_ultra_skill = 12; * @return the isAiConsiderUltraSkill */ public boolean getIsAiConsiderUltraSkill() { @@ -450,36 +313,36 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bool is_ai_consider_ultra_skill = 13; + * optional bool is_ai_consider_ultra_skill = 12; * @param value the isAiConsiderUltraSkill to set * @return this */ public PVEBattleResultCsReq setIsAiConsiderUltraSkill(final boolean value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000020; isAiConsiderUltraSkill = value; return this; } /** - * optional .BattleStatistics stt = 15; + * optional .BattleStatistics stt = 10; * @return whether the stt field is set */ public boolean hasStt() { - return (bitField0_ & 0x00000200) != 0; + return (bitField0_ & 0x00000040) != 0; } /** - * optional .BattleStatistics stt = 15; + * optional .BattleStatistics stt = 10; * @return this */ public PVEBattleResultCsReq clearStt() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000040; stt.clear(); return this; } /** - * optional .BattleStatistics stt = 15; + * optional .BattleStatistics stt = 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. @@ -493,7 +356,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 15; + * optional .BattleStatistics stt = 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 @@ -502,17 +365,17 @@ public final class PVEBattleResultCsReqOuterClass { * @return internal storage object for modifications */ public BattleStatisticsOuterClass.BattleStatistics getMutableStt() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000040; return stt; } /** - * optional .BattleStatistics stt = 15; + * optional .BattleStatistics stt = 10; * @param value the stt to set * @return this */ public PVEBattleResultCsReq setStt(final BattleStatisticsOuterClass.BattleStatistics value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000040; stt.copyFrom(value); return this; } @@ -522,7 +385,7 @@ public final class PVEBattleResultCsReqOuterClass { * @return whether the turnSnapshotHash field is set */ public boolean hasTurnSnapshotHash() { - return (bitField0_ & 0x00000400) != 0; + return (bitField0_ & 0x00000080) != 0; } /** @@ -530,7 +393,7 @@ public final class PVEBattleResultCsReqOuterClass { * @return this */ public PVEBattleResultCsReq clearTurnSnapshotHash() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00000080; turnSnapshotHash.clear(); return this; } @@ -559,7 +422,7 @@ public final class PVEBattleResultCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedByte getMutableTurnSnapshotHash() { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000080; return turnSnapshotHash; } @@ -569,7 +432,7 @@ public final class PVEBattleResultCsReqOuterClass { * @return this */ public PVEBattleResultCsReq addTurnSnapshotHash(final byte value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000080; turnSnapshotHash.add(value); return this; } @@ -580,7 +443,7 @@ public final class PVEBattleResultCsReqOuterClass { * @return this */ public PVEBattleResultCsReq addAllTurnSnapshotHash(final byte... values) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000080; turnSnapshotHash.addAll(values); return this; } @@ -591,82 +454,17 @@ public final class PVEBattleResultCsReqOuterClass { * @return this */ public PVEBattleResultCsReq setTurnSnapshotHash(final byte... values) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000080; turnSnapshotHash.copyFrom(values); return this; } - /** - * optional string CAIAOBGAECF = 9; - * @return whether the cAIAOBGAECF field is set - */ - public boolean hasCAIAOBGAECF() { - return (bitField0_ & 0x00000800) != 0; - } - - /** - * optional string CAIAOBGAECF = 9; - * @return this - */ - public PVEBattleResultCsReq clearCAIAOBGAECF() { - bitField0_ &= ~0x00000800; - cAIAOBGAECF.clear(); - return this; - } - - /** - * optional string CAIAOBGAECF = 9; - * @return the cAIAOBGAECF - */ - public String getCAIAOBGAECF() { - return cAIAOBGAECF.getString(); - } - - /** - * optional string CAIAOBGAECF = 9; - * @return internal {@code Utf8String} representation of cAIAOBGAECF for reading - */ - public Utf8String getCAIAOBGAECFBytes() { - return this.cAIAOBGAECF; - } - - /** - * optional string CAIAOBGAECF = 9; - * @return internal {@code Utf8String} representation of cAIAOBGAECF for modifications - */ - public Utf8String getMutableCAIAOBGAECFBytes() { - bitField0_ |= 0x00000800; - return this.cAIAOBGAECF; - } - - /** - * optional string CAIAOBGAECF = 9; - * @param value the cAIAOBGAECF to set - * @return this - */ - public PVEBattleResultCsReq setCAIAOBGAECF(final CharSequence value) { - bitField0_ |= 0x00000800; - cAIAOBGAECF.copyFrom(value); - return this; - } - - /** - * optional string CAIAOBGAECF = 9; - * @param value the cAIAOBGAECF to set - * @return this - */ - public PVEBattleResultCsReq setCAIAOBGAECF(final Utf8String value) { - bitField0_ |= 0x00000800; - cAIAOBGAECF.copyFrom(value); - return this; - } - /** * repeated .BattleOp op_list = 5; * @return whether the opList field is set */ public boolean hasOpList() { - return (bitField0_ & 0x00001000) != 0; + return (bitField0_ & 0x00000100) != 0; } /** @@ -674,7 +472,7 @@ public final class PVEBattleResultCsReqOuterClass { * @return this */ public PVEBattleResultCsReq clearOpList() { - bitField0_ &= ~0x00001000; + bitField0_ &= ~0x00000100; opList.clear(); return this; } @@ -703,7 +501,7 @@ public final class PVEBattleResultCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableOpList() { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000100; return opList; } @@ -713,7 +511,7 @@ public final class PVEBattleResultCsReqOuterClass { * @return this */ public PVEBattleResultCsReq addOpList(final BattleOpOuterClass.BattleOp value) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000100; opList.add(value); return this; } @@ -724,98 +522,25 @@ public final class PVEBattleResultCsReqOuterClass { * @return this */ public PVEBattleResultCsReq addAllOpList(final BattleOpOuterClass.BattleOp... values) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000100; opList.addAll(values); return this; } - /** - * repeated .PVEBattleResultCsReq.GGLJGEMBGDHEntry GGLJGEMBGDH = 12; - * @return whether the gGLJGEMBGDH field is set - */ - public boolean hasGGLJGEMBGDH() { - return (bitField0_ & 0x00002000) != 0; - } - - /** - * repeated .PVEBattleResultCsReq.GGLJGEMBGDHEntry GGLJGEMBGDH = 12; - * @return this - */ - public PVEBattleResultCsReq clearGGLJGEMBGDH() { - bitField0_ &= ~0x00002000; - gGLJGEMBGDH.clear(); - return this; - } - - /** - * repeated .PVEBattleResultCsReq.GGLJGEMBGDHEntry GGLJGEMBGDH = 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 #getMutableGGLJGEMBGDH()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getGGLJGEMBGDH() { - return gGLJGEMBGDH; - } - - /** - * repeated .PVEBattleResultCsReq.GGLJGEMBGDHEntry GGLJGEMBGDH = 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 getMutableGGLJGEMBGDH() { - bitField0_ |= 0x00002000; - return gGLJGEMBGDH; - } - - /** - * repeated .PVEBattleResultCsReq.GGLJGEMBGDHEntry GGLJGEMBGDH = 12; - * @param value the gGLJGEMBGDH to add - * @return this - */ - public PVEBattleResultCsReq addGGLJGEMBGDH(final GGLJGEMBGDHEntry value) { - bitField0_ |= 0x00002000; - gGLJGEMBGDH.add(value); - return this; - } - - /** - * repeated .PVEBattleResultCsReq.GGLJGEMBGDHEntry GGLJGEMBGDH = 12; - * @param values the gGLJGEMBGDH to add - * @return this - */ - public PVEBattleResultCsReq addAllGGLJGEMBGDH(final GGLJGEMBGDHEntry... values) { - bitField0_ |= 0x00002000; - gGLJGEMBGDH.addAll(values); - return this; - } - @Override public PVEBattleResultCsReq copyFrom(final PVEBattleResultCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - kIGBBBPDKEB = other.kIGBBBPDKEB; + costTime = other.costTime; stageId = other.stageId; - cKGDEAKGMLJ = other.cKGDEAKGMLJ; battleId = other.battleId; clientResVersion = other.clientResVersion; - kBHKHHAKPND = other.kBHKHHAKPND; endStatus = other.endStatus; - oKEOKGAICEL = other.oKEOKGAICEL; isAiConsiderUltraSkill = other.isAiConsiderUltraSkill; stt.copyFrom(other.stt); turnSnapshotHash.copyFrom(other.turnSnapshotHash); - cAIAOBGAECF.copyFrom(other.cAIAOBGAECF); opList.copyFrom(other.opList); - gGLJGEMBGDH.copyFrom(other.gGLJGEMBGDH); } return this; } @@ -826,30 +551,21 @@ public final class PVEBattleResultCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasKIGBBBPDKEB()) { - setKIGBBBPDKEB(other.kIGBBBPDKEB); + if (other.hasCostTime()) { + setCostTime(other.costTime); } if (other.hasStageId()) { setStageId(other.stageId); } - if (other.hasCKGDEAKGMLJ()) { - setCKGDEAKGMLJ(other.cKGDEAKGMLJ); - } if (other.hasBattleId()) { setBattleId(other.battleId); } if (other.hasClientResVersion()) { setClientResVersion(other.clientResVersion); } - if (other.hasKBHKHHAKPND()) { - setKBHKHHAKPND(other.kBHKHHAKPND); - } if (other.hasEndStatus()) { setEndStatusValue(other.endStatus); } - if (other.hasOKEOKGAICEL()) { - setOKEOKGAICEL(other.oKEOKGAICEL); - } if (other.hasIsAiConsiderUltraSkill()) { setIsAiConsiderUltraSkill(other.isAiConsiderUltraSkill); } @@ -859,15 +575,9 @@ public final class PVEBattleResultCsReqOuterClass { if (other.hasTurnSnapshotHash()) { getMutableTurnSnapshotHash().copyFrom(other.turnSnapshotHash); } - if (other.hasCAIAOBGAECF()) { - getMutableCAIAOBGAECFBytes().copyFrom(other.cAIAOBGAECF); - } if (other.hasOpList()) { getMutableOpList().addAll(other.opList); } - if (other.hasGGLJGEMBGDH()) { - getMutableGGLJGEMBGDH().addAll(other.gGLJGEMBGDH); - } return this; } @@ -878,20 +588,15 @@ public final class PVEBattleResultCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - kIGBBBPDKEB = 0; + costTime = 0; stageId = 0; - cKGDEAKGMLJ = 0; battleId = 0; clientResVersion = 0; - kBHKHHAKPND = 0; endStatus = 0; - oKEOKGAICEL = false; isAiConsiderUltraSkill = false; stt.clear(); turnSnapshotHash.clear(); - cAIAOBGAECF.clear(); opList.clear(); - gGLJGEMBGDH.clear(); return this; } @@ -904,9 +609,7 @@ public final class PVEBattleResultCsReqOuterClass { bitField0_ = 0; stt.clearQuick(); turnSnapshotHash.clear(); - cAIAOBGAECF.clear(); opList.clearQuick(); - gGLJGEMBGDH.clearQuick(); return this; } @@ -920,131 +623,89 @@ public final class PVEBattleResultCsReqOuterClass { } PVEBattleResultCsReq other = (PVEBattleResultCsReq) o; return bitField0_ == other.bitField0_ - && (!hasKIGBBBPDKEB() || kIGBBBPDKEB == other.kIGBBBPDKEB) + && (!hasCostTime() || costTime == other.costTime) && (!hasStageId() || stageId == other.stageId) - && (!hasCKGDEAKGMLJ() || cKGDEAKGMLJ == other.cKGDEAKGMLJ) && (!hasBattleId() || battleId == other.battleId) && (!hasClientResVersion() || clientResVersion == other.clientResVersion) - && (!hasKBHKHHAKPND() || kBHKHHAKPND == other.kBHKHHAKPND) && (!hasEndStatus() || endStatus == other.endStatus) - && (!hasOKEOKGAICEL() || oKEOKGAICEL == other.oKEOKGAICEL) && (!hasIsAiConsiderUltraSkill() || isAiConsiderUltraSkill == other.isAiConsiderUltraSkill) && (!hasStt() || stt.equals(other.stt)) && (!hasTurnSnapshotHash() || turnSnapshotHash.equals(other.turnSnapshotHash)) - && (!hasCAIAOBGAECF() || cAIAOBGAECF.equals(other.cAIAOBGAECF)) - && (!hasOpList() || opList.equals(other.opList)) - && (!hasGGLJGEMBGDH() || gGLJGEMBGDH.equals(other.gGLJGEMBGDH)); + && (!hasOpList() || opList.equals(other.opList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(kIGBBBPDKEB); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(costTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(stageId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(cKGDEAKGMLJ); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(battleId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 112); output.writeUInt32NoTag(clientResVersion); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(kBHKHHAKPND); - } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 32); + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 120); output.writeEnumNoTag(endStatus); } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 48); - output.writeBoolNoTag(oKEOKGAICEL); - } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 96); output.writeBoolNoTag(isAiConsiderUltraSkill); } - if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 122); + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawByte((byte) 82); output.writeMessageNoTag(stt); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000080) != 0) { output.writeRawByte((byte) 10); output.writeBytesNoTag(turnSnapshotHash); } - if ((bitField0_ & 0x00000800) != 0) { - output.writeRawByte((byte) 74); - output.writeStringNoTag(cAIAOBGAECF); - } - if ((bitField0_ & 0x00001000) != 0) { + if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < opList.length(); i++) { output.writeRawByte((byte) 42); output.writeMessageNoTag(opList.get(i)); } } - if ((bitField0_ & 0x00002000) != 0) { - for (int i = 0; i < gGLJGEMBGDH.length(); i++) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(gGLJGEMBGDH.get(i)); - } - } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kIGBBBPDKEB); + size += 1 + ProtoSink.computeUInt32SizeNoTag(costTime); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cKGDEAKGMLJ); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); } - if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kBHKHHAKPND); - } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(endStatus); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000020) != 0) { size += 2; } - if ((bitField0_ & 0x00000100) != 0) { - size += 2; - } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000040) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(stt); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeBytesSizeNoTag(turnSnapshotHash); } - if ((bitField0_ & 0x00000800) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(cAIAOBGAECF); - } - if ((bitField0_ & 0x00001000) != 0) { + if ((bitField0_ & 0x00000100) != 0) { size += (1 * opList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(opList); } - if ((bitField0_ & 0x00002000) != 0) { - size += (1 * gGLJGEMBGDH.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(gGLJGEMBGDH); - } return size; } @@ -1055,94 +716,67 @@ public final class PVEBattleResultCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // kIGBBBPDKEB - kIGBBBPDKEB = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // stageId - stageId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // cKGDEAKGMLJ - cKGDEAKGMLJ = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // battleId - battleId = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // clientResVersion - clientResVersion = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // kBHKHHAKPND - kBHKHHAKPND = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 32) { - break; - } - } case 32: { - // endStatus - final int value = input.readInt32(); - if (BattleEndStatusOuterClass.BattleEndStatus.forNumber(value) != null) { - endStatus = value; - bitField0_ |= 0x00000040; - } + // costTime + costTime = input.readUInt32(); + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 48) { break; } } case 48: { - // oKEOKGAICEL - oKEOKGAICEL = input.readBool(); - bitField0_ |= 0x00000080; + // stageId + stageId = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { + case 72: { + // battleId + battleId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // clientResVersion + clientResVersion = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // endStatus + final int value = input.readInt32(); + if (BattleEndStatusOuterClass.BattleEndStatus.forNumber(value) != null) { + endStatus = value; + bitField0_ |= 0x00000010; + } + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { // isAiConsiderUltraSkill isAiConsiderUltraSkill = input.readBool(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 122) { + if (tag != 82) { break; } } - case 122: { + case 82: { // stt input.readMessage(stt); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 10) { break; @@ -1151,16 +785,7 @@ public final class PVEBattleResultCsReqOuterClass { case 10: { // turnSnapshotHash input.readBytes(turnSnapshotHash); - bitField0_ |= 0x00000400; - tag = input.readTag(); - if (tag != 74) { - break; - } - } - case 74: { - // cAIAOBGAECF - input.readString(cAIAOBGAECF); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 42) { break; @@ -1169,15 +794,7 @@ public final class PVEBattleResultCsReqOuterClass { case 42: { // opList tag = input.readRepeatedMessage(opList, tag); - bitField0_ |= 0x00001000; - if (tag != 98) { - break; - } - } - case 98: { - // gGLJGEMBGDH - tag = input.readRepeatedMessage(gGLJGEMBGDH, tag); - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000100; if (tag != 0) { break; } @@ -1200,47 +817,32 @@ public final class PVEBattleResultCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.kIGBBBPDKEB, kIGBBBPDKEB); + output.writeUInt32(FieldNames.costTime, costTime); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.cKGDEAKGMLJ, cKGDEAKGMLJ); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.battleId, battleId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.clientResVersion, clientResVersion); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.kBHKHHAKPND, kBHKHHAKPND); - } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.endStatus, endStatus, BattleEndStatusOuterClass.BattleEndStatus.converter()); } - if ((bitField0_ & 0x00000080) != 0) { - output.writeBool(FieldNames.oKEOKGAICEL, oKEOKGAICEL); - } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000020) != 0) { output.writeBool(FieldNames.isAiConsiderUltraSkill, isAiConsiderUltraSkill); } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000040) != 0) { output.writeMessage(FieldNames.stt, stt); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000080) != 0) { output.writeBytes(FieldNames.turnSnapshotHash, turnSnapshotHash); } - if ((bitField0_ & 0x00000800) != 0) { - output.writeString(FieldNames.cAIAOBGAECF, cAIAOBGAECF); - } - if ((bitField0_ & 0x00001000) != 0) { + if ((bitField0_ & 0x00000100) != 0) { output.writeRepeatedMessage(FieldNames.opList, opList); } - if ((bitField0_ & 0x00002000) != 0) { - output.writeRepeatedMessage(FieldNames.gGLJGEMBGDH, gGLJGEMBGDH); - } output.endObject(); } @@ -1251,10 +853,11 @@ public final class PVEBattleResultCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1199341211: { - if (input.isAtField(FieldNames.kIGBBBPDKEB)) { + case -424687558: + case -269929473: { + if (input.isAtField(FieldNames.costTime)) { if (!input.trySkipNullValue()) { - kIGBBBPDKEB = input.readUInt32(); + costTime = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -1274,23 +877,12 @@ public final class PVEBattleResultCsReqOuterClass { } break; } - case -177934930: { - if (input.isAtField(FieldNames.cKGDEAKGMLJ)) { - if (!input.trySkipNullValue()) { - cKGDEAKGMLJ = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -1678308365: case -487930366: { if (input.isAtField(FieldNames.battleId)) { if (!input.trySkipNullValue()) { battleId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -1302,18 +894,7 @@ public final class PVEBattleResultCsReqOuterClass { if (input.isAtField(FieldNames.clientResVersion)) { if (!input.trySkipNullValue()) { clientResVersion = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - case 461095618: { - if (input.isAtField(FieldNames.kBHKHHAKPND)) { - if (!input.trySkipNullValue()) { - kBHKHHAKPND = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -1327,7 +908,7 @@ public final class PVEBattleResultCsReqOuterClass { final BattleEndStatusOuterClass.BattleEndStatus value = input.readEnum(BattleEndStatusOuterClass.BattleEndStatus.converter()); if (value != null) { endStatus = value.getNumber(); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; } else { input.skipUnknownEnumValue(); } @@ -1337,23 +918,12 @@ public final class PVEBattleResultCsReqOuterClass { } break; } - case -2057851680: { - if (input.isAtField(FieldNames.oKEOKGAICEL)) { - if (!input.trySkipNullValue()) { - oKEOKGAICEL = input.readBool(); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } case -792003792: case 524172826: { if (input.isAtField(FieldNames.isAiConsiderUltraSkill)) { if (!input.trySkipNullValue()) { isAiConsiderUltraSkill = input.readBool(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -1364,7 +934,7 @@ public final class PVEBattleResultCsReqOuterClass { if (input.isAtField(FieldNames.stt)) { if (!input.trySkipNullValue()) { input.readMessage(stt); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -1376,18 +946,7 @@ public final class PVEBattleResultCsReqOuterClass { if (input.isAtField(FieldNames.turnSnapshotHash)) { if (!input.trySkipNullValue()) { input.readBytes(turnSnapshotHash); - bitField0_ |= 0x00000400; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1843645349: { - if (input.isAtField(FieldNames.cAIAOBGAECF)) { - if (!input.trySkipNullValue()) { - input.readString(cAIAOBGAECF); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1399,18 +958,7 @@ public final class PVEBattleResultCsReqOuterClass { if (input.isAtField(FieldNames.opList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(opList); - bitField0_ |= 0x00001000; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1026086682: { - if (input.isAtField(FieldNames.gGLJGEMBGDH)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(gGLJGEMBGDH); - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000100; } } else { input.skipUnknownField(); @@ -1457,360 +1005,6 @@ public final class PVEBattleResultCsReqOuterClass { return PVEBattleResultCsReqFactory.INSTANCE; } - /** - * Protobuf type {@code GGLJGEMBGDHEntry} - */ - public static final class GGLJGEMBGDHEntry extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 value = 2; - */ - private int value_; - - /** - * optional string key = 1; - */ - private final Utf8String key = Utf8String.newEmptyInstance(); - - private GGLJGEMBGDHEntry() { - } - - /** - * @return a new empty instance of {@code GGLJGEMBGDHEntry} - */ - public static GGLJGEMBGDHEntry newInstance() { - return new GGLJGEMBGDHEntry(); - } - - /** - * optional uint32 value = 2; - * @return whether the value_ field is set - */ - public boolean hasValue() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 value = 2; - * @return this - */ - public GGLJGEMBGDHEntry clearValue() { - bitField0_ &= ~0x00000001; - 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 GGLJGEMBGDHEntry 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 GGLJGEMBGDHEntry 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 GGLJGEMBGDHEntry setKey(final CharSequence value) { - bitField0_ |= 0x00000002; - key.copyFrom(value); - return this; - } - - /** - * optional string key = 1; - * @param value the key to set - * @return this - */ - public GGLJGEMBGDHEntry setKey(final Utf8String value) { - bitField0_ |= 0x00000002; - key.copyFrom(value); - return this; - } - - @Override - public GGLJGEMBGDHEntry copyFrom(final GGLJGEMBGDHEntry other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - value_ = other.value_; - key.copyFrom(other.key); - } - return this; - } - - @Override - public GGLJGEMBGDHEntry mergeFrom(final GGLJGEMBGDHEntry 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 GGLJGEMBGDHEntry clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - value_ = 0; - key.clear(); - return this; - } - - @Override - public GGLJGEMBGDHEntry 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 GGLJGEMBGDHEntry)) { - return false; - } - GGLJGEMBGDHEntry other = (GGLJGEMBGDHEntry) 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.writeUInt32NoTag(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.computeUInt32SizeNoTag(value_); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(key); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public GGLJGEMBGDHEntry mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 16: { - // value_ - value_ = input.readUInt32(); - 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.writeUInt32(FieldNames.value_, value_); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeString(FieldNames.key, key); - } - output.endObject(); - } - - @Override - public GGLJGEMBGDHEntry 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.readUInt32(); - 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 GGLJGEMBGDHEntry clone() { - return new GGLJGEMBGDHEntry().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static GGLJGEMBGDHEntry parseFrom(final byte[] data) throws - InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new GGLJGEMBGDHEntry(), data).checkInitialized(); - } - - public static GGLJGEMBGDHEntry parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new GGLJGEMBGDHEntry(), input).checkInitialized(); - } - - public static GGLJGEMBGDHEntry parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new GGLJGEMBGDHEntry(), input).checkInitialized(); - } - - /** - * @return factory for creating GGLJGEMBGDHEntry messages - */ - public static MessageFactory getFactory() { - return GGLJGEMBGDHEntryFactory.INSTANCE; - } - - private enum GGLJGEMBGDHEntryFactory implements MessageFactory { - INSTANCE; - - @Override - public GGLJGEMBGDHEntry create() { - return GGLJGEMBGDHEntry.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 PVEBattleResultCsReqFactory implements MessageFactory { INSTANCE; @@ -1824,33 +1018,23 @@ public final class PVEBattleResultCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName kIGBBBPDKEB = FieldName.forField("KIGBBBPDKEB"); + static final FieldName costTime = FieldName.forField("costTime", "cost_time"); static final FieldName stageId = FieldName.forField("stageId", "stage_id"); - static final FieldName cKGDEAKGMLJ = FieldName.forField("CKGDEAKGMLJ"); - static final FieldName battleId = FieldName.forField("battleId", "battle_id"); static final FieldName clientResVersion = FieldName.forField("clientResVersion", "client_res_version"); - static final FieldName kBHKHHAKPND = FieldName.forField("KBHKHHAKPND"); - static final FieldName endStatus = FieldName.forField("endStatus", "end_status"); - static final FieldName oKEOKGAICEL = FieldName.forField("OKEOKGAICEL"); - static final FieldName isAiConsiderUltraSkill = FieldName.forField("isAiConsiderUltraSkill", "is_ai_consider_ultra_skill"); static final FieldName stt = FieldName.forField("stt"); static final FieldName turnSnapshotHash = FieldName.forField("turnSnapshotHash", "turn_snapshot_hash"); - static final FieldName cAIAOBGAECF = FieldName.forField("CAIAOBGAECF"); - static final FieldName opList = FieldName.forField("opList", "op_list"); - - static final FieldName gGLJGEMBGDH = FieldName.forField("GGLJGEMBGDH"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java index cb04a0f..8e3e872 100644 --- a/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java @@ -21,77 +21,72 @@ public final class PVEBattleResultScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 MALNBHCKENI = 4; + * optional uint32 event_id = 3; */ - private int mALNBHCKENI; + private int eventId; /** - * optional uint32 battle_id = 5; - */ - private int battleId; - - /** - * optional uint32 JPEJDEEINNK = 7; - */ - private int jPEJDEEINNK; - - /** - * optional uint32 BPIONPOPIAB = 8; - */ - private int bPIONPOPIAB; - - /** - * optional uint32 stage_id = 9; + * optional uint32 stage_id = 8; */ private int stageId; /** - * optional uint32 retcode = 10; - */ - private int retcode; - - /** - * optional uint32 mismatch_turn_count = 13; + * optional uint32 mismatch_turn_count = 9; */ private int mismatchTurnCount; /** - * optional .BattleEndStatus end_status = 14; + * optional uint32 battle_id = 10; + */ + private int battleId; + + /** + * optional uint32 retcode = 13; + */ + private int retcode; + + /** + * optional .BattleEndStatus end_status = 11; */ private int endStatus; /** - * optional bool check_identical = 11; + * optional bool check_identical = 4; */ private boolean checkIdentical; /** - * optional .ItemList unk1 = 6; + * optional .ItemList unk1 = 2; */ private final ItemListOuterClass.ItemList unk1 = ItemListOuterClass.ItemList.newInstance(); /** - * optional .ItemList drop_data = 12; + * optional .ItemList unk2 = 6; + */ + private final ItemListOuterClass.ItemList unk2 = ItemListOuterClass.ItemList.newInstance(); + + /** + * optional .ItemList drop_data = 15; */ private final ItemListOuterClass.ItemList dropData = ItemListOuterClass.ItemList.newInstance(); /** - * optional .ItemList unk3 = 15; + * optional .ItemList unk3 = 584; */ private final ItemListOuterClass.ItemList unk3 = ItemListOuterClass.ItemList.newInstance(); /** - * optional string bin_version = 1; + * optional string bin_version = 5; */ private final Utf8String binVersion = Utf8String.newEmptyInstance(); /** - * optional string res_version = 3; + * optional string res_version = 7; */ private final Utf8String resVersion = Utf8String.newEmptyInstance(); /** - * repeated .BattleAvatar battle_avatar_list = 2; + * repeated .BattleAvatar battle_avatar_list = 14; */ private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory()); @@ -106,173 +101,62 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 MALNBHCKENI = 4; - * @return whether the mALNBHCKENI field is set + * optional uint32 event_id = 3; + * @return whether the eventId field is set */ - public boolean hasMALNBHCKENI() { + public boolean hasEventId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 MALNBHCKENI = 4; + * optional uint32 event_id = 3; * @return this */ - public PVEBattleResultScRsp clearMALNBHCKENI() { + public PVEBattleResultScRsp clearEventId() { bitField0_ &= ~0x00000001; - mALNBHCKENI = 0; + eventId = 0; return this; } /** - * optional uint32 MALNBHCKENI = 4; - * @return the mALNBHCKENI + * optional uint32 event_id = 3; + * @return the eventId */ - public int getMALNBHCKENI() { - return mALNBHCKENI; + public int getEventId() { + return eventId; } /** - * optional uint32 MALNBHCKENI = 4; - * @param value the mALNBHCKENI to set + * optional uint32 event_id = 3; + * @param value the eventId to set * @return this */ - public PVEBattleResultScRsp setMALNBHCKENI(final int value) { + public PVEBattleResultScRsp setEventId(final int value) { bitField0_ |= 0x00000001; - mALNBHCKENI = value; + eventId = value; return this; } /** - * optional uint32 battle_id = 5; - * @return whether the battleId field is set + * optional uint32 stage_id = 8; + * @return whether the stageId field is set */ - public boolean hasBattleId() { + public boolean hasStageId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 battle_id = 5; - * @return this - */ - public PVEBattleResultScRsp clearBattleId() { - bitField0_ &= ~0x00000002; - battleId = 0; - return this; - } - - /** - * optional uint32 battle_id = 5; - * @return the battleId - */ - public int getBattleId() { - return battleId; - } - - /** - * optional uint32 battle_id = 5; - * @param value the battleId to set - * @return this - */ - public PVEBattleResultScRsp setBattleId(final int value) { - bitField0_ |= 0x00000002; - battleId = value; - return this; - } - - /** - * optional uint32 JPEJDEEINNK = 7; - * @return whether the jPEJDEEINNK field is set - */ - public boolean hasJPEJDEEINNK() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 JPEJDEEINNK = 7; - * @return this - */ - public PVEBattleResultScRsp clearJPEJDEEINNK() { - bitField0_ &= ~0x00000004; - jPEJDEEINNK = 0; - return this; - } - - /** - * optional uint32 JPEJDEEINNK = 7; - * @return the jPEJDEEINNK - */ - public int getJPEJDEEINNK() { - return jPEJDEEINNK; - } - - /** - * optional uint32 JPEJDEEINNK = 7; - * @param value the jPEJDEEINNK to set - * @return this - */ - public PVEBattleResultScRsp setJPEJDEEINNK(final int value) { - bitField0_ |= 0x00000004; - jPEJDEEINNK = value; - return this; - } - - /** - * optional uint32 BPIONPOPIAB = 8; - * @return whether the bPIONPOPIAB field is set - */ - public boolean hasBPIONPOPIAB() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 BPIONPOPIAB = 8; - * @return this - */ - public PVEBattleResultScRsp clearBPIONPOPIAB() { - bitField0_ &= ~0x00000008; - bPIONPOPIAB = 0; - return this; - } - - /** - * optional uint32 BPIONPOPIAB = 8; - * @return the bPIONPOPIAB - */ - public int getBPIONPOPIAB() { - return bPIONPOPIAB; - } - - /** - * optional uint32 BPIONPOPIAB = 8; - * @param value the bPIONPOPIAB to set - * @return this - */ - public PVEBattleResultScRsp setBPIONPOPIAB(final int value) { - bitField0_ |= 0x00000008; - bPIONPOPIAB = value; - return this; - } - - /** - * optional uint32 stage_id = 9; - * @return whether the stageId field is set - */ - public boolean hasStageId() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 stage_id = 9; + * optional uint32 stage_id = 8; * @return this */ public PVEBattleResultScRsp clearStageId() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000002; stageId = 0; return this; } /** - * optional uint32 stage_id = 9; + * optional uint32 stage_id = 8; * @return the stageId */ public int getStageId() { @@ -280,73 +164,36 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 stage_id = 9; + * optional uint32 stage_id = 8; * @param value the stageId to set * @return this */ public PVEBattleResultScRsp setStageId(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; stageId = value; return this; } /** - * optional uint32 retcode = 10; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 retcode = 10; - * @return this - */ - public PVEBattleResultScRsp clearRetcode() { - bitField0_ &= ~0x00000020; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 10; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 10; - * @param value the retcode to set - * @return this - */ - public PVEBattleResultScRsp setRetcode(final int value) { - bitField0_ |= 0x00000020; - retcode = value; - return this; - } - - /** - * optional uint32 mismatch_turn_count = 13; + * optional uint32 mismatch_turn_count = 9; * @return whether the mismatchTurnCount field is set */ public boolean hasMismatchTurnCount() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 mismatch_turn_count = 13; + * optional uint32 mismatch_turn_count = 9; * @return this */ public PVEBattleResultScRsp clearMismatchTurnCount() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000004; mismatchTurnCount = 0; return this; } /** - * optional uint32 mismatch_turn_count = 13; + * optional uint32 mismatch_turn_count = 9; * @return the mismatchTurnCount */ public int getMismatchTurnCount() { @@ -354,36 +201,110 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 mismatch_turn_count = 13; + * optional uint32 mismatch_turn_count = 9; * @param value the mismatchTurnCount to set * @return this */ public PVEBattleResultScRsp setMismatchTurnCount(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000004; mismatchTurnCount = value; return this; } /** - * optional .BattleEndStatus end_status = 14; - * @return whether the endStatus field is set + * optional uint32 battle_id = 10; + * @return whether the battleId field is set */ - public boolean hasEndStatus() { - return (bitField0_ & 0x00000080) != 0; + public boolean hasBattleId() { + return (bitField0_ & 0x00000008) != 0; } /** - * optional .BattleEndStatus end_status = 14; + * optional uint32 battle_id = 10; + * @return this + */ + public PVEBattleResultScRsp clearBattleId() { + bitField0_ &= ~0x00000008; + battleId = 0; + return this; + } + + /** + * optional uint32 battle_id = 10; + * @return the battleId + */ + public int getBattleId() { + return battleId; + } + + /** + * optional uint32 battle_id = 10; + * @param value the battleId to set + * @return this + */ + public PVEBattleResultScRsp setBattleId(final int value) { + bitField0_ |= 0x00000008; + battleId = value; + return this; + } + + /** + * optional uint32 retcode = 13; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 retcode = 13; + * @return this + */ + public PVEBattleResultScRsp clearRetcode() { + bitField0_ &= ~0x00000010; + 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 PVEBattleResultScRsp setRetcode(final int value) { + bitField0_ |= 0x00000010; + retcode = value; + return this; + } + + /** + * optional .BattleEndStatus end_status = 11; + * @return whether the endStatus field is set + */ + public boolean hasEndStatus() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional .BattleEndStatus end_status = 11; * @return this */ public PVEBattleResultScRsp clearEndStatus() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000020; endStatus = 0; return this; } /** - * optional .BattleEndStatus end_status = 14; + * optional .BattleEndStatus end_status = 11; * @return the endStatus */ public BattleEndStatusOuterClass.BattleEndStatus getEndStatus() { @@ -410,43 +331,43 @@ public final class PVEBattleResultScRspOuterClass { * @return this */ public PVEBattleResultScRsp setEndStatusValue(final int value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; endStatus = value; return this; } /** - * optional .BattleEndStatus end_status = 14; + * optional .BattleEndStatus end_status = 11; * @param value the endStatus to set * @return this */ public PVEBattleResultScRsp setEndStatus( final BattleEndStatusOuterClass.BattleEndStatus value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; endStatus = value.getNumber(); return this; } /** - * optional bool check_identical = 11; + * optional bool check_identical = 4; * @return whether the checkIdentical field is set */ public boolean hasCheckIdentical() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000040) != 0; } /** - * optional bool check_identical = 11; + * optional bool check_identical = 4; * @return this */ public PVEBattleResultScRsp clearCheckIdentical() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000040; checkIdentical = false; return this; } /** - * optional bool check_identical = 11; + * optional bool check_identical = 4; * @return the checkIdentical */ public boolean getCheckIdentical() { @@ -454,36 +375,36 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional bool check_identical = 11; + * optional bool check_identical = 4; * @param value the checkIdentical to set * @return this */ public PVEBattleResultScRsp setCheckIdentical(final boolean value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; checkIdentical = value; return this; } /** - * optional .ItemList unk1 = 6; + * optional .ItemList unk1 = 2; * @return whether the unk1 field is set */ public boolean hasUnk1() { - return (bitField0_ & 0x00000200) != 0; + return (bitField0_ & 0x00000080) != 0; } /** - * optional .ItemList unk1 = 6; + * optional .ItemList unk1 = 2; * @return this */ public PVEBattleResultScRsp clearUnk1() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000080; unk1.clear(); return this; } /** - * optional .ItemList unk1 = 6; + * optional .ItemList unk1 = 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. @@ -497,7 +418,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk1 = 6; + * optional .ItemList unk1 = 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 @@ -506,41 +427,98 @@ public final class PVEBattleResultScRspOuterClass { * @return internal storage object for modifications */ public ItemListOuterClass.ItemList getMutableUnk1() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; return unk1; } /** - * optional .ItemList unk1 = 6; + * optional .ItemList unk1 = 2; * @param value the unk1 to set * @return this */ public PVEBattleResultScRsp setUnk1(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; unk1.copyFrom(value); return this; } /** - * optional .ItemList drop_data = 12; - * @return whether the dropData field is set + * optional .ItemList unk2 = 6; + * @return whether the unk2 field is set */ - public boolean hasDropData() { - return (bitField0_ & 0x00000400) != 0; + public boolean hasUnk2() { + return (bitField0_ & 0x00000100) != 0; } /** - * optional .ItemList drop_data = 12; + * optional .ItemList unk2 = 6; + * @return this + */ + public PVEBattleResultScRsp clearUnk2() { + bitField0_ &= ~0x00000100; + unk2.clear(); + return this; + } + + /** + * optional .ItemList unk2 = 6; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableUnk2()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ItemListOuterClass.ItemList getUnk2() { + return unk2; + } + + /** + * optional .ItemList unk2 = 6; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public ItemListOuterClass.ItemList getMutableUnk2() { + bitField0_ |= 0x00000100; + return unk2; + } + + /** + * optional .ItemList unk2 = 6; + * @param value the unk2 to set + * @return this + */ + public PVEBattleResultScRsp setUnk2(final ItemListOuterClass.ItemList value) { + bitField0_ |= 0x00000100; + unk2.copyFrom(value); + return this; + } + + /** + * optional .ItemList drop_data = 15; + * @return whether the dropData field is set + */ + public boolean hasDropData() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * optional .ItemList drop_data = 15; * @return this */ public PVEBattleResultScRsp clearDropData() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00000200; dropData.clear(); return this; } /** - * optional .ItemList drop_data = 12; + * optional .ItemList drop_data = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -554,7 +532,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList drop_data = 12; + * optional .ItemList drop_data = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -563,41 +541,41 @@ public final class PVEBattleResultScRspOuterClass { * @return internal storage object for modifications */ public ItemListOuterClass.ItemList getMutableDropData() { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; return dropData; } /** - * optional .ItemList drop_data = 12; + * optional .ItemList drop_data = 15; * @param value the dropData to set * @return this */ public PVEBattleResultScRsp setDropData(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; dropData.copyFrom(value); return this; } /** - * optional .ItemList unk3 = 15; + * optional .ItemList unk3 = 584; * @return whether the unk3 field is set */ public boolean hasUnk3() { - return (bitField0_ & 0x00000800) != 0; + return (bitField0_ & 0x00000400) != 0; } /** - * optional .ItemList unk3 = 15; + * optional .ItemList unk3 = 584; * @return this */ public PVEBattleResultScRsp clearUnk3() { - bitField0_ &= ~0x00000800; + bitField0_ &= ~0x00000400; unk3.clear(); return this; } /** - * optional .ItemList unk3 = 15; + * optional .ItemList unk3 = 584; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -611,7 +589,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk3 = 15; + * optional .ItemList unk3 = 584; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -620,41 +598,41 @@ public final class PVEBattleResultScRspOuterClass { * @return internal storage object for modifications */ public ItemListOuterClass.ItemList getMutableUnk3() { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; return unk3; } /** - * optional .ItemList unk3 = 15; + * optional .ItemList unk3 = 584; * @param value the unk3 to set * @return this */ public PVEBattleResultScRsp setUnk3(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; unk3.copyFrom(value); return this; } /** - * optional string bin_version = 1; + * optional string bin_version = 5; * @return whether the binVersion field is set */ public boolean hasBinVersion() { - return (bitField0_ & 0x00001000) != 0; + return (bitField0_ & 0x00000800) != 0; } /** - * optional string bin_version = 1; + * optional string bin_version = 5; * @return this */ public PVEBattleResultScRsp clearBinVersion() { - bitField0_ &= ~0x00001000; + bitField0_ &= ~0x00000800; binVersion.clear(); return this; } /** - * optional string bin_version = 1; + * optional string bin_version = 5; * @return the binVersion */ public String getBinVersion() { @@ -662,7 +640,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string bin_version = 1; + * optional string bin_version = 5; * @return internal {@code Utf8String} representation of binVersion for reading */ public Utf8String getBinVersionBytes() { @@ -670,56 +648,56 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string bin_version = 1; + * optional string bin_version = 5; * @return internal {@code Utf8String} representation of binVersion for modifications */ public Utf8String getMutableBinVersionBytes() { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; return this.binVersion; } /** - * optional string bin_version = 1; + * optional string bin_version = 5; * @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 = 1; + * optional string bin_version = 5; * @param value the binVersion to set * @return this */ public PVEBattleResultScRsp setBinVersion(final Utf8String value) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; binVersion.copyFrom(value); return this; } /** - * optional string res_version = 3; + * optional string res_version = 7; * @return whether the resVersion field is set */ public boolean hasResVersion() { - return (bitField0_ & 0x00002000) != 0; + return (bitField0_ & 0x00001000) != 0; } /** - * optional string res_version = 3; + * optional string res_version = 7; * @return this */ public PVEBattleResultScRsp clearResVersion() { - bitField0_ &= ~0x00002000; + bitField0_ &= ~0x00001000; resVersion.clear(); return this; } /** - * optional string res_version = 3; + * optional string res_version = 7; * @return the resVersion */ public String getResVersion() { @@ -727,7 +705,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string res_version = 3; + * optional string res_version = 7; * @return internal {@code Utf8String} representation of resVersion for reading */ public Utf8String getResVersionBytes() { @@ -735,56 +713,56 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string res_version = 3; + * optional string res_version = 7; * @return internal {@code Utf8String} representation of resVersion for modifications */ public Utf8String getMutableResVersionBytes() { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00001000; return this.resVersion; } /** - * optional string res_version = 3; + * optional string res_version = 7; * @param value the resVersion to set * @return this */ public PVEBattleResultScRsp setResVersion(final CharSequence value) { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00001000; resVersion.copyFrom(value); return this; } /** - * optional string res_version = 3; + * optional string res_version = 7; * @param value the resVersion to set * @return this */ public PVEBattleResultScRsp setResVersion(final Utf8String value) { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00001000; resVersion.copyFrom(value); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 2; + * repeated .BattleAvatar battle_avatar_list = 14; * @return whether the battleAvatarList field is set */ public boolean hasBattleAvatarList() { - return (bitField0_ & 0x00004000) != 0; + return (bitField0_ & 0x00002000) != 0; } /** - * repeated .BattleAvatar battle_avatar_list = 2; + * repeated .BattleAvatar battle_avatar_list = 14; * @return this */ public PVEBattleResultScRsp clearBattleAvatarList() { - bitField0_ &= ~0x00004000; + bitField0_ &= ~0x00002000; battleAvatarList.clear(); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 2; + * repeated .BattleAvatar battle_avatar_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. @@ -798,7 +776,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 2; + * repeated .BattleAvatar battle_avatar_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 @@ -807,30 +785,30 @@ public final class PVEBattleResultScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableBattleAvatarList() { - bitField0_ |= 0x00004000; + bitField0_ |= 0x00002000; return battleAvatarList; } /** - * repeated .BattleAvatar battle_avatar_list = 2; + * repeated .BattleAvatar battle_avatar_list = 14; * @param value the battleAvatarList to add * @return this */ public PVEBattleResultScRsp addBattleAvatarList( final BattleAvatarOuterClass.BattleAvatar value) { - bitField0_ |= 0x00004000; + bitField0_ |= 0x00002000; battleAvatarList.add(value); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 2; + * repeated .BattleAvatar battle_avatar_list = 14; * @param values the battleAvatarList to add * @return this */ public PVEBattleResultScRsp addAllBattleAvatarList( final BattleAvatarOuterClass.BattleAvatar... values) { - bitField0_ |= 0x00004000; + bitField0_ |= 0x00002000; battleAvatarList.addAll(values); return this; } @@ -840,16 +818,15 @@ public final class PVEBattleResultScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - mALNBHCKENI = other.mALNBHCKENI; - battleId = other.battleId; - jPEJDEEINNK = other.jPEJDEEINNK; - bPIONPOPIAB = other.bPIONPOPIAB; + eventId = other.eventId; stageId = other.stageId; - retcode = other.retcode; mismatchTurnCount = other.mismatchTurnCount; + battleId = other.battleId; + retcode = other.retcode; endStatus = other.endStatus; checkIdentical = other.checkIdentical; unk1.copyFrom(other.unk1); + unk2.copyFrom(other.unk2); dropData.copyFrom(other.dropData); unk3.copyFrom(other.unk3); binVersion.copyFrom(other.binVersion); @@ -865,27 +842,21 @@ public final class PVEBattleResultScRspOuterClass { return this; } cachedSize = -1; - if (other.hasMALNBHCKENI()) { - setMALNBHCKENI(other.mALNBHCKENI); - } - if (other.hasBattleId()) { - setBattleId(other.battleId); - } - if (other.hasJPEJDEEINNK()) { - setJPEJDEEINNK(other.jPEJDEEINNK); - } - if (other.hasBPIONPOPIAB()) { - setBPIONPOPIAB(other.bPIONPOPIAB); + if (other.hasEventId()) { + setEventId(other.eventId); } if (other.hasStageId()) { setStageId(other.stageId); } - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasMismatchTurnCount()) { setMismatchTurnCount(other.mismatchTurnCount); } + if (other.hasBattleId()) { + setBattleId(other.battleId); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasEndStatus()) { setEndStatusValue(other.endStatus); } @@ -895,6 +866,9 @@ public final class PVEBattleResultScRspOuterClass { if (other.hasUnk1()) { getMutableUnk1().mergeFrom(other.unk1); } + if (other.hasUnk2()) { + getMutableUnk2().mergeFrom(other.unk2); + } if (other.hasDropData()) { getMutableDropData().mergeFrom(other.dropData); } @@ -920,16 +894,15 @@ public final class PVEBattleResultScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - mALNBHCKENI = 0; - battleId = 0; - jPEJDEEINNK = 0; - bPIONPOPIAB = 0; + eventId = 0; stageId = 0; - retcode = 0; mismatchTurnCount = 0; + battleId = 0; + retcode = 0; endStatus = 0; checkIdentical = false; unk1.clear(); + unk2.clear(); dropData.clear(); unk3.clear(); binVersion.clear(); @@ -946,6 +919,7 @@ public final class PVEBattleResultScRspOuterClass { cachedSize = -1; bitField0_ = 0; unk1.clearQuick(); + unk2.clearQuick(); dropData.clearQuick(); unk3.clearQuick(); binVersion.clear(); @@ -964,16 +938,15 @@ public final class PVEBattleResultScRspOuterClass { } PVEBattleResultScRsp other = (PVEBattleResultScRsp) o; return bitField0_ == other.bitField0_ - && (!hasMALNBHCKENI() || mALNBHCKENI == other.mALNBHCKENI) - && (!hasBattleId() || battleId == other.battleId) - && (!hasJPEJDEEINNK() || jPEJDEEINNK == other.jPEJDEEINNK) - && (!hasBPIONPOPIAB() || bPIONPOPIAB == other.bPIONPOPIAB) + && (!hasEventId() || eventId == other.eventId) && (!hasStageId() || stageId == other.stageId) - && (!hasRetcode() || retcode == other.retcode) && (!hasMismatchTurnCount() || mismatchTurnCount == other.mismatchTurnCount) + && (!hasBattleId() || battleId == other.battleId) + && (!hasRetcode() || retcode == other.retcode) && (!hasEndStatus() || endStatus == other.endStatus) && (!hasCheckIdentical() || checkIdentical == other.checkIdentical) && (!hasUnk1() || unk1.equals(other.unk1)) + && (!hasUnk2() || unk2.equals(other.unk2)) && (!hasDropData() || dropData.equals(other.dropData)) && (!hasUnk3() || unk3.equals(other.unk3)) && (!hasBinVersion() || binVersion.equals(other.binVersion)) @@ -984,64 +957,60 @@ public final class PVEBattleResultScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(mALNBHCKENI); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(eventId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(battleId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(jPEJDEEINNK); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 64); - output.writeUInt32NoTag(bPIONPOPIAB); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); output.writeUInt32NoTag(stageId); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 72); output.writeUInt32NoTag(mismatchTurnCount); } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 112); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(battleId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 88); output.writeEnumNoTag(endStatus); } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 88); + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawByte((byte) 32); output.writeBoolNoTag(checkIdentical); } - if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 50); + if ((bitField0_ & 0x00000080) != 0) { + output.writeRawByte((byte) 18); output.writeMessageNoTag(unk1); } - if ((bitField0_ & 0x00000400) != 0) { - output.writeRawByte((byte) 98); + if ((bitField0_ & 0x00000100) != 0) { + output.writeRawByte((byte) 50); + output.writeMessageNoTag(unk2); + } + if ((bitField0_ & 0x00000200) != 0) { + output.writeRawByte((byte) 122); output.writeMessageNoTag(dropData); } - if ((bitField0_ & 0x00000800) != 0) { - output.writeRawByte((byte) 122); + if ((bitField0_ & 0x00000400) != 0) { + output.writeRawLittleEndian16((short) 9410); output.writeMessageNoTag(unk3); } - if ((bitField0_ & 0x00001000) != 0) { - output.writeRawByte((byte) 10); + if ((bitField0_ & 0x00000800) != 0) { + output.writeRawByte((byte) 42); output.writeStringNoTag(binVersion); } - if ((bitField0_ & 0x00002000) != 0) { - output.writeRawByte((byte) 26); + if ((bitField0_ & 0x00001000) != 0) { + output.writeRawByte((byte) 58); output.writeStringNoTag(resVersion); } - if ((bitField0_ & 0x00004000) != 0) { + if ((bitField0_ & 0x00002000) != 0) { for (int i = 0; i < battleAvatarList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 114); output.writeMessageNoTag(battleAvatarList.get(i)); } } @@ -1051,48 +1020,45 @@ public final class PVEBattleResultScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mALNBHCKENI); + size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(jPEJDEEINNK); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bPIONPOPIAB); - } - if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } - if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); - } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(mismatchTurnCount); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(endStatus); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000040) != 0) { size += 2; } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(unk1); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000100) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(unk2); + } + if ((bitField0_ & 0x00000200) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(dropData); } - if ((bitField0_ & 0x00000800) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(unk3); + if ((bitField0_ & 0x00000400) != 0) { + size += 2 + ProtoSink.computeMessageSizeNoTag(unk3); } - if ((bitField0_ & 0x00001000) != 0) { + if ((bitField0_ & 0x00000800) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(binVersion); } - if ((bitField0_ & 0x00002000) != 0) { + if ((bitField0_ & 0x00001000) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(resVersion); } - if ((bitField0_ & 0x00004000) != 0) { + if ((bitField0_ & 0x00002000) != 0) { size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList); } return size; @@ -1105,139 +1071,130 @@ public final class PVEBattleResultScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // mALNBHCKENI - mALNBHCKENI = input.readUInt32(); + case 24: { + // eventId + eventId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // battleId - battleId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // jPEJDEEINNK - jPEJDEEINNK = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 64) { break; } } case 64: { - // bPIONPOPIAB - bPIONPOPIAB = input.readUInt32(); - bitField0_ |= 0x00000008; + // stageId + stageId = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 72) { break; } } case 72: { - // stageId - stageId = input.readUInt32(); - bitField0_ |= 0x00000010; + // mismatchTurnCount + mismatchTurnCount = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 80) { break; } } case 80: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000020; + // battleId + battleId = input.readUInt32(); + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // mismatchTurnCount - mismatchTurnCount = input.readUInt32(); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // endStatus - final int value = input.readInt32(); - if (BattleEndStatusOuterClass.BattleEndStatus.forNumber(value) != null) { - endStatus = value; - bitField0_ |= 0x00000080; - } + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 88) { break; } } case 88: { + // endStatus + final int value = input.readInt32(); + if (BattleEndStatusOuterClass.BattleEndStatus.forNumber(value) != null) { + endStatus = value; + bitField0_ |= 0x00000020; + } + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { // checkIdentical checkIdentical = input.readBool(); - bitField0_ |= 0x00000100; - tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { - // unk1 - input.readMessage(unk1); - bitField0_ |= 0x00000200; - tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { - // dropData - input.readMessage(dropData); - bitField0_ |= 0x00000400; - tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { - // unk3 - input.readMessage(unk3); - bitField0_ |= 0x00000800; - tag = input.readTag(); - if (tag != 10) { - break; - } - } - case 10: { - // binVersion - input.readString(binVersion); - bitField0_ |= 0x00001000; - tag = input.readTag(); - if (tag != 26) { - break; - } - } - case 26: { - // resVersion - input.readString(resVersion); - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 18) { break; } } case 18: { + // unk1 + input.readMessage(unk1); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 50) { + break; + } + } + case 50: { + // unk2 + input.readMessage(unk2); + bitField0_ |= 0x00000100; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // dropData + input.readMessage(dropData); + bitField0_ |= 0x00000200; + tag = input.readTag(); + if (tag != 4674) { + break; + } + } + case 4674: { + // unk3 + input.readMessage(unk3); + bitField0_ |= 0x00000400; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { + // binVersion + input.readString(binVersion); + bitField0_ |= 0x00000800; + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // resVersion + input.readString(resVersion); + bitField0_ |= 0x00001000; + tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { // battleAvatarList tag = input.readRepeatedMessage(battleAvatarList, tag); - bitField0_ |= 0x00004000; + bitField0_ |= 0x00002000; if (tag != 0) { break; } @@ -1260,48 +1217,45 @@ public final class PVEBattleResultScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.mALNBHCKENI, mALNBHCKENI); + output.writeUInt32(FieldNames.eventId, eventId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.battleId, battleId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.jPEJDEEINNK, jPEJDEEINNK); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.bPIONPOPIAB, bPIONPOPIAB); - } - if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.stageId, stageId); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); - } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.mismatchTurnCount, mismatchTurnCount); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.battleId, battleId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000020) != 0) { output.writeEnum(FieldNames.endStatus, endStatus, BattleEndStatusOuterClass.BattleEndStatus.converter()); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000040) != 0) { output.writeBool(FieldNames.checkIdentical, checkIdentical); } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000080) != 0) { output.writeMessage(FieldNames.unk1, unk1); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000100) != 0) { + output.writeMessage(FieldNames.unk2, unk2); + } + if ((bitField0_ & 0x00000200) != 0) { output.writeMessage(FieldNames.dropData, dropData); } - if ((bitField0_ & 0x00000800) != 0) { + if ((bitField0_ & 0x00000400) != 0) { output.writeMessage(FieldNames.unk3, unk3); } - if ((bitField0_ & 0x00001000) != 0) { + if ((bitField0_ & 0x00000800) != 0) { output.writeString(FieldNames.binVersion, binVersion); } - if ((bitField0_ & 0x00002000) != 0) { + if ((bitField0_ & 0x00001000) != 0) { output.writeString(FieldNames.resVersion, resVersion); } - if ((bitField0_ & 0x00004000) != 0) { + if ((bitField0_ & 0x00002000) != 0) { output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList); } output.endObject(); @@ -1314,10 +1268,11 @@ public final class PVEBattleResultScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1670931460: { - if (input.isAtField(FieldNames.mALNBHCKENI)) { + case -1376502443: + case 278118624: { + if (input.isAtField(FieldNames.eventId)) { if (!input.trySkipNullValue()) { - mALNBHCKENI = input.readUInt32(); + eventId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -1325,57 +1280,12 @@ public final class PVEBattleResultScRspOuterClass { } break; } - case -1678308365: - case -487930366: { - if (input.isAtField(FieldNames.battleId)) { - if (!input.trySkipNullValue()) { - battleId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -445858629: { - if (input.isAtField(FieldNames.jPEJDEEINNK)) { - if (!input.trySkipNullValue()) { - jPEJDEEINNK = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1156421709: { - if (input.isAtField(FieldNames.bPIONPOPIAB)) { - if (!input.trySkipNullValue()) { - bPIONPOPIAB = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case -1897528135: case 1306191356: { if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { stageId = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { - if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -1387,7 +1297,30 @@ public final class PVEBattleResultScRspOuterClass { if (input.isAtField(FieldNames.mismatchTurnCount)) { if (!input.trySkipNullValue()) { mismatchTurnCount = input.readUInt32(); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1678308365: + case -487930366: { + if (input.isAtField(FieldNames.battleId)) { + if (!input.trySkipNullValue()) { + battleId = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -1401,7 +1334,7 @@ public final class PVEBattleResultScRspOuterClass { final BattleEndStatusOuterClass.BattleEndStatus value = input.readEnum(BattleEndStatusOuterClass.BattleEndStatus.converter()); if (value != null) { endStatus = value.getNumber(); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; } else { input.skipUnknownEnumValue(); } @@ -1416,7 +1349,7 @@ public final class PVEBattleResultScRspOuterClass { if (input.isAtField(FieldNames.checkIdentical)) { if (!input.trySkipNullValue()) { checkIdentical = input.readBool(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -1427,7 +1360,18 @@ public final class PVEBattleResultScRspOuterClass { if (input.isAtField(FieldNames.unk1)) { if (!input.trySkipNullValue()) { input.readMessage(unk1); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; + } + } else { + input.skipUnknownField(); + } + break; + } + case 3594624: { + if (input.isAtField(FieldNames.unk2)) { + if (!input.trySkipNullValue()) { + input.readMessage(unk2); + bitField0_ |= 0x00000100; } } else { input.skipUnknownField(); @@ -1439,7 +1383,7 @@ public final class PVEBattleResultScRspOuterClass { if (input.isAtField(FieldNames.dropData)) { if (!input.trySkipNullValue()) { input.readMessage(dropData); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; } } else { input.skipUnknownField(); @@ -1450,7 +1394,7 @@ public final class PVEBattleResultScRspOuterClass { if (input.isAtField(FieldNames.unk3)) { if (!input.trySkipNullValue()) { input.readMessage(unk3); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; } } else { input.skipUnknownField(); @@ -1462,7 +1406,7 @@ public final class PVEBattleResultScRspOuterClass { if (input.isAtField(FieldNames.binVersion)) { if (!input.trySkipNullValue()) { input.readString(binVersion); - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; } } else { input.skipUnknownField(); @@ -1474,7 +1418,7 @@ public final class PVEBattleResultScRspOuterClass { if (input.isAtField(FieldNames.resVersion)) { if (!input.trySkipNullValue()) { input.readString(resVersion); - bitField0_ |= 0x00002000; + bitField0_ |= 0x00001000; } } else { input.skipUnknownField(); @@ -1486,7 +1430,7 @@ public final class PVEBattleResultScRspOuterClass { if (input.isAtField(FieldNames.battleAvatarList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(battleAvatarList); - bitField0_ |= 0x00004000; + bitField0_ |= 0x00002000; } } else { input.skipUnknownField(); @@ -1546,26 +1490,24 @@ public final class PVEBattleResultScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName mALNBHCKENI = FieldName.forField("MALNBHCKENI"); - - static final FieldName battleId = FieldName.forField("battleId", "battle_id"); - - static final FieldName jPEJDEEINNK = FieldName.forField("JPEJDEEINNK"); - - static final FieldName bPIONPOPIAB = FieldName.forField("BPIONPOPIAB"); + static final FieldName eventId = FieldName.forField("eventId", "event_id"); static final FieldName stageId = FieldName.forField("stageId", "stage_id"); - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName mismatchTurnCount = FieldName.forField("mismatchTurnCount", "mismatch_turn_count"); + static final FieldName battleId = FieldName.forField("battleId", "battle_id"); + + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName endStatus = FieldName.forField("endStatus", "end_status"); static final FieldName checkIdentical = FieldName.forField("checkIdentical", "check_identical"); static final FieldName unk1 = FieldName.forField("unk1"); + static final FieldName unk2 = FieldName.forField("unk2"); + static final FieldName dropData = FieldName.forField("dropData", "drop_data"); static final FieldName unk3 = FieldName.forField("unk3"); diff --git a/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java index 96be653..2782871 100644 --- a/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java @@ -19,15 +19,15 @@ public final class PileItemOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 item_id = 3; - */ - private int itemId; - - /** - * optional uint32 item_num = 15; + * optional uint32 item_num = 3; */ private int itemNum; + /** + * optional uint32 item_id = 13; + */ + private int itemId; + private PileItem() { } @@ -39,62 +39,25 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_id = 3; - * @return whether the itemId field is set + * optional uint32 item_num = 3; + * @return whether the itemNum field is set */ - public boolean hasItemId() { + public boolean hasItemNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 item_id = 3; - * @return this - */ - public PileItem clearItemId() { - bitField0_ &= ~0x00000001; - itemId = 0; - return this; - } - - /** - * optional uint32 item_id = 3; - * @return the itemId - */ - public int getItemId() { - return itemId; - } - - /** - * optional uint32 item_id = 3; - * @param value the itemId to set - * @return this - */ - public PileItem setItemId(final int value) { - bitField0_ |= 0x00000001; - itemId = value; - return this; - } - - /** - * optional uint32 item_num = 15; - * @return whether the itemNum field is set - */ - public boolean hasItemNum() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 item_num = 15; + * optional uint32 item_num = 3; * @return this */ public PileItem clearItemNum() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; itemNum = 0; return this; } /** - * optional uint32 item_num = 15; + * optional uint32 item_num = 3; * @return the itemNum */ public int getItemNum() { @@ -102,23 +65,60 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_num = 15; + * optional uint32 item_num = 3; * @param value the itemNum to set * @return this */ public PileItem setItemNum(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; itemNum = value; return this; } + /** + * optional uint32 item_id = 13; + * @return whether the itemId field is set + */ + public boolean hasItemId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 item_id = 13; + * @return this + */ + public PileItem clearItemId() { + bitField0_ &= ~0x00000002; + itemId = 0; + return this; + } + + /** + * optional uint32 item_id = 13; + * @return the itemId + */ + public int getItemId() { + return itemId; + } + + /** + * optional uint32 item_id = 13; + * @param value the itemId to set + * @return this + */ + public PileItem setItemId(final int value) { + bitField0_ |= 0x00000002; + itemId = value; + return this; + } + @Override public PileItem copyFrom(final PileItem other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - itemId = other.itemId; itemNum = other.itemNum; + itemId = other.itemId; } return this; } @@ -129,12 +129,12 @@ public final class PileItemOuterClass { return this; } cachedSize = -1; - if (other.hasItemId()) { - setItemId(other.itemId); - } if (other.hasItemNum()) { setItemNum(other.itemNum); } + if (other.hasItemId()) { + setItemId(other.itemId); + } return this; } @@ -145,8 +145,8 @@ public final class PileItemOuterClass { } cachedSize = -1; bitField0_ = 0; - itemId = 0; itemNum = 0; + itemId = 0; return this; } @@ -170,19 +170,19 @@ public final class PileItemOuterClass { } PileItem other = (PileItem) o; return bitField0_ == other.bitField0_ - && (!hasItemId() || itemId == other.itemId) - && (!hasItemNum() || itemNum == other.itemNum); + && (!hasItemNum() || itemNum == other.itemNum) + && (!hasItemId() || itemId == other.itemId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 24); - output.writeUInt32NoTag(itemId); + output.writeUInt32NoTag(itemNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(itemNum); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(itemId); } } @@ -190,10 +190,10 @@ public final class PileItemOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemNum); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } return size; } @@ -206,17 +206,17 @@ public final class PileItemOuterClass { while (true) { switch (tag) { case 24: { - // itemId - itemId = input.readUInt32(); + // itemNum + itemNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 104) { break; } } - case 120: { - // itemNum - itemNum = input.readUInt32(); + case 104: { + // itemId + itemId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class PileItemOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.itemNum, itemNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.itemNum, itemNum); + output.writeUInt32(FieldNames.itemId, itemId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class PileItemOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1178662002: - case 2116204999: { - if (input.isAtField(FieldNames.itemId)) { + case 2116189043: + case 1177850970: { + if (input.isAtField(FieldNames.itemNum)) { if (!input.trySkipNullValue()) { - itemId = input.readUInt32(); + itemNum = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class PileItemOuterClass { } break; } - case 2116189043: - case 1177850970: { - if (input.isAtField(FieldNames.itemNum)) { + case -1178662002: + case 2116204999: { + if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { - itemNum = input.readUInt32(); + itemId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class PileItemOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName itemId = FieldName.forField("itemId", "item_id"); - static final FieldName itemNum = FieldName.forField("itemNum", "item_num"); + + static final FieldName itemId = FieldName.forField("itemId", "item_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java index 5b66533..cf4dd63 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java @@ -20,24 +20,24 @@ public final class PlayerGetTokenCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 KDPMIEPJMLN = 15; + * optional uint32 uid = 9; */ - private int kDPMIEPJMLN; + private int uid; /** - * optional string token = 6; + * optional uint32 platform_type = 10; + */ + private int platformType; + + /** + * optional string token = 1; */ private final Utf8String token = Utf8String.newEmptyInstance(); /** - * optional string uid = 7; + * optional string account_uid = 8; */ - private final Utf8String uid = Utf8String.newEmptyInstance(); - - /** - * optional string unk1 = 8; - */ - private final Utf8String unk1 = Utf8String.newEmptyInstance(); + private final Utf8String accountUid = Utf8String.newEmptyInstance(); private PlayerGetTokenCsReq() { } @@ -50,62 +50,99 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional uint32 KDPMIEPJMLN = 15; - * @return whether the kDPMIEPJMLN field is set + * optional uint32 uid = 9; + * @return whether the uid field is set */ - public boolean hasKDPMIEPJMLN() { + public boolean hasUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 KDPMIEPJMLN = 15; + * optional uint32 uid = 9; * @return this */ - public PlayerGetTokenCsReq clearKDPMIEPJMLN() { + public PlayerGetTokenCsReq clearUid() { bitField0_ &= ~0x00000001; - kDPMIEPJMLN = 0; + uid = 0; return this; } /** - * optional uint32 KDPMIEPJMLN = 15; - * @return the kDPMIEPJMLN + * optional uint32 uid = 9; + * @return the uid */ - public int getKDPMIEPJMLN() { - return kDPMIEPJMLN; + public int getUid() { + return uid; } /** - * optional uint32 KDPMIEPJMLN = 15; - * @param value the kDPMIEPJMLN to set + * optional uint32 uid = 9; + * @param value the uid to set * @return this */ - public PlayerGetTokenCsReq setKDPMIEPJMLN(final int value) { + public PlayerGetTokenCsReq setUid(final int value) { bitField0_ |= 0x00000001; - kDPMIEPJMLN = value; + uid = value; return this; } /** - * optional string token = 6; - * @return whether the token field is set + * optional uint32 platform_type = 10; + * @return whether the platformType field is set */ - public boolean hasToken() { + public boolean hasPlatformType() { return (bitField0_ & 0x00000002) != 0; } /** - * optional string token = 6; + * optional uint32 platform_type = 10; + * @return this + */ + public PlayerGetTokenCsReq clearPlatformType() { + bitField0_ &= ~0x00000002; + platformType = 0; + return this; + } + + /** + * optional uint32 platform_type = 10; + * @return the platformType + */ + public int getPlatformType() { + return platformType; + } + + /** + * optional uint32 platform_type = 10; + * @param value the platformType to set + * @return this + */ + public PlayerGetTokenCsReq setPlatformType(final int value) { + bitField0_ |= 0x00000002; + platformType = value; + return this; + } + + /** + * optional string token = 1; + * @return whether the token field is set + */ + public boolean hasToken() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional string token = 1; * @return this */ public PlayerGetTokenCsReq clearToken() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; token.clear(); return this; } /** - * optional string token = 6; + * optional string token = 1; * @return the token */ public String getToken() { @@ -113,7 +150,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 6; + * optional string token = 1; * @return internal {@code Utf8String} representation of token for reading */ public Utf8String getTokenBytes() { @@ -121,163 +158,98 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 6; + * optional string token = 1; * @return internal {@code Utf8String} representation of token for modifications */ public Utf8String getMutableTokenBytes() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return this.token; } /** - * optional string token = 6; + * optional string token = 1; * @param value the token to set * @return this */ public PlayerGetTokenCsReq setToken(final CharSequence value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; token.copyFrom(value); return this; } /** - * optional string token = 6; + * optional string token = 1; * @param value the token to set * @return this */ public PlayerGetTokenCsReq setToken(final Utf8String value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; token.copyFrom(value); return this; } /** - * optional string uid = 7; - * @return whether the uid field is set + * optional string account_uid = 8; + * @return whether the accountUid field is set */ - public boolean hasUid() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional string uid = 7; - * @return this - */ - public PlayerGetTokenCsReq clearUid() { - bitField0_ &= ~0x00000004; - uid.clear(); - return this; - } - - /** - * optional string uid = 7; - * @return the uid - */ - public String getUid() { - return uid.getString(); - } - - /** - * optional string uid = 7; - * @return internal {@code Utf8String} representation of uid for reading - */ - public Utf8String getUidBytes() { - return this.uid; - } - - /** - * optional string uid = 7; - * @return internal {@code Utf8String} representation of uid for modifications - */ - public Utf8String getMutableUidBytes() { - bitField0_ |= 0x00000004; - return this.uid; - } - - /** - * optional string uid = 7; - * @param value the uid to set - * @return this - */ - public PlayerGetTokenCsReq setUid(final CharSequence value) { - bitField0_ |= 0x00000004; - uid.copyFrom(value); - return this; - } - - /** - * optional string uid = 7; - * @param value the uid to set - * @return this - */ - public PlayerGetTokenCsReq setUid(final Utf8String value) { - bitField0_ |= 0x00000004; - uid.copyFrom(value); - return this; - } - - /** - * optional string unk1 = 8; - * @return whether the unk1 field is set - */ - public boolean hasUnk1() { + public boolean hasAccountUid() { return (bitField0_ & 0x00000008) != 0; } /** - * optional string unk1 = 8; + * optional string account_uid = 8; * @return this */ - public PlayerGetTokenCsReq clearUnk1() { + public PlayerGetTokenCsReq clearAccountUid() { bitField0_ &= ~0x00000008; - unk1.clear(); + accountUid.clear(); return this; } /** - * optional string unk1 = 8; - * @return the unk1 + * optional string account_uid = 8; + * @return the accountUid */ - public String getUnk1() { - return unk1.getString(); + public String getAccountUid() { + return accountUid.getString(); } /** - * optional string unk1 = 8; - * @return internal {@code Utf8String} representation of unk1 for reading + * optional string account_uid = 8; + * @return internal {@code Utf8String} representation of accountUid for reading */ - public Utf8String getUnk1Bytes() { - return this.unk1; + public Utf8String getAccountUidBytes() { + return this.accountUid; } /** - * optional string unk1 = 8; - * @return internal {@code Utf8String} representation of unk1 for modifications + * optional string account_uid = 8; + * @return internal {@code Utf8String} representation of accountUid for modifications */ - public Utf8String getMutableUnk1Bytes() { + public Utf8String getMutableAccountUidBytes() { bitField0_ |= 0x00000008; - return this.unk1; + return this.accountUid; } /** - * optional string unk1 = 8; - * @param value the unk1 to set + * optional string account_uid = 8; + * @param value the accountUid to set * @return this */ - public PlayerGetTokenCsReq setUnk1(final CharSequence value) { + public PlayerGetTokenCsReq setAccountUid(final CharSequence value) { bitField0_ |= 0x00000008; - unk1.copyFrom(value); + accountUid.copyFrom(value); return this; } /** - * optional string unk1 = 8; - * @param value the unk1 to set + * optional string account_uid = 8; + * @param value the accountUid to set * @return this */ - public PlayerGetTokenCsReq setUnk1(final Utf8String value) { + public PlayerGetTokenCsReq setAccountUid(final Utf8String value) { bitField0_ |= 0x00000008; - unk1.copyFrom(value); + accountUid.copyFrom(value); return this; } @@ -286,10 +258,10 @@ public final class PlayerGetTokenCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - kDPMIEPJMLN = other.kDPMIEPJMLN; + uid = other.uid; + platformType = other.platformType; token.copyFrom(other.token); - uid.copyFrom(other.uid); - unk1.copyFrom(other.unk1); + accountUid.copyFrom(other.accountUid); } return this; } @@ -300,17 +272,17 @@ public final class PlayerGetTokenCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasKDPMIEPJMLN()) { - setKDPMIEPJMLN(other.kDPMIEPJMLN); + if (other.hasUid()) { + setUid(other.uid); + } + if (other.hasPlatformType()) { + setPlatformType(other.platformType); } if (other.hasToken()) { getMutableTokenBytes().copyFrom(other.token); } - if (other.hasUid()) { - getMutableUidBytes().copyFrom(other.uid); - } - if (other.hasUnk1()) { - getMutableUnk1Bytes().copyFrom(other.unk1); + if (other.hasAccountUid()) { + getMutableAccountUidBytes().copyFrom(other.accountUid); } return this; } @@ -322,10 +294,10 @@ public final class PlayerGetTokenCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - kDPMIEPJMLN = 0; + uid = 0; + platformType = 0; token.clear(); - uid.clear(); - unk1.clear(); + accountUid.clear(); return this; } @@ -337,8 +309,7 @@ public final class PlayerGetTokenCsReqOuterClass { cachedSize = -1; bitField0_ = 0; token.clear(); - uid.clear(); - unk1.clear(); + accountUid.clear(); return this; } @@ -352,29 +323,29 @@ public final class PlayerGetTokenCsReqOuterClass { } PlayerGetTokenCsReq other = (PlayerGetTokenCsReq) o; return bitField0_ == other.bitField0_ - && (!hasKDPMIEPJMLN() || kDPMIEPJMLN == other.kDPMIEPJMLN) + && (!hasUid() || uid == other.uid) + && (!hasPlatformType() || platformType == other.platformType) && (!hasToken() || token.equals(other.token)) - && (!hasUid() || uid.equals(other.uid)) - && (!hasUnk1() || unk1.equals(other.unk1)); + && (!hasAccountUid() || accountUid.equals(other.accountUid)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(kDPMIEPJMLN); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); - output.writeStringNoTag(token); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(platformType); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); - output.writeStringNoTag(uid); + output.writeRawByte((byte) 10); + output.writeStringNoTag(token); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 66); - output.writeStringNoTag(unk1); + output.writeStringNoTag(accountUid); } } @@ -382,16 +353,16 @@ public final class PlayerGetTokenCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kDPMIEPJMLN); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(token); + size += 1 + ProtoSink.computeUInt32SizeNoTag(platformType); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(uid); + size += 1 + ProtoSink.computeStringSizeNoTag(token); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(unk1); + size += 1 + ProtoSink.computeStringSizeNoTag(accountUid); } return size; } @@ -403,27 +374,27 @@ public final class PlayerGetTokenCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { - // kDPMIEPJMLN - kDPMIEPJMLN = input.readUInt32(); + case 72: { + // uid + uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 80) { break; } } - case 50: { - // token - input.readString(token); + case 80: { + // platformType + platformType = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 10) { break; } } - case 58: { - // uid - input.readString(uid); + case 10: { + // token + input.readString(token); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 66) { @@ -431,8 +402,8 @@ public final class PlayerGetTokenCsReqOuterClass { } } case 66: { - // unk1 - input.readString(unk1); + // accountUid + input.readString(accountUid); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -457,16 +428,16 @@ public final class PlayerGetTokenCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.kDPMIEPJMLN, kDPMIEPJMLN); + output.writeUInt32(FieldNames.uid, uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeString(FieldNames.token, token); + output.writeUInt32(FieldNames.platformType, platformType); } if ((bitField0_ & 0x00000004) != 0) { - output.writeString(FieldNames.uid, uid); + output.writeString(FieldNames.token, token); } if ((bitField0_ & 0x00000008) != 0) { - output.writeString(FieldNames.unk1, unk1); + output.writeString(FieldNames.accountUid, accountUid); } output.endObject(); } @@ -478,10 +449,10 @@ public final class PlayerGetTokenCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1500575517: { - if (input.isAtField(FieldNames.kDPMIEPJMLN)) { + case 115792: { + if (input.isAtField(FieldNames.uid)) { if (!input.trySkipNullValue()) { - kDPMIEPJMLN = input.readUInt32(); + uid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -489,21 +460,22 @@ public final class PlayerGetTokenCsReqOuterClass { } break; } + case 155581005: + case 538062726: { + if (input.isAtField(FieldNames.platformType)) { + if (!input.trySkipNullValue()) { + platformType = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 110541305: { if (input.isAtField(FieldNames.token)) { if (!input.trySkipNullValue()) { input.readString(token); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 115792: { - if (input.isAtField(FieldNames.uid)) { - if (!input.trySkipNullValue()) { - input.readString(uid); bitField0_ |= 0x00000004; } } else { @@ -511,10 +483,11 @@ public final class PlayerGetTokenCsReqOuterClass { } break; } - case 3594623: { - if (input.isAtField(FieldNames.unk1)) { + case -803342621: + case 866492222: { + if (input.isAtField(FieldNames.accountUid)) { if (!input.trySkipNullValue()) { - input.readString(unk1); + input.readString(accountUid); bitField0_ |= 0x00000008; } } else { @@ -575,13 +548,13 @@ public final class PlayerGetTokenCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName kDPMIEPJMLN = FieldName.forField("KDPMIEPJMLN"); + static final FieldName uid = FieldName.forField("uid"); + + static final FieldName platformType = FieldName.forField("platformType", "platform_type"); static final FieldName token = FieldName.forField("token"); - static final FieldName uid = FieldName.forField("uid"); - - static final FieldName unk1 = FieldName.forField("unk1"); + static final FieldName accountUid = FieldName.forField("accountUid", "account_uid"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java index 17e007f..09891c4 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java @@ -20,27 +20,27 @@ public final class PlayerGetTokenScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 secret_key_seed = 7; + * optional uint64 secret_key_seed = 9; */ private long secretKeySeed; /** - * optional uint32 uid = 1; + * optional uint32 uid = 8; */ private int uid; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 13; */ private int retcode; /** - * optional .BlackInfo black_info = 2; + * optional .BlackInfo black_info = 1; */ private final BlackInfoOuterClass.BlackInfo blackInfo = BlackInfoOuterClass.BlackInfo.newInstance(); /** - * optional string msg = 8; + * optional string msg = 4; */ private final Utf8String msg = Utf8String.newEmptyInstance(); @@ -55,7 +55,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint64 secret_key_seed = 7; + * optional uint64 secret_key_seed = 9; * @return whether the secretKeySeed field is set */ public boolean hasSecretKeySeed() { @@ -63,7 +63,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint64 secret_key_seed = 7; + * optional uint64 secret_key_seed = 9; * @return this */ public PlayerGetTokenScRsp clearSecretKeySeed() { @@ -73,7 +73,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint64 secret_key_seed = 7; + * optional uint64 secret_key_seed = 9; * @return the secretKeySeed */ public long getSecretKeySeed() { @@ -81,7 +81,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint64 secret_key_seed = 7; + * optional uint64 secret_key_seed = 9; * @param value the secretKeySeed to set * @return this */ @@ -92,7 +92,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 uid = 1; + * optional uint32 uid = 8; * @return whether the uid field is set */ public boolean hasUid() { @@ -100,7 +100,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 uid = 1; + * optional uint32 uid = 8; * @return this */ public PlayerGetTokenScRsp clearUid() { @@ -110,7 +110,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 uid = 1; + * optional uint32 uid = 8; * @return the uid */ public int getUid() { @@ -118,7 +118,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 uid = 1; + * optional uint32 uid = 8; * @param value the uid to set * @return this */ @@ -129,7 +129,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -137,7 +137,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 13; * @return this */ public PlayerGetTokenScRsp clearRetcode() { @@ -147,7 +147,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -155,7 +155,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 13; * @param value the retcode to set * @return this */ @@ -166,7 +166,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 2; + * optional .BlackInfo black_info = 1; * @return whether the blackInfo field is set */ public boolean hasBlackInfo() { @@ -174,7 +174,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 2; + * optional .BlackInfo black_info = 1; * @return this */ public PlayerGetTokenScRsp clearBlackInfo() { @@ -184,7 +184,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 2; + * optional .BlackInfo black_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. @@ -198,7 +198,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 2; + * optional .BlackInfo black_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 @@ -212,7 +212,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 2; + * optional .BlackInfo black_info = 1; * @param value the blackInfo to set * @return this */ @@ -223,7 +223,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 4; * @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 = 4; * @return this */ public PlayerGetTokenScRsp clearMsg() { @@ -241,7 +241,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 4; * @return the msg */ public String getMsg() { @@ -249,7 +249,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 4; * @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 = 4; * @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 = 4; * @param value the msg to set * @return this */ @@ -277,7 +277,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 4; * @param value the msg to set * @return this */ @@ -372,23 +372,23 @@ public final class PlayerGetTokenScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 72); output.writeUInt64NoTag(secretKeySeed); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 10); output.writeMessageNoTag(blackInfo); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 34); output.writeStringNoTag(msg); } } @@ -421,43 +421,43 @@ public final class PlayerGetTokenScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 72: { // secretKeySeed secretKeySeed = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 64) { break; } } - case 8: { + case 64: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 104) { break; } } - case 40: { + case 104: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 18) { + if (tag != 10) { break; } } - case 18: { + case 10: { // blackInfo input.readMessage(blackInfo); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 66) { + if (tag != 34) { break; } } - case 66: { + case 34: { // msg input.readString(msg); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java index 832811e..b79bed0 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java @@ -24,12 +24,12 @@ public final class PlayerHeartbeatCsReqOuterClass { private long clientTimeMs; /** - * optional uint32 DCLHJDKBBAK = 6; + * optional uint32 DIMAFIDFCOD = 7; */ - private int dCLHJDKBBAK; + private int dIMAFIDFCOD; /** - * optional .ClientUploadData upload_data = 10; + * optional .ClientUploadData upload_data = 13; */ private final ClientUploadDataOuterClass.ClientUploadData uploadData = ClientUploadDataOuterClass.ClientUploadData.newInstance(); @@ -81,44 +81,44 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional uint32 DCLHJDKBBAK = 6; - * @return whether the dCLHJDKBBAK field is set + * optional uint32 DIMAFIDFCOD = 7; + * @return whether the dIMAFIDFCOD field is set */ - public boolean hasDCLHJDKBBAK() { + public boolean hasDIMAFIDFCOD() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 DCLHJDKBBAK = 6; + * optional uint32 DIMAFIDFCOD = 7; * @return this */ - public PlayerHeartbeatCsReq clearDCLHJDKBBAK() { + public PlayerHeartbeatCsReq clearDIMAFIDFCOD() { bitField0_ &= ~0x00000002; - dCLHJDKBBAK = 0; + dIMAFIDFCOD = 0; return this; } /** - * optional uint32 DCLHJDKBBAK = 6; - * @return the dCLHJDKBBAK + * optional uint32 DIMAFIDFCOD = 7; + * @return the dIMAFIDFCOD */ - public int getDCLHJDKBBAK() { - return dCLHJDKBBAK; + public int getDIMAFIDFCOD() { + return dIMAFIDFCOD; } /** - * optional uint32 DCLHJDKBBAK = 6; - * @param value the dCLHJDKBBAK to set + * optional uint32 DIMAFIDFCOD = 7; + * @param value the dIMAFIDFCOD to set * @return this */ - public PlayerHeartbeatCsReq setDCLHJDKBBAK(final int value) { + public PlayerHeartbeatCsReq setDIMAFIDFCOD(final int value) { bitField0_ |= 0x00000002; - dCLHJDKBBAK = value; + dIMAFIDFCOD = value; return this; } /** - * optional .ClientUploadData upload_data = 10; + * optional .ClientUploadData upload_data = 13; * @return whether the uploadData field is set */ public boolean hasUploadData() { @@ -126,7 +126,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional .ClientUploadData upload_data = 10; + * optional .ClientUploadData upload_data = 13; * @return this */ public PlayerHeartbeatCsReq clearUploadData() { @@ -136,7 +136,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional .ClientUploadData upload_data = 10; + * optional .ClientUploadData upload_data = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional .ClientUploadData upload_data = 10; + * optional .ClientUploadData upload_data = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional .ClientUploadData upload_data = 10; + * optional .ClientUploadData upload_data = 13; * @param value the uploadData to set * @return this */ @@ -181,7 +181,7 @@ public final class PlayerHeartbeatCsReqOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; clientTimeMs = other.clientTimeMs; - dCLHJDKBBAK = other.dCLHJDKBBAK; + dIMAFIDFCOD = other.dIMAFIDFCOD; uploadData.copyFrom(other.uploadData); } return this; @@ -196,8 +196,8 @@ public final class PlayerHeartbeatCsReqOuterClass { if (other.hasClientTimeMs()) { setClientTimeMs(other.clientTimeMs); } - if (other.hasDCLHJDKBBAK()) { - setDCLHJDKBBAK(other.dCLHJDKBBAK); + if (other.hasDIMAFIDFCOD()) { + setDIMAFIDFCOD(other.dIMAFIDFCOD); } if (other.hasUploadData()) { getMutableUploadData().mergeFrom(other.uploadData); @@ -213,7 +213,7 @@ public final class PlayerHeartbeatCsReqOuterClass { cachedSize = -1; bitField0_ = 0; clientTimeMs = 0L; - dCLHJDKBBAK = 0; + dIMAFIDFCOD = 0; uploadData.clear(); return this; } @@ -240,7 +240,7 @@ public final class PlayerHeartbeatCsReqOuterClass { PlayerHeartbeatCsReq other = (PlayerHeartbeatCsReq) o; return bitField0_ == other.bitField0_ && (!hasClientTimeMs() || clientTimeMs == other.clientTimeMs) - && (!hasDCLHJDKBBAK() || dCLHJDKBBAK == other.dCLHJDKBBAK) + && (!hasDIMAFIDFCOD() || dIMAFIDFCOD == other.dIMAFIDFCOD) && (!hasUploadData() || uploadData.equals(other.uploadData)); } @@ -251,11 +251,11 @@ public final class PlayerHeartbeatCsReqOuterClass { output.writeUInt64NoTag(clientTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(dCLHJDKBBAK); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(dIMAFIDFCOD); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 106); output.writeMessageNoTag(uploadData); } } @@ -267,7 +267,7 @@ public final class PlayerHeartbeatCsReqOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(clientTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dCLHJDKBBAK); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dIMAFIDFCOD); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(uploadData); @@ -287,20 +287,20 @@ public final class PlayerHeartbeatCsReqOuterClass { clientTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 56) { break; } } - case 48: { - // dCLHJDKBBAK - dCLHJDKBBAK = input.readUInt32(); + case 56: { + // dIMAFIDFCOD + dIMAFIDFCOD = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { + if (tag != 106) { break; } } - case 82: { + case 106: { // uploadData input.readMessage(uploadData); bitField0_ |= 0x00000004; @@ -330,7 +330,7 @@ public final class PlayerHeartbeatCsReqOuterClass { output.writeUInt64(FieldNames.clientTimeMs, clientTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.dCLHJDKBBAK, dCLHJDKBBAK); + output.writeUInt32(FieldNames.dIMAFIDFCOD, dIMAFIDFCOD); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.uploadData, uploadData); @@ -357,10 +357,10 @@ public final class PlayerHeartbeatCsReqOuterClass { } break; } - case 2054436768: { - if (input.isAtField(FieldNames.dCLHJDKBBAK)) { + case 634885050: { + if (input.isAtField(FieldNames.dIMAFIDFCOD)) { if (!input.trySkipNullValue()) { - dCLHJDKBBAK = input.readUInt32(); + dIMAFIDFCOD = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -435,7 +435,7 @@ public final class PlayerHeartbeatCsReqOuterClass { static class FieldNames { static final FieldName clientTimeMs = FieldName.forField("clientTimeMs", "client_time_ms"); - static final FieldName dCLHJDKBBAK = FieldName.forField("DCLHJDKBBAK"); + static final FieldName dIMAFIDFCOD = FieldName.forField("DIMAFIDFCOD"); static final FieldName uploadData = FieldName.forField("uploadData", "upload_data"); } diff --git a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java index 30c9fbf..29ad685 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java @@ -19,17 +19,21 @@ public final class PlayerHeartbeatScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 server_time_ms = 4; - */ - private long serverTimeMs; - - /** - * optional uint64 client_time_ms = 10; + * optional uint64 client_time_ms = 8; */ private long clientTimeMs; /** - * optional uint32 retcode = 15; + * 
+     * ClientDownloadData download_data = 1;
+     *
+ * + * optional uint64 server_time_ms = 10; + */ + private long serverTimeMs; + + /** + * optional uint32 retcode = 12; */ private int retcode; @@ -44,62 +48,25 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint64 server_time_ms = 4; - * @return whether the serverTimeMs field is set + * optional uint64 client_time_ms = 8; + * @return whether the clientTimeMs field is set */ - public boolean hasServerTimeMs() { + public boolean hasClientTimeMs() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint64 server_time_ms = 4; - * @return this - */ - public PlayerHeartbeatScRsp clearServerTimeMs() { - bitField0_ &= ~0x00000001; - serverTimeMs = 0L; - return this; - } - - /** - * optional uint64 server_time_ms = 4; - * @return the serverTimeMs - */ - public long getServerTimeMs() { - return serverTimeMs; - } - - /** - * optional uint64 server_time_ms = 4; - * @param value the serverTimeMs to set - * @return this - */ - public PlayerHeartbeatScRsp setServerTimeMs(final long value) { - bitField0_ |= 0x00000001; - serverTimeMs = value; - return this; - } - - /** - * optional uint64 client_time_ms = 10; - * @return whether the clientTimeMs field is set - */ - public boolean hasClientTimeMs() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint64 client_time_ms = 10; + * optional uint64 client_time_ms = 8; * @return this */ public PlayerHeartbeatScRsp clearClientTimeMs() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; clientTimeMs = 0L; return this; } /** - * optional uint64 client_time_ms = 10; + * optional uint64 client_time_ms = 8; * @return the clientTimeMs */ public long getClientTimeMs() { @@ -107,18 +74,71 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint64 client_time_ms = 10; + * optional uint64 client_time_ms = 8; * @param value the clientTimeMs to set * @return this */ public PlayerHeartbeatScRsp setClientTimeMs(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; clientTimeMs = value; return this; } /** - * optional uint32 retcode = 15; + * 
+     * ClientDownloadData download_data = 1;
+     *
+ * + * optional uint64 server_time_ms = 10; + * @return whether the serverTimeMs field is set + */ + public boolean hasServerTimeMs() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * 
+     * ClientDownloadData download_data = 1;
+     *
+ * + * optional uint64 server_time_ms = 10; + * @return this + */ + public PlayerHeartbeatScRsp clearServerTimeMs() { + bitField0_ &= ~0x00000002; + serverTimeMs = 0L; + return this; + } + + /** + * 
+     * ClientDownloadData download_data = 1;
+     *
+ * + * optional uint64 server_time_ms = 10; + * @return the serverTimeMs + */ + public long getServerTimeMs() { + return serverTimeMs; + } + + /** + * 
+     * ClientDownloadData download_data = 1;
+     *
+ * + * optional uint64 server_time_ms = 10; + * @param value the serverTimeMs to set + * @return this + */ + public PlayerHeartbeatScRsp setServerTimeMs(final long value) { + bitField0_ |= 0x00000002; + serverTimeMs = value; + return this; + } + + /** + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -126,7 +146,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @return this */ public PlayerHeartbeatScRsp clearRetcode() { @@ -136,7 +156,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -144,7 +164,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -159,8 +179,8 @@ public final class PlayerHeartbeatScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - serverTimeMs = other.serverTimeMs; clientTimeMs = other.clientTimeMs; + serverTimeMs = other.serverTimeMs; retcode = other.retcode; } return this; @@ -172,12 +192,12 @@ public final class PlayerHeartbeatScRspOuterClass { return this; } cachedSize = -1; - if (other.hasServerTimeMs()) { - setServerTimeMs(other.serverTimeMs); - } if (other.hasClientTimeMs()) { setClientTimeMs(other.clientTimeMs); } + if (other.hasServerTimeMs()) { + setServerTimeMs(other.serverTimeMs); + } if (other.hasRetcode()) { setRetcode(other.retcode); } @@ -191,8 +211,8 @@ public final class PlayerHeartbeatScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - serverTimeMs = 0L; clientTimeMs = 0L; + serverTimeMs = 0L; retcode = 0; return this; } @@ -217,23 +237,23 @@ public final class PlayerHeartbeatScRspOuterClass { } PlayerHeartbeatScRsp other = (PlayerHeartbeatScRsp) o; return bitField0_ == other.bitField0_ - && (!hasServerTimeMs() || serverTimeMs == other.serverTimeMs) && (!hasClientTimeMs() || clientTimeMs == other.clientTimeMs) + && (!hasServerTimeMs() || serverTimeMs == other.serverTimeMs) && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt64NoTag(serverTimeMs); + output.writeRawByte((byte) 64); + output.writeUInt64NoTag(clientTimeMs); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 80); - output.writeUInt64NoTag(clientTimeMs); + output.writeUInt64NoTag(serverTimeMs); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } } @@ -242,10 +262,10 @@ public final class PlayerHeartbeatScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(serverTimeMs); + size += 1 + ProtoSink.computeUInt64SizeNoTag(clientTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(clientTimeMs); + size += 1 + ProtoSink.computeUInt64SizeNoTag(serverTimeMs); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); @@ -260,9 +280,9 @@ public final class PlayerHeartbeatScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // serverTimeMs - serverTimeMs = input.readUInt64(); + case 64: { + // clientTimeMs + clientTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 80) { @@ -270,15 +290,15 @@ public final class PlayerHeartbeatScRspOuterClass { } } case 80: { - // clientTimeMs - clientTimeMs = input.readUInt64(); + // serverTimeMs + serverTimeMs = input.readUInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 120) { + if (tag != 96) { break; } } - case 120: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000004; @@ -305,10 +325,10 @@ public final class PlayerHeartbeatScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt64(FieldNames.serverTimeMs, serverTimeMs); + output.writeUInt64(FieldNames.clientTimeMs, clientTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt64(FieldNames.clientTimeMs, clientTimeMs); + output.writeUInt64(FieldNames.serverTimeMs, serverTimeMs); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.retcode, retcode); @@ -323,11 +343,11 @@ public final class PlayerHeartbeatScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1928739446: - case 1149956956: { - if (input.isAtField(FieldNames.serverTimeMs)) { + case -1414301442: + case 1123200996: { + if (input.isAtField(FieldNames.clientTimeMs)) { if (!input.trySkipNullValue()) { - serverTimeMs = input.readUInt64(); + clientTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +355,11 @@ public final class PlayerHeartbeatScRspOuterClass { } break; } - case -1414301442: - case 1123200996: { - if (input.isAtField(FieldNames.clientTimeMs)) { + case 1928739446: + case 1149956956: { + if (input.isAtField(FieldNames.serverTimeMs)) { if (!input.trySkipNullValue()) { - clientTimeMs = input.readUInt64(); + serverTimeMs = input.readUInt64(); bitField0_ |= 0x00000002; } } else { @@ -411,10 +431,10 @@ public final class PlayerHeartbeatScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName serverTimeMs = FieldName.forField("serverTimeMs", "server_time_ms"); - static final FieldName clientTimeMs = FieldName.forField("clientTimeMs", "client_time_ms"); + static final FieldName serverTimeMs = FieldName.forField("serverTimeMs", "server_time_ms"); + static final FieldName retcode = FieldName.forField("retcode"); } } diff --git a/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java index a990c40..6c0df87 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java @@ -20,22 +20,22 @@ public final class PlayerLoginScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 login_random = 4; + * optional uint64 login_random = 10; */ private long loginRandom; /** - * optional uint64 server_timestamp_ms = 11; + * optional uint64 server_timestamp_ms = 12; */ private long serverTimestampMs; /** - * optional int32 cur_timezone = 14; + * optional int32 cur_timezone = 4; */ private int curTimezone; /** - * optional uint32 stamina = 6; + * optional uint32 stamina = 8; */ private int stamina; @@ -45,29 +45,29 @@ public final class PlayerLoginScRspOuterClass { private int retcode; /** - * optional bool EPIIKAGFCNK = 7; + * optional bool GIALIFNNOPN = 7; */ - private boolean ePIIKAGFCNK; + private boolean gIALIFNNOPN; /** - * optional bool OCAPAMPOKBM = 12; + * optional bool HNAGOHGGJDH = 13; */ - private boolean oCAPAMPOKBM; + private boolean hNAGOHGGJDH; /** - * optional .PlayerBasicInfo basic_info = 2; + * optional .PlayerBasicInfo basic_info = 11; */ private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance(); /** - * optional string HNPFOMCJIJM = 3; + * optional string DBOOCPHLJJE = 2; */ - private final Utf8String hNPFOMCJIJM = Utf8String.newEmptyInstance(); + private final Utf8String dBOOCPHLJJE = Utf8String.newEmptyInstance(); /** - * optional string FCAJKKEINID = 8; + * optional string JIDCKGFNDNP = 3; */ - private final Utf8String fCAJKKEINID = Utf8String.newEmptyInstance(); + private final Utf8String jIDCKGFNDNP = Utf8String.newEmptyInstance(); private PlayerLoginScRsp() { } @@ -80,7 +80,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 login_random = 4; + * optional uint64 login_random = 10; * @return whether the loginRandom field is set */ public boolean hasLoginRandom() { @@ -88,7 +88,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 login_random = 4; + * optional uint64 login_random = 10; * @return this */ public PlayerLoginScRsp clearLoginRandom() { @@ -98,7 +98,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 login_random = 4; + * optional uint64 login_random = 10; * @return the loginRandom */ public long getLoginRandom() { @@ -106,7 +106,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 login_random = 4; + * optional uint64 login_random = 10; * @param value the loginRandom to set * @return this */ @@ -117,7 +117,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 server_timestamp_ms = 11; + * optional uint64 server_timestamp_ms = 12; * @return whether the serverTimestampMs field is set */ public boolean hasServerTimestampMs() { @@ -125,7 +125,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 server_timestamp_ms = 11; + * optional uint64 server_timestamp_ms = 12; * @return this */ public PlayerLoginScRsp clearServerTimestampMs() { @@ -135,7 +135,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 server_timestamp_ms = 11; + * optional uint64 server_timestamp_ms = 12; * @return the serverTimestampMs */ public long getServerTimestampMs() { @@ -143,7 +143,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 server_timestamp_ms = 11; + * optional uint64 server_timestamp_ms = 12; * @param value the serverTimestampMs to set * @return this */ @@ -154,7 +154,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional int32 cur_timezone = 14; + * optional int32 cur_timezone = 4; * @return whether the curTimezone field is set */ public boolean hasCurTimezone() { @@ -162,7 +162,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional int32 cur_timezone = 14; + * optional int32 cur_timezone = 4; * @return this */ public PlayerLoginScRsp clearCurTimezone() { @@ -172,7 +172,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional int32 cur_timezone = 14; + * optional int32 cur_timezone = 4; * @return the curTimezone */ public int getCurTimezone() { @@ -180,7 +180,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional int32 cur_timezone = 14; + * optional int32 cur_timezone = 4; * @param value the curTimezone to set * @return this */ @@ -191,7 +191,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 stamina = 6; + * optional uint32 stamina = 8; * @return whether the stamina field is set */ public boolean hasStamina() { @@ -199,7 +199,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 stamina = 6; + * optional uint32 stamina = 8; * @return this */ public PlayerLoginScRsp clearStamina() { @@ -209,7 +209,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 stamina = 6; + * optional uint32 stamina = 8; * @return the stamina */ public int getStamina() { @@ -217,7 +217,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 stamina = 6; + * optional uint32 stamina = 8; * @param value the stamina to set * @return this */ @@ -265,81 +265,81 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional bool EPIIKAGFCNK = 7; - * @return whether the ePIIKAGFCNK field is set + * optional bool GIALIFNNOPN = 7; + * @return whether the gIALIFNNOPN field is set */ - public boolean hasEPIIKAGFCNK() { + public boolean hasGIALIFNNOPN() { return (bitField0_ & 0x00000020) != 0; } /** - * optional bool EPIIKAGFCNK = 7; + * optional bool GIALIFNNOPN = 7; * @return this */ - public PlayerLoginScRsp clearEPIIKAGFCNK() { + public PlayerLoginScRsp clearGIALIFNNOPN() { bitField0_ &= ~0x00000020; - ePIIKAGFCNK = false; + gIALIFNNOPN = false; return this; } /** - * optional bool EPIIKAGFCNK = 7; - * @return the ePIIKAGFCNK + * optional bool GIALIFNNOPN = 7; + * @return the gIALIFNNOPN */ - public boolean getEPIIKAGFCNK() { - return ePIIKAGFCNK; + public boolean getGIALIFNNOPN() { + return gIALIFNNOPN; } /** - * optional bool EPIIKAGFCNK = 7; - * @param value the ePIIKAGFCNK to set + * optional bool GIALIFNNOPN = 7; + * @param value the gIALIFNNOPN to set * @return this */ - public PlayerLoginScRsp setEPIIKAGFCNK(final boolean value) { + public PlayerLoginScRsp setGIALIFNNOPN(final boolean value) { bitField0_ |= 0x00000020; - ePIIKAGFCNK = value; + gIALIFNNOPN = value; return this; } /** - * optional bool OCAPAMPOKBM = 12; - * @return whether the oCAPAMPOKBM field is set + * optional bool HNAGOHGGJDH = 13; + * @return whether the hNAGOHGGJDH field is set */ - public boolean hasOCAPAMPOKBM() { + public boolean hasHNAGOHGGJDH() { return (bitField0_ & 0x00000040) != 0; } /** - * optional bool OCAPAMPOKBM = 12; + * optional bool HNAGOHGGJDH = 13; * @return this */ - public PlayerLoginScRsp clearOCAPAMPOKBM() { + public PlayerLoginScRsp clearHNAGOHGGJDH() { bitField0_ &= ~0x00000040; - oCAPAMPOKBM = false; + hNAGOHGGJDH = false; return this; } /** - * optional bool OCAPAMPOKBM = 12; - * @return the oCAPAMPOKBM + * optional bool HNAGOHGGJDH = 13; + * @return the hNAGOHGGJDH */ - public boolean getOCAPAMPOKBM() { - return oCAPAMPOKBM; + public boolean getHNAGOHGGJDH() { + return hNAGOHGGJDH; } /** - * optional bool OCAPAMPOKBM = 12; - * @param value the oCAPAMPOKBM to set + * optional bool HNAGOHGGJDH = 13; + * @param value the hNAGOHGGJDH to set * @return this */ - public PlayerLoginScRsp setOCAPAMPOKBM(final boolean value) { + public PlayerLoginScRsp setHNAGOHGGJDH(final boolean value) { bitField0_ |= 0x00000040; - oCAPAMPOKBM = value; + hNAGOHGGJDH = value; return this; } /** - * optional .PlayerBasicInfo basic_info = 2; + * optional .PlayerBasicInfo basic_info = 11; * @return whether the basicInfo field is set */ public boolean hasBasicInfo() { @@ -347,7 +347,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 2; + * optional .PlayerBasicInfo basic_info = 11; * @return this */ public PlayerLoginScRsp clearBasicInfo() { @@ -357,7 +357,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 2; + * optional .PlayerBasicInfo basic_info = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -371,7 +371,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 2; + * optional .PlayerBasicInfo basic_info = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -385,7 +385,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 2; + * optional .PlayerBasicInfo basic_info = 11; * @param value the basicInfo to set * @return this */ @@ -396,132 +396,132 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional string HNPFOMCJIJM = 3; - * @return whether the hNPFOMCJIJM field is set + * optional string DBOOCPHLJJE = 2; + * @return whether the dBOOCPHLJJE field is set */ - public boolean hasHNPFOMCJIJM() { + public boolean hasDBOOCPHLJJE() { return (bitField0_ & 0x00000100) != 0; } /** - * optional string HNPFOMCJIJM = 3; + * optional string DBOOCPHLJJE = 2; * @return this */ - public PlayerLoginScRsp clearHNPFOMCJIJM() { + public PlayerLoginScRsp clearDBOOCPHLJJE() { bitField0_ &= ~0x00000100; - hNPFOMCJIJM.clear(); + dBOOCPHLJJE.clear(); return this; } /** - * optional string HNPFOMCJIJM = 3; - * @return the hNPFOMCJIJM + * optional string DBOOCPHLJJE = 2; + * @return the dBOOCPHLJJE */ - public String getHNPFOMCJIJM() { - return hNPFOMCJIJM.getString(); + public String getDBOOCPHLJJE() { + return dBOOCPHLJJE.getString(); } /** - * optional string HNPFOMCJIJM = 3; - * @return internal {@code Utf8String} representation of hNPFOMCJIJM for reading + * optional string DBOOCPHLJJE = 2; + * @return internal {@code Utf8String} representation of dBOOCPHLJJE for reading */ - public Utf8String getHNPFOMCJIJMBytes() { - return this.hNPFOMCJIJM; + public Utf8String getDBOOCPHLJJEBytes() { + return this.dBOOCPHLJJE; } /** - * optional string HNPFOMCJIJM = 3; - * @return internal {@code Utf8String} representation of hNPFOMCJIJM for modifications + * optional string DBOOCPHLJJE = 2; + * @return internal {@code Utf8String} representation of dBOOCPHLJJE for modifications */ - public Utf8String getMutableHNPFOMCJIJMBytes() { + public Utf8String getMutableDBOOCPHLJJEBytes() { bitField0_ |= 0x00000100; - return this.hNPFOMCJIJM; + return this.dBOOCPHLJJE; } /** - * optional string HNPFOMCJIJM = 3; - * @param value the hNPFOMCJIJM to set + * optional string DBOOCPHLJJE = 2; + * @param value the dBOOCPHLJJE to set * @return this */ - public PlayerLoginScRsp setHNPFOMCJIJM(final CharSequence value) { + public PlayerLoginScRsp setDBOOCPHLJJE(final CharSequence value) { bitField0_ |= 0x00000100; - hNPFOMCJIJM.copyFrom(value); + dBOOCPHLJJE.copyFrom(value); return this; } /** - * optional string HNPFOMCJIJM = 3; - * @param value the hNPFOMCJIJM to set + * optional string DBOOCPHLJJE = 2; + * @param value the dBOOCPHLJJE to set * @return this */ - public PlayerLoginScRsp setHNPFOMCJIJM(final Utf8String value) { + public PlayerLoginScRsp setDBOOCPHLJJE(final Utf8String value) { bitField0_ |= 0x00000100; - hNPFOMCJIJM.copyFrom(value); + dBOOCPHLJJE.copyFrom(value); return this; } /** - * optional string FCAJKKEINID = 8; - * @return whether the fCAJKKEINID field is set + * optional string JIDCKGFNDNP = 3; + * @return whether the jIDCKGFNDNP field is set */ - public boolean hasFCAJKKEINID() { + public boolean hasJIDCKGFNDNP() { return (bitField0_ & 0x00000200) != 0; } /** - * optional string FCAJKKEINID = 8; + * optional string JIDCKGFNDNP = 3; * @return this */ - public PlayerLoginScRsp clearFCAJKKEINID() { + public PlayerLoginScRsp clearJIDCKGFNDNP() { bitField0_ &= ~0x00000200; - fCAJKKEINID.clear(); + jIDCKGFNDNP.clear(); return this; } /** - * optional string FCAJKKEINID = 8; - * @return the fCAJKKEINID + * optional string JIDCKGFNDNP = 3; + * @return the jIDCKGFNDNP */ - public String getFCAJKKEINID() { - return fCAJKKEINID.getString(); + public String getJIDCKGFNDNP() { + return jIDCKGFNDNP.getString(); } /** - * optional string FCAJKKEINID = 8; - * @return internal {@code Utf8String} representation of fCAJKKEINID for reading + * optional string JIDCKGFNDNP = 3; + * @return internal {@code Utf8String} representation of jIDCKGFNDNP for reading */ - public Utf8String getFCAJKKEINIDBytes() { - return this.fCAJKKEINID; + public Utf8String getJIDCKGFNDNPBytes() { + return this.jIDCKGFNDNP; } /** - * optional string FCAJKKEINID = 8; - * @return internal {@code Utf8String} representation of fCAJKKEINID for modifications + * optional string JIDCKGFNDNP = 3; + * @return internal {@code Utf8String} representation of jIDCKGFNDNP for modifications */ - public Utf8String getMutableFCAJKKEINIDBytes() { + public Utf8String getMutableJIDCKGFNDNPBytes() { bitField0_ |= 0x00000200; - return this.fCAJKKEINID; + return this.jIDCKGFNDNP; } /** - * optional string FCAJKKEINID = 8; - * @param value the fCAJKKEINID to set + * optional string JIDCKGFNDNP = 3; + * @param value the jIDCKGFNDNP to set * @return this */ - public PlayerLoginScRsp setFCAJKKEINID(final CharSequence value) { + public PlayerLoginScRsp setJIDCKGFNDNP(final CharSequence value) { bitField0_ |= 0x00000200; - fCAJKKEINID.copyFrom(value); + jIDCKGFNDNP.copyFrom(value); return this; } /** - * optional string FCAJKKEINID = 8; - * @param value the fCAJKKEINID to set + * optional string JIDCKGFNDNP = 3; + * @param value the jIDCKGFNDNP to set * @return this */ - public PlayerLoginScRsp setFCAJKKEINID(final Utf8String value) { + public PlayerLoginScRsp setJIDCKGFNDNP(final Utf8String value) { bitField0_ |= 0x00000200; - fCAJKKEINID.copyFrom(value); + jIDCKGFNDNP.copyFrom(value); return this; } @@ -535,11 +535,11 @@ public final class PlayerLoginScRspOuterClass { curTimezone = other.curTimezone; stamina = other.stamina; retcode = other.retcode; - ePIIKAGFCNK = other.ePIIKAGFCNK; - oCAPAMPOKBM = other.oCAPAMPOKBM; + gIALIFNNOPN = other.gIALIFNNOPN; + hNAGOHGGJDH = other.hNAGOHGGJDH; basicInfo.copyFrom(other.basicInfo); - hNPFOMCJIJM.copyFrom(other.hNPFOMCJIJM); - fCAJKKEINID.copyFrom(other.fCAJKKEINID); + dBOOCPHLJJE.copyFrom(other.dBOOCPHLJJE); + jIDCKGFNDNP.copyFrom(other.jIDCKGFNDNP); } return this; } @@ -565,20 +565,20 @@ public final class PlayerLoginScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasEPIIKAGFCNK()) { - setEPIIKAGFCNK(other.ePIIKAGFCNK); + if (other.hasGIALIFNNOPN()) { + setGIALIFNNOPN(other.gIALIFNNOPN); } - if (other.hasOCAPAMPOKBM()) { - setOCAPAMPOKBM(other.oCAPAMPOKBM); + if (other.hasHNAGOHGGJDH()) { + setHNAGOHGGJDH(other.hNAGOHGGJDH); } if (other.hasBasicInfo()) { getMutableBasicInfo().mergeFrom(other.basicInfo); } - if (other.hasHNPFOMCJIJM()) { - getMutableHNPFOMCJIJMBytes().copyFrom(other.hNPFOMCJIJM); + if (other.hasDBOOCPHLJJE()) { + getMutableDBOOCPHLJJEBytes().copyFrom(other.dBOOCPHLJJE); } - if (other.hasFCAJKKEINID()) { - getMutableFCAJKKEINIDBytes().copyFrom(other.fCAJKKEINID); + if (other.hasJIDCKGFNDNP()) { + getMutableJIDCKGFNDNPBytes().copyFrom(other.jIDCKGFNDNP); } return this; } @@ -595,11 +595,11 @@ public final class PlayerLoginScRspOuterClass { curTimezone = 0; stamina = 0; retcode = 0; - ePIIKAGFCNK = false; - oCAPAMPOKBM = false; + gIALIFNNOPN = false; + hNAGOHGGJDH = false; basicInfo.clear(); - hNPFOMCJIJM.clear(); - fCAJKKEINID.clear(); + dBOOCPHLJJE.clear(); + jIDCKGFNDNP.clear(); return this; } @@ -611,8 +611,8 @@ public final class PlayerLoginScRspOuterClass { cachedSize = -1; bitField0_ = 0; basicInfo.clearQuick(); - hNPFOMCJIJM.clear(); - fCAJKKEINID.clear(); + dBOOCPHLJJE.clear(); + jIDCKGFNDNP.clear(); return this; } @@ -631,29 +631,29 @@ public final class PlayerLoginScRspOuterClass { && (!hasCurTimezone() || curTimezone == other.curTimezone) && (!hasStamina() || stamina == other.stamina) && (!hasRetcode() || retcode == other.retcode) - && (!hasEPIIKAGFCNK() || ePIIKAGFCNK == other.ePIIKAGFCNK) - && (!hasOCAPAMPOKBM() || oCAPAMPOKBM == other.oCAPAMPOKBM) + && (!hasGIALIFNNOPN() || gIALIFNNOPN == other.gIALIFNNOPN) + && (!hasHNAGOHGGJDH() || hNAGOHGGJDH == other.hNAGOHGGJDH) && (!hasBasicInfo() || basicInfo.equals(other.basicInfo)) - && (!hasHNPFOMCJIJM() || hNPFOMCJIJM.equals(other.hNPFOMCJIJM)) - && (!hasFCAJKKEINID() || fCAJKKEINID.equals(other.fCAJKKEINID)); + && (!hasDBOOCPHLJJE() || dBOOCPHLJJE.equals(other.dBOOCPHLJJE)) + && (!hasJIDCKGFNDNP() || jIDCKGFNDNP.equals(other.jIDCKGFNDNP)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 80); output.writeUInt64NoTag(loginRandom); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 96); output.writeUInt64NoTag(serverTimestampMs); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 32); output.writeInt32NoTag(curTimezone); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(stamina); } if ((bitField0_ & 0x00000010) != 0) { @@ -662,23 +662,23 @@ public final class PlayerLoginScRspOuterClass { } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 56); - output.writeBoolNoTag(ePIIKAGFCNK); + output.writeBoolNoTag(gIALIFNNOPN); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 96); - output.writeBoolNoTag(oCAPAMPOKBM); + output.writeRawByte((byte) 104); + output.writeBoolNoTag(hNAGOHGGJDH); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 90); output.writeMessageNoTag(basicInfo); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 26); - output.writeStringNoTag(hNPFOMCJIJM); + output.writeRawByte((byte) 18); + output.writeStringNoTag(dBOOCPHLJJE); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 66); - output.writeStringNoTag(fCAJKKEINID); + output.writeRawByte((byte) 26); + output.writeStringNoTag(jIDCKGFNDNP); } } @@ -710,10 +710,10 @@ public final class PlayerLoginScRspOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(basicInfo); } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(hNPFOMCJIJM); + size += 1 + ProtoSink.computeStringSizeNoTag(dBOOCPHLJJE); } if ((bitField0_ & 0x00000200) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(fCAJKKEINID); + size += 1 + ProtoSink.computeStringSizeNoTag(jIDCKGFNDNP); } return size; } @@ -725,34 +725,34 @@ public final class PlayerLoginScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 80: { // loginRandom loginRandom = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { + case 96: { // serverTimestampMs serverTimestampMs = input.readUInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 32) { break; } } - case 112: { + case 32: { // curTimezone curTimezone = input.readInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 48) { + if (tag != 64) { break; } } - case 48: { + case 64: { // stamina stamina = input.readUInt32(); bitField0_ |= 0x00000008; @@ -771,44 +771,44 @@ public final class PlayerLoginScRspOuterClass { } } case 56: { - // ePIIKAGFCNK - ePIIKAGFCNK = input.readBool(); + // gIALIFNNOPN + gIALIFNNOPN = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 96) { + if (tag != 104) { break; } } - case 96: { - // oCAPAMPOKBM - oCAPAMPOKBM = input.readBool(); + case 104: { + // hNAGOHGGJDH + hNAGOHGGJDH = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { + // basicInfo + input.readMessage(basicInfo); + bitField0_ |= 0x00000080; + tag = input.readTag(); if (tag != 18) { break; } } case 18: { - // basicInfo - input.readMessage(basicInfo); - bitField0_ |= 0x00000080; + // dBOOCPHLJJE + input.readString(dBOOCPHLJJE); + bitField0_ |= 0x00000100; tag = input.readTag(); if (tag != 26) { break; } } case 26: { - // hNPFOMCJIJM - input.readString(hNPFOMCJIJM); - bitField0_ |= 0x00000100; - tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { - // fCAJKKEINID - input.readString(fCAJKKEINID); + // jIDCKGFNDNP + input.readString(jIDCKGFNDNP); bitField0_ |= 0x00000200; tag = input.readTag(); if (tag != 0) { @@ -848,19 +848,19 @@ public final class PlayerLoginScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000020) != 0) { - output.writeBool(FieldNames.ePIIKAGFCNK, ePIIKAGFCNK); + output.writeBool(FieldNames.gIALIFNNOPN, gIALIFNNOPN); } if ((bitField0_ & 0x00000040) != 0) { - output.writeBool(FieldNames.oCAPAMPOKBM, oCAPAMPOKBM); + output.writeBool(FieldNames.hNAGOHGGJDH, hNAGOHGGJDH); } if ((bitField0_ & 0x00000080) != 0) { output.writeMessage(FieldNames.basicInfo, basicInfo); } if ((bitField0_ & 0x00000100) != 0) { - output.writeString(FieldNames.hNPFOMCJIJM, hNPFOMCJIJM); + output.writeString(FieldNames.dBOOCPHLJJE, dBOOCPHLJJE); } if ((bitField0_ & 0x00000200) != 0) { - output.writeString(FieldNames.fCAJKKEINID, fCAJKKEINID); + output.writeString(FieldNames.jIDCKGFNDNP, jIDCKGFNDNP); } output.endObject(); } @@ -930,10 +930,10 @@ public final class PlayerLoginScRspOuterClass { } break; } - case 1371058944: { - if (input.isAtField(FieldNames.ePIIKAGFCNK)) { + case 35801251: { + if (input.isAtField(FieldNames.gIALIFNNOPN)) { if (!input.trySkipNullValue()) { - ePIIKAGFCNK = input.readBool(); + gIALIFNNOPN = input.readBool(); bitField0_ |= 0x00000020; } } else { @@ -941,10 +941,10 @@ public final class PlayerLoginScRspOuterClass { } break; } - case -202338200: { - if (input.isAtField(FieldNames.oCAPAMPOKBM)) { + case -1787199991: { + if (input.isAtField(FieldNames.hNAGOHGGJDH)) { if (!input.trySkipNullValue()) { - oCAPAMPOKBM = input.readBool(); + hNAGOHGGJDH = input.readBool(); bitField0_ |= 0x00000040; } } else { @@ -964,10 +964,10 @@ public final class PlayerLoginScRspOuterClass { } break; } - case -437515925: { - if (input.isAtField(FieldNames.hNPFOMCJIJM)) { + case -1138148714: { + if (input.isAtField(FieldNames.dBOOCPHLJJE)) { if (!input.trySkipNullValue()) { - input.readString(hNPFOMCJIJM); + input.readString(dBOOCPHLJJE); bitField0_ |= 0x00000100; } } else { @@ -975,10 +975,10 @@ public final class PlayerLoginScRspOuterClass { } break; } - case 1435904255: { - if (input.isAtField(FieldNames.fCAJKKEINID)) { + case 1103332260: { + if (input.isAtField(FieldNames.jIDCKGFNDNP)) { if (!input.trySkipNullValue()) { - input.readString(fCAJKKEINID); + input.readString(jIDCKGFNDNP); bitField0_ |= 0x00000200; } } else { @@ -1049,15 +1049,15 @@ public final class PlayerLoginScRspOuterClass { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName ePIIKAGFCNK = FieldName.forField("EPIIKAGFCNK"); + static final FieldName gIALIFNNOPN = FieldName.forField("GIALIFNNOPN"); - static final FieldName oCAPAMPOKBM = FieldName.forField("OCAPAMPOKBM"); + static final FieldName hNAGOHGGJDH = FieldName.forField("HNAGOHGGJDH"); static final FieldName basicInfo = FieldName.forField("basicInfo", "basic_info"); - static final FieldName hNPFOMCJIJM = FieldName.forField("HNPFOMCJIJM"); + static final FieldName dBOOCPHLJJE = FieldName.forField("DBOOCPHLJJE"); - static final FieldName fCAJKKEINID = FieldName.forField("FCAJKKEINID"); + static final FieldName jIDCKGFNDNP = FieldName.forField("JIDCKGFNDNP"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java index c45e0dc..7b50607 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java @@ -21,68 +21,49 @@ public final class PlayerSyncScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .AvatarSync avatar_sync = 2; + * optional .AvatarSync avatar_sync = 7; */ private final AvatarSyncOuterClass.AvatarSync avatarSync = AvatarSyncOuterClass.AvatarSync.newInstance(); /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 15; */ private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance(); /** - * optional .BoardDataSync board_data_sync = 1358; + * optional .BoardDataSync board_data_sync = 937; */ private final BoardDataSyncOuterClass.BoardDataSync boardDataSync = BoardDataSyncOuterClass.BoardDataSync.newInstance(); /** - * optional .ItemList DIMLIHPBEFB = 1780; - */ - private final ItemListOuterClass.ItemList dIMLIHPBEFB = ItemListOuterClass.ItemList.newInstance(); - - /** - * repeated uint32 del_relic_list = 4; + * repeated uint32 del_relic_list = 8; */ private final RepeatedInt delRelicList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 del_equipment_list = 10; + * repeated uint32 del_equipment_list = 14; */ private final RepeatedInt delEquipmentList = RepeatedInt.newEmptyInstance(); /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 1; - */ - private final RepeatedMessage basicTypeInfoList = RepeatedMessage.newEmptyInstance(HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo.getFactory()); - - /** - * repeated .Material material_list = 5; - */ - private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); - - /** - * 
-     * repeated JAKOAONFNGN LKGOMEBOJAF = 6;
-     *
- * - * repeated .Relic relic_list = 7; + * repeated .Relic relic_list = 2; */ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); /** - * repeated .WaitDelResource wait_del_resource_list = 8; + * repeated .Material material_list = 3; */ - private final RepeatedMessage waitDelResourceList = RepeatedMessage.newEmptyInstance(WaitDelResourceOuterClass.WaitDelResource.getFactory()); + private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); /** - * repeated .Equipment equipment_list = 12; + * repeated .Equipment equipment_list = 5; */ private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); /** - * repeated .Material KPBMGJKOKDA = 836; + * repeated .HeroBasicTypeInfo basic_type_info_list = 9; */ - private final RepeatedMessage kPBMGJKOKDA = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); + private final RepeatedMessage basicTypeInfoList = RepeatedMessage.newEmptyInstance(HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo.getFactory()); private PlayerSyncScNotify() { } @@ -95,7 +76,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .AvatarSync avatar_sync = 2; + * optional .AvatarSync avatar_sync = 7; * @return whether the avatarSync field is set */ public boolean hasAvatarSync() { @@ -103,7 +84,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .AvatarSync avatar_sync = 2; + * optional .AvatarSync avatar_sync = 7; * @return this */ public PlayerSyncScNotify clearAvatarSync() { @@ -113,7 +94,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .AvatarSync avatar_sync = 2; + * optional .AvatarSync avatar_sync = 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. @@ -127,7 +108,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .AvatarSync avatar_sync = 2; + * optional .AvatarSync avatar_sync = 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 @@ -141,7 +122,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .AvatarSync avatar_sync = 2; + * optional .AvatarSync avatar_sync = 7; * @param value the avatarSync to set * @return this */ @@ -152,7 +133,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 15; * @return whether the basicInfo field is set */ public boolean hasBasicInfo() { @@ -160,7 +141,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 15; * @return this */ public PlayerSyncScNotify clearBasicInfo() { @@ -170,7 +151,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 6; + * 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. @@ -184,7 +165,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 6; + * 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 @@ -198,7 +179,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 15; * @param value the basicInfo to set * @return this */ @@ -209,7 +190,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .BoardDataSync board_data_sync = 1358; + * optional .BoardDataSync board_data_sync = 937; * @return whether the boardDataSync field is set */ public boolean hasBoardDataSync() { @@ -217,7 +198,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .BoardDataSync board_data_sync = 1358; + * optional .BoardDataSync board_data_sync = 937; * @return this */ public PlayerSyncScNotify clearBoardDataSync() { @@ -227,7 +208,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .BoardDataSync board_data_sync = 1358; + * optional .BoardDataSync board_data_sync = 937; * * This 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 +222,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .BoardDataSync board_data_sync = 1358; + * optional .BoardDataSync board_data_sync = 937; * * 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 +236,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .BoardDataSync board_data_sync = 1358; + * optional .BoardDataSync board_data_sync = 937; * @param value the boardDataSync to set * @return this */ @@ -266,82 +247,25 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .ItemList DIMLIHPBEFB = 1780; - * @return whether the dIMLIHPBEFB field is set + * repeated uint32 del_relic_list = 8; + * @return whether the delRelicList field is set */ - public boolean hasDIMLIHPBEFB() { + public boolean hasDelRelicList() { return (bitField0_ & 0x00000008) != 0; } /** - * optional .ItemList DIMLIHPBEFB = 1780; - * @return this - */ - public PlayerSyncScNotify clearDIMLIHPBEFB() { - bitField0_ &= ~0x00000008; - dIMLIHPBEFB.clear(); - return this; - } - - /** - * optional .ItemList DIMLIHPBEFB = 1780; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableDIMLIHPBEFB()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ItemListOuterClass.ItemList getDIMLIHPBEFB() { - return dIMLIHPBEFB; - } - - /** - * optional .ItemList DIMLIHPBEFB = 1780; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of 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 getMutableDIMLIHPBEFB() { - bitField0_ |= 0x00000008; - return dIMLIHPBEFB; - } - - /** - * optional .ItemList DIMLIHPBEFB = 1780; - * @param value the dIMLIHPBEFB to set - * @return this - */ - public PlayerSyncScNotify setDIMLIHPBEFB(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000008; - dIMLIHPBEFB.copyFrom(value); - return this; - } - - /** - * repeated uint32 del_relic_list = 4; - * @return whether the delRelicList field is set - */ - public boolean hasDelRelicList() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated uint32 del_relic_list = 4; + * repeated uint32 del_relic_list = 8; * @return this */ public PlayerSyncScNotify clearDelRelicList() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; delRelicList.clear(); return this; } /** - * repeated uint32 del_relic_list = 4; + * 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. @@ -355,7 +279,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_relic_list = 4; + * 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 @@ -364,52 +288,52 @@ public final class PlayerSyncScNotifyOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableDelRelicList() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return delRelicList; } /** - * repeated uint32 del_relic_list = 4; + * repeated uint32 del_relic_list = 8; * @param value the delRelicList to add * @return this */ public PlayerSyncScNotify addDelRelicList(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; delRelicList.add(value); return this; } /** - * repeated uint32 del_relic_list = 4; + * repeated uint32 del_relic_list = 8; * @param values the delRelicList to add * @return this */ public PlayerSyncScNotify addAllDelRelicList(final int... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; delRelicList.addAll(values); return this; } /** - * repeated uint32 del_equipment_list = 10; + * repeated uint32 del_equipment_list = 14; * @return whether the delEquipmentList field is set */ public boolean hasDelEquipmentList() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000010) != 0; } /** - * repeated uint32 del_equipment_list = 10; + * repeated uint32 del_equipment_list = 14; * @return this */ public PlayerSyncScNotify clearDelEquipmentList() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; delEquipmentList.clear(); return this; } /** - * repeated uint32 del_equipment_list = 10; + * repeated uint32 del_equipment_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -423,7 +347,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_equipment_list = 10; + * repeated uint32 del_equipment_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -432,203 +356,52 @@ public final class PlayerSyncScNotifyOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableDelEquipmentList() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return delEquipmentList; } /** - * repeated uint32 del_equipment_list = 10; + * repeated uint32 del_equipment_list = 14; * @param value the delEquipmentList to add * @return this */ public PlayerSyncScNotify addDelEquipmentList(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; delEquipmentList.add(value); return this; } /** - * repeated uint32 del_equipment_list = 10; + * repeated uint32 del_equipment_list = 14; * @param values the delEquipmentList to add * @return this */ public PlayerSyncScNotify addAllDelEquipmentList(final int... values) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; delEquipmentList.addAll(values); return this; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 1; - * @return whether the basicTypeInfoList field is set - */ - public boolean hasBasicTypeInfoList() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 1; - * @return this - */ - public PlayerSyncScNotify clearBasicTypeInfoList() { - bitField0_ &= ~0x00000040; - basicTypeInfoList.clear(); - return this; - } - - /** - * 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. - * - * Use {@link #getMutableBasicTypeInfoList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getBasicTypeInfoList() { - return basicTypeInfoList; - } - - /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 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 getMutableBasicTypeInfoList( - ) { - bitField0_ |= 0x00000040; - return basicTypeInfoList; - } - - /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 1; - * @param value the basicTypeInfoList to add - * @return this - */ - public PlayerSyncScNotify addBasicTypeInfoList( - final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo value) { - bitField0_ |= 0x00000040; - basicTypeInfoList.add(value); - return this; - } - - /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 1; - * @param values the basicTypeInfoList to add - * @return this - */ - public PlayerSyncScNotify addAllBasicTypeInfoList( - final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo... values) { - bitField0_ |= 0x00000040; - basicTypeInfoList.addAll(values); - return this; - } - - /** - * repeated .Material material_list = 5; - * @return whether the materialList field is set - */ - public boolean hasMaterialList() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated .Material material_list = 5; - * @return this - */ - public PlayerSyncScNotify clearMaterialList() { - bitField0_ &= ~0x00000080; - materialList.clear(); - return this; - } - - /** - * repeated .Material material_list = 5; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableMaterialList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMaterialList() { - return materialList; - } - - /** - * repeated .Material material_list = 5; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableMaterialList() { - bitField0_ |= 0x00000080; - return materialList; - } - - /** - * repeated .Material material_list = 5; - * @param value the materialList to add - * @return this - */ - public PlayerSyncScNotify addMaterialList(final MaterialOuterClass.Material value) { - bitField0_ |= 0x00000080; - materialList.add(value); - return this; - } - - /** - * repeated .Material material_list = 5; - * @param values the materialList to add - * @return this - */ - public PlayerSyncScNotify addAllMaterialList(final MaterialOuterClass.Material... values) { - bitField0_ |= 0x00000080; - materialList.addAll(values); - return this; - } - - /** - * 
-     * repeated JAKOAONFNGN LKGOMEBOJAF = 6;
-     *
- * - * repeated .Relic relic_list = 7; + * repeated .Relic relic_list = 2; * @return whether the relicList field is set */ public boolean hasRelicList() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000020) != 0; } /** - * 
-     * repeated JAKOAONFNGN LKGOMEBOJAF = 6;
-     *
- * - * repeated .Relic relic_list = 7; + * repeated .Relic relic_list = 2; * @return this */ public PlayerSyncScNotify clearRelicList() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000020; relicList.clear(); return this; } /** - * 
-     * repeated JAKOAONFNGN LKGOMEBOJAF = 6;
-     *
- * - * repeated .Relic relic_list = 7; + * repeated .Relic relic_list = 2; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -642,11 +415,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * 
-     * repeated JAKOAONFNGN LKGOMEBOJAF = 6;
-     *
- * - * repeated .Relic relic_list = 7; + * repeated .Relic relic_list = 2; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -655,74 +424,66 @@ public final class PlayerSyncScNotifyOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableRelicList() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000020; return relicList; } /** - * 
-     * repeated JAKOAONFNGN LKGOMEBOJAF = 6;
-     *
- * - * repeated .Relic relic_list = 7; + * repeated .Relic relic_list = 2; * @param value the relicList to add * @return this */ public PlayerSyncScNotify addRelicList(final RelicOuterClass.Relic value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000020; relicList.add(value); return this; } /** - * 
-     * repeated JAKOAONFNGN LKGOMEBOJAF = 6;
-     *
- * - * repeated .Relic relic_list = 7; + * repeated .Relic relic_list = 2; * @param values the relicList to add * @return this */ public PlayerSyncScNotify addAllRelicList(final RelicOuterClass.Relic... values) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000020; relicList.addAll(values); return this; } /** - * repeated .WaitDelResource wait_del_resource_list = 8; - * @return whether the waitDelResourceList field is set + * repeated .Material material_list = 3; + * @return whether the materialList field is set */ - public boolean hasWaitDelResourceList() { - return (bitField0_ & 0x00000200) != 0; + public boolean hasMaterialList() { + return (bitField0_ & 0x00000040) != 0; } /** - * repeated .WaitDelResource wait_del_resource_list = 8; + * repeated .Material material_list = 3; * @return this */ - public PlayerSyncScNotify clearWaitDelResourceList() { - bitField0_ &= ~0x00000200; - waitDelResourceList.clear(); + public PlayerSyncScNotify clearMaterialList() { + bitField0_ &= ~0x00000040; + materialList.clear(); return this; } /** - * repeated .WaitDelResource wait_del_resource_list = 8; + * repeated .Material material_list = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableWaitDelResourceList()} if you want to modify it. + * Use {@link #getMutableMaterialList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getWaitDelResourceList() { - return waitDelResourceList; + public RepeatedMessage getMaterialList() { + return materialList; } /** - * repeated .WaitDelResource wait_del_resource_list = 8; + * repeated .Material material_list = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -730,56 +491,53 @@ public final class PlayerSyncScNotifyOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableWaitDelResourceList( - ) { - bitField0_ |= 0x00000200; - return waitDelResourceList; + public RepeatedMessage getMutableMaterialList() { + bitField0_ |= 0x00000040; + return materialList; } /** - * repeated .WaitDelResource wait_del_resource_list = 8; - * @param value the waitDelResourceList to add + * repeated .Material material_list = 3; + * @param value the materialList to add * @return this */ - public PlayerSyncScNotify addWaitDelResourceList( - final WaitDelResourceOuterClass.WaitDelResource value) { - bitField0_ |= 0x00000200; - waitDelResourceList.add(value); + public PlayerSyncScNotify addMaterialList(final MaterialOuterClass.Material value) { + bitField0_ |= 0x00000040; + materialList.add(value); return this; } /** - * repeated .WaitDelResource wait_del_resource_list = 8; - * @param values the waitDelResourceList to add + * repeated .Material material_list = 3; + * @param values the materialList to add * @return this */ - public PlayerSyncScNotify addAllWaitDelResourceList( - final WaitDelResourceOuterClass.WaitDelResource... values) { - bitField0_ |= 0x00000200; - waitDelResourceList.addAll(values); + public PlayerSyncScNotify addAllMaterialList(final MaterialOuterClass.Material... values) { + bitField0_ |= 0x00000040; + materialList.addAll(values); return this; } /** - * repeated .Equipment equipment_list = 12; + * repeated .Equipment equipment_list = 5; * @return whether the equipmentList field is set */ public boolean hasEquipmentList() { - return (bitField0_ & 0x00000400) != 0; + return (bitField0_ & 0x00000080) != 0; } /** - * repeated .Equipment equipment_list = 12; + * repeated .Equipment equipment_list = 5; * @return this */ public PlayerSyncScNotify clearEquipmentList() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00000080; equipmentList.clear(); return this; } /** - * repeated .Equipment equipment_list = 12; + * repeated .Equipment equipment_list = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -793,7 +551,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated .Equipment equipment_list = 12; + * repeated .Equipment equipment_list = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -802,66 +560,66 @@ public final class PlayerSyncScNotifyOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableEquipmentList() { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000080; return equipmentList; } /** - * repeated .Equipment equipment_list = 12; + * repeated .Equipment equipment_list = 5; * @param value the equipmentList to add * @return this */ public PlayerSyncScNotify addEquipmentList(final EquipmentOuterClass.Equipment value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000080; equipmentList.add(value); return this; } /** - * repeated .Equipment equipment_list = 12; + * repeated .Equipment equipment_list = 5; * @param values the equipmentList to add * @return this */ public PlayerSyncScNotify addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000080; equipmentList.addAll(values); return this; } /** - * repeated .Material KPBMGJKOKDA = 836; - * @return whether the kPBMGJKOKDA field is set + * repeated .HeroBasicTypeInfo basic_type_info_list = 9; + * @return whether the basicTypeInfoList field is set */ - public boolean hasKPBMGJKOKDA() { - return (bitField0_ & 0x00000800) != 0; + public boolean hasBasicTypeInfoList() { + return (bitField0_ & 0x00000100) != 0; } /** - * repeated .Material KPBMGJKOKDA = 836; + * repeated .HeroBasicTypeInfo basic_type_info_list = 9; * @return this */ - public PlayerSyncScNotify clearKPBMGJKOKDA() { - bitField0_ &= ~0x00000800; - kPBMGJKOKDA.clear(); + public PlayerSyncScNotify clearBasicTypeInfoList() { + bitField0_ &= ~0x00000100; + basicTypeInfoList.clear(); return this; } /** - * repeated .Material KPBMGJKOKDA = 836; + * repeated .HeroBasicTypeInfo basic_type_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. * - * Use {@link #getMutableKPBMGJKOKDA()} if you want to modify it. + * Use {@link #getMutableBasicTypeInfoList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getKPBMGJKOKDA() { - return kPBMGJKOKDA; + public RepeatedMessage getBasicTypeInfoList() { + return basicTypeInfoList; } /** - * repeated .Material KPBMGJKOKDA = 836; + * repeated .HeroBasicTypeInfo basic_type_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 @@ -869,30 +627,33 @@ public final class PlayerSyncScNotifyOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableKPBMGJKOKDA() { - bitField0_ |= 0x00000800; - return kPBMGJKOKDA; + public RepeatedMessage getMutableBasicTypeInfoList( + ) { + bitField0_ |= 0x00000100; + return basicTypeInfoList; } /** - * repeated .Material KPBMGJKOKDA = 836; - * @param value the kPBMGJKOKDA to add + * repeated .HeroBasicTypeInfo basic_type_info_list = 9; + * @param value the basicTypeInfoList to add * @return this */ - public PlayerSyncScNotify addKPBMGJKOKDA(final MaterialOuterClass.Material value) { - bitField0_ |= 0x00000800; - kPBMGJKOKDA.add(value); + public PlayerSyncScNotify addBasicTypeInfoList( + final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo value) { + bitField0_ |= 0x00000100; + basicTypeInfoList.add(value); return this; } /** - * repeated .Material KPBMGJKOKDA = 836; - * @param values the kPBMGJKOKDA to add + * repeated .HeroBasicTypeInfo basic_type_info_list = 9; + * @param values the basicTypeInfoList to add * @return this */ - public PlayerSyncScNotify addAllKPBMGJKOKDA(final MaterialOuterClass.Material... values) { - bitField0_ |= 0x00000800; - kPBMGJKOKDA.addAll(values); + public PlayerSyncScNotify addAllBasicTypeInfoList( + final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo... values) { + bitField0_ |= 0x00000100; + basicTypeInfoList.addAll(values); return this; } @@ -904,15 +665,12 @@ public final class PlayerSyncScNotifyOuterClass { avatarSync.copyFrom(other.avatarSync); basicInfo.copyFrom(other.basicInfo); boardDataSync.copyFrom(other.boardDataSync); - dIMLIHPBEFB.copyFrom(other.dIMLIHPBEFB); delRelicList.copyFrom(other.delRelicList); delEquipmentList.copyFrom(other.delEquipmentList); - basicTypeInfoList.copyFrom(other.basicTypeInfoList); - materialList.copyFrom(other.materialList); relicList.copyFrom(other.relicList); - waitDelResourceList.copyFrom(other.waitDelResourceList); + materialList.copyFrom(other.materialList); equipmentList.copyFrom(other.equipmentList); - kPBMGJKOKDA.copyFrom(other.kPBMGJKOKDA); + basicTypeInfoList.copyFrom(other.basicTypeInfoList); } return this; } @@ -932,32 +690,23 @@ public final class PlayerSyncScNotifyOuterClass { if (other.hasBoardDataSync()) { getMutableBoardDataSync().mergeFrom(other.boardDataSync); } - if (other.hasDIMLIHPBEFB()) { - getMutableDIMLIHPBEFB().mergeFrom(other.dIMLIHPBEFB); - } if (other.hasDelRelicList()) { getMutableDelRelicList().addAll(other.delRelicList); } if (other.hasDelEquipmentList()) { getMutableDelEquipmentList().addAll(other.delEquipmentList); } - if (other.hasBasicTypeInfoList()) { - getMutableBasicTypeInfoList().addAll(other.basicTypeInfoList); + if (other.hasRelicList()) { + getMutableRelicList().addAll(other.relicList); } if (other.hasMaterialList()) { getMutableMaterialList().addAll(other.materialList); } - if (other.hasRelicList()) { - getMutableRelicList().addAll(other.relicList); - } - if (other.hasWaitDelResourceList()) { - getMutableWaitDelResourceList().addAll(other.waitDelResourceList); - } if (other.hasEquipmentList()) { getMutableEquipmentList().addAll(other.equipmentList); } - if (other.hasKPBMGJKOKDA()) { - getMutableKPBMGJKOKDA().addAll(other.kPBMGJKOKDA); + if (other.hasBasicTypeInfoList()) { + getMutableBasicTypeInfoList().addAll(other.basicTypeInfoList); } return this; } @@ -972,15 +721,12 @@ public final class PlayerSyncScNotifyOuterClass { avatarSync.clear(); basicInfo.clear(); boardDataSync.clear(); - dIMLIHPBEFB.clear(); delRelicList.clear(); delEquipmentList.clear(); - basicTypeInfoList.clear(); - materialList.clear(); relicList.clear(); - waitDelResourceList.clear(); + materialList.clear(); equipmentList.clear(); - kPBMGJKOKDA.clear(); + basicTypeInfoList.clear(); return this; } @@ -994,15 +740,12 @@ public final class PlayerSyncScNotifyOuterClass { avatarSync.clearQuick(); basicInfo.clearQuick(); boardDataSync.clearQuick(); - dIMLIHPBEFB.clearQuick(); delRelicList.clear(); delEquipmentList.clear(); - basicTypeInfoList.clearQuick(); - materialList.clearQuick(); relicList.clearQuick(); - waitDelResourceList.clearQuick(); + materialList.clearQuick(); equipmentList.clearQuick(); - kPBMGJKOKDA.clearQuick(); + basicTypeInfoList.clearQuick(); return this; } @@ -1019,81 +762,62 @@ public final class PlayerSyncScNotifyOuterClass { && (!hasAvatarSync() || avatarSync.equals(other.avatarSync)) && (!hasBasicInfo() || basicInfo.equals(other.basicInfo)) && (!hasBoardDataSync() || boardDataSync.equals(other.boardDataSync)) - && (!hasDIMLIHPBEFB() || dIMLIHPBEFB.equals(other.dIMLIHPBEFB)) && (!hasDelRelicList() || delRelicList.equals(other.delRelicList)) && (!hasDelEquipmentList() || delEquipmentList.equals(other.delEquipmentList)) - && (!hasBasicTypeInfoList() || basicTypeInfoList.equals(other.basicTypeInfoList)) - && (!hasMaterialList() || materialList.equals(other.materialList)) && (!hasRelicList() || relicList.equals(other.relicList)) - && (!hasWaitDelResourceList() || waitDelResourceList.equals(other.waitDelResourceList)) + && (!hasMaterialList() || materialList.equals(other.materialList)) && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)) - && (!hasKPBMGJKOKDA() || kPBMGJKOKDA.equals(other.kPBMGJKOKDA)); + && (!hasBasicTypeInfoList() || basicTypeInfoList.equals(other.basicTypeInfoList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 58); output.writeMessageNoTag(avatarSync); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 122); output.writeMessageNoTag(basicInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 21746); + output.writeRawLittleEndian16((short) 15050); output.writeMessageNoTag(boardDataSync); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 28578); - output.writeMessageNoTag(dIMLIHPBEFB); - } - if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < delRelicList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(delRelicList.array()[i]); } } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < delEquipmentList.length(); i++) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(delEquipmentList.array()[i]); } } - if ((bitField0_ & 0x00000040) != 0) { - 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 < materialList.length(); i++) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(materialList.get(i)); - } - } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 18); output.writeMessageNoTag(relicList.get(i)); } } - if ((bitField0_ & 0x00000200) != 0) { - for (int i = 0; i < waitDelResourceList.length(); i++) { - output.writeRawByte((byte) 66); - output.writeMessageNoTag(waitDelResourceList.get(i)); + if ((bitField0_ & 0x00000040) != 0) { + for (int i = 0; i < materialList.length(); i++) { + output.writeRawByte((byte) 26); + output.writeMessageNoTag(materialList.get(i)); } } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000080) != 0) { for (int i = 0; i < equipmentList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 42); output.writeMessageNoTag(equipmentList.get(i)); } } - if ((bitField0_ & 0x00000800) != 0) { - for (int i = 0; i < kPBMGJKOKDA.length(); i++) { - output.writeRawLittleEndian16((short) 13474); - output.writeMessageNoTag(kPBMGJKOKDA.get(i)); + if ((bitField0_ & 0x00000100) != 0) { + for (int i = 0; i < basicTypeInfoList.length(); i++) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(basicTypeInfoList.get(i)); } } } @@ -1111,31 +835,22 @@ public final class PlayerSyncScNotifyOuterClass { size += 2 + ProtoSink.computeMessageSizeNoTag(boardDataSync); } if ((bitField0_ & 0x00000008) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(dIMLIHPBEFB); - } - if ((bitField0_ & 0x00000010) != 0) { size += (1 * delRelicList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delRelicList); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { size += (1 * delEquipmentList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delEquipmentList); } - if ((bitField0_ & 0x00000040) != 0) { - size += (1 * basicTypeInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(basicTypeInfoList); - } - if ((bitField0_ & 0x00000080) != 0) { - size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); - } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000020) != 0) { size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); } - if ((bitField0_ & 0x00000200) != 0) { - size += (1 * waitDelResourceList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(waitDelResourceList); + if ((bitField0_ & 0x00000040) != 0) { + size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000080) != 0) { size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); } - if ((bitField0_ & 0x00000800) != 0) { - size += (2 * kPBMGJKOKDA.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(kPBMGJKOKDA); + if ((bitField0_ & 0x00000100) != 0) { + size += (1 * basicTypeInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(basicTypeInfoList); } return size; } @@ -1147,104 +862,79 @@ public final class PlayerSyncScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 58: { // avatarSync input.readMessage(avatarSync); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 122) { break; } } - case 50: { + case 122: { // basicInfo input.readMessage(basicInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 10866) { + if (tag != 7498) { break; } } - case 10866: { + case 7498: { // boardDataSync input.readMessage(boardDataSync); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 14242) { + if (tag != 66) { break; } } - case 14242: { - // dIMLIHPBEFB - input.readMessage(dIMLIHPBEFB); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 34) { - break; - } - } - case 34: { + case 66: { // delRelicList [packed=true] input.readPackedUInt32(delRelicList, tag); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 82) { + if (tag != 114) { break; } } - case 82: { + case 114: { // delEquipmentList [packed=true] input.readPackedUInt32(delEquipmentList, tag); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 10) { + if (tag != 18) { break; } } - case 10: { - // basicTypeInfoList - tag = input.readRepeatedMessage(basicTypeInfoList, tag); + case 18: { + // relicList + tag = input.readRepeatedMessage(relicList, tag); + bitField0_ |= 0x00000020; + if (tag != 26) { + break; + } + } + case 26: { + // materialList + tag = input.readRepeatedMessage(materialList, tag); bitField0_ |= 0x00000040; if (tag != 42) { break; } } case 42: { - // materialList - tag = input.readRepeatedMessage(materialList, tag); - bitField0_ |= 0x00000080; - if (tag != 58) { - break; - } - } - case 58: { - // relicList - tag = input.readRepeatedMessage(relicList, tag); - bitField0_ |= 0x00000100; - if (tag != 66) { - break; - } - } - case 66: { - // waitDelResourceList - tag = input.readRepeatedMessage(waitDelResourceList, tag); - bitField0_ |= 0x00000200; - if (tag != 98) { - break; - } - } - case 98: { // equipmentList tag = input.readRepeatedMessage(equipmentList, tag); - bitField0_ |= 0x00000400; - if (tag != 6690) { + bitField0_ |= 0x00000080; + if (tag != 74) { break; } } - case 6690: { - // kPBMGJKOKDA - tag = input.readRepeatedMessage(kPBMGJKOKDA, tag); - bitField0_ |= 0x00000800; + case 74: { + // basicTypeInfoList + tag = input.readRepeatedMessage(basicTypeInfoList, tag); + bitField0_ |= 0x00000100; if (tag != 0) { break; } @@ -1259,16 +949,16 @@ public final class PlayerSyncScNotifyOuterClass { tag = input.readTag(); break; } - case 32: { + case 64: { // delRelicList [packed=false] tag = input.readRepeatedUInt32(delRelicList, tag); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; break; } - case 80: { + case 112: { // delEquipmentList [packed=false] tag = input.readRepeatedUInt32(delEquipmentList, tag); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; break; } } @@ -1288,31 +978,22 @@ public final class PlayerSyncScNotifyOuterClass { output.writeMessage(FieldNames.boardDataSync, boardDataSync); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.dIMLIHPBEFB, dIMLIHPBEFB); - } - if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedUInt32(FieldNames.delRelicList, delRelicList); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedUInt32(FieldNames.delEquipmentList, delEquipmentList); } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedMessage(FieldNames.basicTypeInfoList, basicTypeInfoList); - } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.materialList, materialList); - } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000020) != 0) { output.writeRepeatedMessage(FieldNames.relicList, relicList); } - if ((bitField0_ & 0x00000200) != 0) { - output.writeRepeatedMessage(FieldNames.waitDelResourceList, waitDelResourceList); + if ((bitField0_ & 0x00000040) != 0) { + output.writeRepeatedMessage(FieldNames.materialList, materialList); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000080) != 0) { output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); } - if ((bitField0_ & 0x00000800) != 0) { - output.writeRepeatedMessage(FieldNames.kPBMGJKOKDA, kPBMGJKOKDA); + if ((bitField0_ & 0x00000100) != 0) { + output.writeRepeatedMessage(FieldNames.basicTypeInfoList, basicTypeInfoList); } output.endObject(); } @@ -1360,23 +1041,12 @@ public final class PlayerSyncScNotifyOuterClass { } break; } - case 975808876: { - if (input.isAtField(FieldNames.dIMLIHPBEFB)) { - if (!input.trySkipNullValue()) { - input.readMessage(dIMLIHPBEFB); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case 1380069094: case 1336083102: { if (input.isAtField(FieldNames.delRelicList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(delRelicList); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -1388,31 +1058,7 @@ public final class PlayerSyncScNotifyOuterClass { if (input.isAtField(FieldNames.delEquipmentList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(delEquipmentList); - bitField0_ |= 0x00000020; - } - } 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 -2115854747: - case -1149360970: { - if (input.isAtField(FieldNames.materialList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(materialList); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -1424,19 +1070,19 @@ public final class PlayerSyncScNotifyOuterClass { if (input.isAtField(FieldNames.relicList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(relicList); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); } break; } - case -299057342: - case -402862927: { - if (input.isAtField(FieldNames.waitDelResourceList)) { + case -2115854747: + case -1149360970: { + if (input.isAtField(FieldNames.materialList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(waitDelResourceList); - bitField0_ |= 0x00000200; + input.readRepeatedMessage(materialList); + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -1448,18 +1094,19 @@ public final class PlayerSyncScNotifyOuterClass { if (input.isAtField(FieldNames.equipmentList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(equipmentList); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); } break; } - case -1665544015: { - if (input.isAtField(FieldNames.kPBMGJKOKDA)) { + case -344592620: + case -1315699973: { + if (input.isAtField(FieldNames.basicTypeInfoList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(kPBMGJKOKDA); - bitField0_ |= 0x00000800; + input.readRepeatedMessage(basicTypeInfoList); + bitField0_ |= 0x00000100; } } else { input.skipUnknownField(); @@ -1525,23 +1172,17 @@ public final class PlayerSyncScNotifyOuterClass { static final FieldName boardDataSync = FieldName.forField("boardDataSync", "board_data_sync"); - static final FieldName dIMLIHPBEFB = FieldName.forField("DIMLIHPBEFB"); - static final FieldName delRelicList = FieldName.forField("delRelicList", "del_relic_list"); static final FieldName delEquipmentList = FieldName.forField("delEquipmentList", "del_equipment_list"); - static final FieldName basicTypeInfoList = FieldName.forField("basicTypeInfoList", "basic_type_info_list"); + static final FieldName relicList = FieldName.forField("relicList", "relic_list"); static final FieldName materialList = FieldName.forField("materialList", "material_list"); - static final FieldName relicList = FieldName.forField("relicList", "relic_list"); - - static final FieldName waitDelResourceList = FieldName.forField("waitDelResourceList", "wait_del_resource_list"); - static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list"); - static final FieldName kPBMGJKOKDA = FieldName.forField("KPBMGJKOKDA"); + static final FieldName basicTypeInfoList = FieldName.forField("basicTypeInfoList", "basic_type_info_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java index 1cef942..a7b17e7 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 = 5; + * optional uint32 base_avatar_id = 14; */ private int baseAvatarId; /** - * repeated .ItemCost item_list = 15; + * 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 = 5; + * optional uint32 base_avatar_id = 14; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -48,7 +48,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 14; * @return this */ public PromoteAvatarCsReq clearBaseAvatarId() { @@ -58,7 +58,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 14; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -66,7 +66,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 14; * @param value the baseAvatarId to set * @return this */ @@ -77,7 +77,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 15; + * 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 = 15; + * repeated .ItemCost item_list = 7; * @return this */ public PromoteAvatarCsReq clearItemList() { @@ -95,7 +95,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 15; + * 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 = 15; + * 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 = 15; + * 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 = 15; + * 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) 40); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 122); + 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 40: { + case 112: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 58) { break; } } - case 122: { + 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 9f57597..0494527 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 = 4; + * optional uint32 equipment_unique_id = 14; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 10; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 14; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 14; * @return this */ public PromoteEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 14; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 14; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 10; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 10; * @return this */ public PromoteEquipmentCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_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. @@ -108,7 +108,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_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 @@ -122,7 +122,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 10; * @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) 32); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 82); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class PromoteEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 112: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 82) { break; } } - case 18: { + case 82: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java index 8c93834..3a09496 100644 --- a/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java @@ -19,32 +19,32 @@ public final class QuitLineupCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 plane_id = 1; - */ - private int planeId; - - /** - * optional uint32 index = 3; + * optional uint32 index = 10; */ private int index; /** - * optional uint32 base_avatar_id = 6; + * optional uint32 base_avatar_id = 12; */ private int baseAvatarId; + /** + * optional uint32 plane_id = 13; + */ + private int planeId; + /** * optional .ExtraLineupType extra_lineup_type = 11; */ private int extraLineupType; /** - * optional .AvatarType avatar_type = 13; + * optional .AvatarType avatar_type = 14; */ private int avatarType; /** - * optional bool is_virtual = 9; + * optional bool is_virtual = 1; */ private boolean isVirtual; @@ -59,62 +59,25 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 1; - * @return whether the planeId field is set + * optional uint32 index = 10; + * @return whether the index field is set */ - public boolean hasPlaneId() { + public boolean hasIndex() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 plane_id = 1; - * @return this - */ - public QuitLineupCsReq clearPlaneId() { - bitField0_ &= ~0x00000001; - planeId = 0; - return this; - } - - /** - * optional uint32 plane_id = 1; - * @return the planeId - */ - public int getPlaneId() { - return planeId; - } - - /** - * optional uint32 plane_id = 1; - * @param value the planeId to set - * @return this - */ - public QuitLineupCsReq setPlaneId(final int value) { - bitField0_ |= 0x00000001; - planeId = value; - return this; - } - - /** - * optional uint32 index = 3; - * @return whether the index field is set - */ - public boolean hasIndex() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 index = 3; + * optional uint32 index = 10; * @return this */ public QuitLineupCsReq clearIndex() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; index = 0; return this; } /** - * optional uint32 index = 3; + * optional uint32 index = 10; * @return the index */ public int getIndex() { @@ -122,36 +85,36 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 index = 3; + * optional uint32 index = 10; * @param value the index to set * @return this */ public QuitLineupCsReq setIndex(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; index = value; return this; } /** - * optional uint32 base_avatar_id = 6; + * optional uint32 base_avatar_id = 12; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 base_avatar_id = 6; + * optional uint32 base_avatar_id = 12; * @return this */ public QuitLineupCsReq clearBaseAvatarId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; baseAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 6; + * optional uint32 base_avatar_id = 12; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -159,16 +122,53 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 6; + * optional uint32 base_avatar_id = 12; * @param value the baseAvatarId to set * @return this */ public QuitLineupCsReq setBaseAvatarId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; baseAvatarId = value; return this; } + /** + * optional uint32 plane_id = 13; + * @return whether the planeId field is set + */ + public boolean hasPlaneId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 plane_id = 13; + * @return this + */ + public QuitLineupCsReq clearPlaneId() { + bitField0_ &= ~0x00000004; + planeId = 0; + return this; + } + + /** + * optional uint32 plane_id = 13; + * @return the planeId + */ + public int getPlaneId() { + return planeId; + } + + /** + * optional uint32 plane_id = 13; + * @param value the planeId to set + * @return this + */ + public QuitLineupCsReq setPlaneId(final int value) { + bitField0_ |= 0x00000004; + planeId = value; + return this; + } + /** * optional .ExtraLineupType extra_lineup_type = 11; * @return whether the extraLineupType field is set @@ -233,7 +233,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 13; + * optional .AvatarType avatar_type = 14; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -241,7 +241,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 13; + * optional .AvatarType avatar_type = 14; * @return this */ public QuitLineupCsReq clearAvatarType() { @@ -251,7 +251,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 13; + * optional .AvatarType avatar_type = 14; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -284,7 +284,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 13; + * optional .AvatarType avatar_type = 14; * @param value the avatarType to set * @return this */ @@ -295,7 +295,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional bool is_virtual = 9; + * optional bool is_virtual = 1; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -303,7 +303,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional bool is_virtual = 9; + * optional bool is_virtual = 1; * @return this */ public QuitLineupCsReq clearIsVirtual() { @@ -313,7 +313,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional bool is_virtual = 9; + * optional bool is_virtual = 1; * @return the isVirtual */ public boolean getIsVirtual() { @@ -321,7 +321,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional bool is_virtual = 9; + * optional bool is_virtual = 1; * @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_; - planeId = other.planeId; index = other.index; baseAvatarId = other.baseAvatarId; + planeId = other.planeId; extraLineupType = other.extraLineupType; avatarType = other.avatarType; isVirtual = other.isVirtual; @@ -352,15 +352,15 @@ public final class QuitLineupCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasPlaneId()) { - setPlaneId(other.planeId); - } if (other.hasIndex()) { setIndex(other.index); } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } + if (other.hasPlaneId()) { + setPlaneId(other.planeId); + } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); } @@ -380,9 +380,9 @@ public final class QuitLineupCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - planeId = 0; index = 0; baseAvatarId = 0; + planeId = 0; extraLineupType = 0; avatarType = 0; isVirtual = false; @@ -409,9 +409,9 @@ public final class QuitLineupCsReqOuterClass { } QuitLineupCsReq other = (QuitLineupCsReq) o; return bitField0_ == other.bitField0_ - && (!hasPlaneId() || planeId == other.planeId) && (!hasIndex() || index == other.index) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasPlaneId() || planeId == other.planeId) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasAvatarType() || avatarType == other.avatarType) && (!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) 8); - output.writeUInt32NoTag(planeId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(index); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 96); output.writeUInt32NoTag(baseAvatarId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(planeId); + } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 88); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 112); output.writeEnumNoTag(avatarType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 8); output.writeBoolNoTag(isVirtual); } } @@ -449,14 +449,14 @@ public final class QuitLineupCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); } @@ -476,27 +476,27 @@ public final class QuitLineupCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // planeId - planeId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { + case 80: { // index index = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 96) { break; } } - case 48: { + case 96: { // baseAvatarId baseAvatarId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 88) { @@ -511,11 +511,11 @@ public final class QuitLineupCsReqOuterClass { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 104) { + if (tag != 112) { break; } } - case 104: { + case 112: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -523,11 +523,11 @@ public final class QuitLineupCsReqOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 72) { + if (tag != 8) { break; } } - case 72: { + case 8: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000020; @@ -554,14 +554,14 @@ public final class QuitLineupCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.index, index); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.planeId, planeId); + } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); } @@ -581,23 +581,11 @@ public final class QuitLineupCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { - if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 100346066: { if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { index = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -609,6 +597,18 @@ public final class QuitLineupCsReqOuterClass { if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { baseAvatarId = 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 { @@ -715,12 +715,12 @@ public final class QuitLineupCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName index = FieldName.forField("index"); static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); + static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); diff --git a/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java index 3eadc6a..f49792f 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 = 7; - */ - private int rank; - - /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 2; */ private int baseAvatarId; /** - * optional .ItemCostList item_cost_list = 14; + * optional uint32 rank = 14; + */ + private int rank; + + /** + * optional .ItemCostList item_cost_list = 11; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -44,62 +44,25 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional uint32 rank = 7; - * @return whether the rank field is set + * optional uint32 base_avatar_id = 2; + * @return whether the baseAvatarId field is set */ - public boolean hasRank() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 rank = 7; - * @return this - */ - public RankUpAvatarCsReq clearRank() { - bitField0_ &= ~0x00000001; - rank = 0; - return this; - } - - /** - * optional uint32 rank = 7; - * @return the rank - */ - public int getRank() { - return rank; - } - - /** - * optional uint32 rank = 7; - * @param value the rank to set - * @return this - */ - public RankUpAvatarCsReq setRank(final int value) { - bitField0_ |= 0x00000001; - rank = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 9; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 2; * @return this */ public RankUpAvatarCsReq clearBaseAvatarId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; baseAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 2; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -107,18 +70,55 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 2; * @param value the baseAvatarId to set * @return this */ public RankUpAvatarCsReq setBaseAvatarId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; baseAvatarId = value; return this; } /** - * optional .ItemCostList item_cost_list = 14; + * optional uint32 rank = 14; + * @return whether the rank field is set + */ + public boolean hasRank() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 rank = 14; + * @return this + */ + public RankUpAvatarCsReq clearRank() { + bitField0_ &= ~0x00000002; + rank = 0; + return this; + } + + /** + * optional uint32 rank = 14; + * @return the rank + */ + public int getRank() { + return rank; + } + + /** + * optional uint32 rank = 14; + * @param value the rank to set + * @return this + */ + public RankUpAvatarCsReq setRank(final int value) { + bitField0_ |= 0x00000002; + rank = value; + return this; + } + + /** + * optional .ItemCostList item_cost_list = 11; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -126,7 +126,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 14; + * optional .ItemCostList item_cost_list = 11; * @return this */ public RankUpAvatarCsReq clearItemCostList() { @@ -136,7 +136,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 14; + * optional .ItemCostList item_cost_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. @@ -150,7 +150,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 14; + * optional .ItemCostList item_cost_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 @@ -164,7 +164,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 14; + * optional .ItemCostList item_cost_list = 11; * @param value the itemCostList to set * @return this */ @@ -179,8 +179,8 @@ public final class RankUpAvatarCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rank = other.rank; baseAvatarId = other.baseAvatarId; + rank = other.rank; itemCostList.copyFrom(other.itemCostList); } return this; @@ -192,12 +192,12 @@ public final class RankUpAvatarCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasRank()) { - setRank(other.rank); - } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } + if (other.hasRank()) { + setRank(other.rank); + } if (other.hasItemCostList()) { getMutableItemCostList().mergeFrom(other.itemCostList); } @@ -211,8 +211,8 @@ public final class RankUpAvatarCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - rank = 0; baseAvatarId = 0; + rank = 0; itemCostList.clear(); return this; } @@ -238,23 +238,23 @@ public final class RankUpAvatarCsReqOuterClass { } RankUpAvatarCsReq other = (RankUpAvatarCsReq) o; return bitField0_ == other.bitField0_ - && (!hasRank() || rank == other.rank) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasRank() || rank == other.rank) && (!hasItemCostList() || itemCostList.equals(other.itemCostList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(rank); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(baseAvatarId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(rank); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 90); output.writeMessageNoTag(itemCostList); } } @@ -263,10 +263,10 @@ public final class RankUpAvatarCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(itemCostList); @@ -281,25 +281,25 @@ public final class RankUpAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // rank - rank = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 16: { // baseAvatarId baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 112) { break; } } - case 114: { + case 112: { + // rank + rank = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000004; @@ -326,10 +326,10 @@ public final class RankUpAvatarCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.rank, rank); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.rank, rank); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.itemCostList, itemCostList); @@ -344,10 +344,11 @@ public final class RankUpAvatarCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3492908: { - if (input.isAtField(FieldNames.rank)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - rank = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -355,11 +356,10 @@ public final class RankUpAvatarCsReqOuterClass { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case 3492908: { + if (input.isAtField(FieldNames.rank)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + rank = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -432,10 +432,10 @@ public final class RankUpAvatarCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rank = FieldName.forField("rank"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName rank = FieldName.forField("rank"); + static final FieldName itemCostList = FieldName.forField("itemCostList", "item_cost_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java index e3556f6..05c8e77 100644 --- a/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class RankUpEquipmentCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 equipment_unique_id = 8; + * optional uint32 equipment_unique_id = 14; */ private int equipmentUniqueId; @@ -39,7 +39,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 8; + * optional uint32 equipment_unique_id = 14; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 8; + * optional uint32 equipment_unique_id = 14; * @return this */ public RankUpEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 8; + * optional uint32 equipment_unique_id = 14; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 8; + * optional uint32 equipment_unique_id = 14; * @param value the equipmentUniqueId to set * @return this */ @@ -198,7 +198,7 @@ public final class RankUpEquipmentCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { @@ -226,7 +226,7 @@ public final class RankUpEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 112: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java index 43d18ea..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 = 8; + * optional uint32 stage_id = 6; */ private int stageId; @@ -34,7 +34,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 8; + * 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 = 8; + * optional uint32 stage_id = 6; * @return this */ public ReEnterLastElementStageCsReq clearStageId() { @@ -52,7 +52,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 8; + * optional uint32 stage_id = 6; * @return the stageId */ public int getStageId() { @@ -60,7 +60,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 8; + * 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) 64); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(stageId); } } @@ -150,7 +150,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + 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 1be407a..2886c6a 100644 --- a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageScRspOuterClass.java @@ -19,21 +19,17 @@ public final class ReEnterLastElementStageScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 stage_id = 2; + * optional uint32 stage_id = 10; */ private int stageId; /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 12; */ private int retcode; /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_info = 6; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -48,7 +44,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional uint32 stage_id = 2; + * optional uint32 stage_id = 10; * @return whether the stageId field is set */ public boolean hasStageId() { @@ -56,7 +52,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional uint32 stage_id = 2; + * optional uint32 stage_id = 10; * @return this */ public ReEnterLastElementStageScRsp clearStageId() { @@ -66,7 +62,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional uint32 stage_id = 2; + * optional uint32 stage_id = 10; * @return the stageId */ public int getStageId() { @@ -74,7 +70,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional uint32 stage_id = 2; + * optional uint32 stage_id = 10; * @param value the stageId to set * @return this */ @@ -85,11 +81,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -97,11 +89,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 12; * @return this */ public ReEnterLastElementStageScRsp clearRetcode() { @@ -111,11 +99,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -123,11 +107,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -138,7 +118,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_info = 6; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -146,7 +126,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_info = 6; * @return this */ public ReEnterLastElementStageScRsp clearBattleInfo() { @@ -156,7 +136,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_info = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -170,7 +150,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_info = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -184,7 +164,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_info = 6; * @param value the battleInfo to set * @return this */ @@ -267,15 +247,15 @@ public final class ReEnterLastElementStageScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(stageId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 50); output.writeMessageNoTag(battleInfo); } } @@ -302,25 +282,25 @@ public final class ReEnterLastElementStageScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 80: { // stageId stageId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 96) { break; } } - case 64: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { + if (tag != 50) { break; } } - case 82: { + case 50: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java index 83c6cf8..c947f8c 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java @@ -20,42 +20,42 @@ public final class RelicOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 tid = 2; - */ - private int tid; - - /** - * optional uint32 exp = 4; - */ - private int exp; - - /** - * optional uint32 main_affix_id = 8; - */ - private int mainAffixId; - - /** - * optional uint32 unique_id = 9; - */ - private int uniqueId; - - /** - * optional uint32 level = 11; - */ - private int level; - - /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 2; */ private int baseAvatarId; /** - * optional bool is_protected = 5; + * optional uint32 tid = 4; + */ + private int tid; + + /** + * optional uint32 main_affix_id = 6; + */ + private int mainAffixId; + + /** + * optional uint32 level = 7; + */ + private int level; + + /** + * optional uint32 unique_id = 11; + */ + private int uniqueId; + + /** + * optional uint32 exp = 14; + */ + private int exp; + + /** + * optional bool is_protected = 8; */ private boolean isProtected; /** - * repeated .RelicAffix sub_affix_list = 13; + * repeated .RelicAffix sub_affix_list = 15; */ private final RepeatedMessage subAffixList = RepeatedMessage.newEmptyInstance(RelicAffixOuterClass.RelicAffix.getFactory()); @@ -70,25 +70,62 @@ public final class RelicOuterClass { } /** - * optional uint32 tid = 2; - * @return whether the tid field is set + * optional uint32 base_avatar_id = 2; + * @return whether the baseAvatarId field is set */ - public boolean hasTid() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 tid = 2; + * optional uint32 base_avatar_id = 2; + * @return this + */ + public Relic clearBaseAvatarId() { + bitField0_ &= ~0x00000001; + baseAvatarId = 0; + return this; + } + + /** + * optional uint32 base_avatar_id = 2; + * @return the baseAvatarId + */ + public int getBaseAvatarId() { + return baseAvatarId; + } + + /** + * optional uint32 base_avatar_id = 2; + * @param value the baseAvatarId to set + * @return this + */ + public Relic setBaseAvatarId(final int value) { + bitField0_ |= 0x00000001; + baseAvatarId = value; + return this; + } + + /** + * optional uint32 tid = 4; + * @return whether the tid field is set + */ + public boolean hasTid() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 tid = 4; * @return this */ public Relic clearTid() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; tid = 0; return this; } /** - * optional uint32 tid = 2; + * optional uint32 tid = 4; * @return the tid */ public int getTid() { @@ -96,55 +133,18 @@ public final class RelicOuterClass { } /** - * optional uint32 tid = 2; + * optional uint32 tid = 4; * @param value the tid to set * @return this */ public Relic setTid(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; tid = value; return this; } /** - * optional uint32 exp = 4; - * @return whether the exp field is set - */ - public boolean hasExp() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 exp = 4; - * @return this - */ - public Relic clearExp() { - bitField0_ &= ~0x00000002; - exp = 0; - return this; - } - - /** - * optional uint32 exp = 4; - * @return the exp - */ - public int getExp() { - return exp; - } - - /** - * optional uint32 exp = 4; - * @param value the exp to set - * @return this - */ - public Relic setExp(final int value) { - bitField0_ |= 0x00000002; - exp = value; - return this; - } - - /** - * optional uint32 main_affix_id = 8; + * optional uint32 main_affix_id = 6; * @return whether the mainAffixId field is set */ public boolean hasMainAffixId() { @@ -152,7 +152,7 @@ public final class RelicOuterClass { } /** - * optional uint32 main_affix_id = 8; + * optional uint32 main_affix_id = 6; * @return this */ public Relic clearMainAffixId() { @@ -162,7 +162,7 @@ public final class RelicOuterClass { } /** - * optional uint32 main_affix_id = 8; + * optional uint32 main_affix_id = 6; * @return the mainAffixId */ public int getMainAffixId() { @@ -170,7 +170,7 @@ public final class RelicOuterClass { } /** - * optional uint32 main_affix_id = 8; + * optional uint32 main_affix_id = 6; * @param value the mainAffixId to set * @return this */ @@ -181,62 +181,25 @@ public final class RelicOuterClass { } /** - * optional uint32 unique_id = 9; - * @return whether the uniqueId field is set + * optional uint32 level = 7; + * @return whether the level field is set */ - public boolean hasUniqueId() { + public boolean hasLevel() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 unique_id = 9; - * @return this - */ - public Relic clearUniqueId() { - bitField0_ &= ~0x00000008; - uniqueId = 0; - return this; - } - - /** - * optional uint32 unique_id = 9; - * @return the uniqueId - */ - public int getUniqueId() { - return uniqueId; - } - - /** - * optional uint32 unique_id = 9; - * @param value the uniqueId to set - * @return this - */ - public Relic setUniqueId(final int value) { - bitField0_ |= 0x00000008; - uniqueId = value; - return this; - } - - /** - * optional uint32 level = 11; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 level = 11; + * optional uint32 level = 7; * @return this */ public Relic clearLevel() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; level = 0; return this; } /** - * optional uint32 level = 11; + * optional uint32 level = 7; * @return the level */ public int getLevel() { @@ -244,55 +207,92 @@ public final class RelicOuterClass { } /** - * optional uint32 level = 11; + * optional uint32 level = 7; * @param value the level to set * @return this */ public Relic setLevel(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; level = value; return this; } /** - * optional uint32 base_avatar_id = 15; - * @return whether the baseAvatarId field is set + * optional uint32 unique_id = 11; + * @return whether the uniqueId field is set */ - public boolean hasBaseAvatarId() { + public boolean hasUniqueId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 unique_id = 11; + * @return this + */ + public Relic clearUniqueId() { + bitField0_ &= ~0x00000010; + 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 Relic setUniqueId(final int value) { + bitField0_ |= 0x00000010; + uniqueId = value; + return this; + } + + /** + * optional uint32 exp = 14; + * @return whether the exp field is set + */ + public boolean hasExp() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 exp = 14; * @return this */ - public Relic clearBaseAvatarId() { + public Relic clearExp() { bitField0_ &= ~0x00000020; - baseAvatarId = 0; + exp = 0; return this; } /** - * optional uint32 base_avatar_id = 15; - * @return the baseAvatarId + * optional uint32 exp = 14; + * @return the exp */ - public int getBaseAvatarId() { - return baseAvatarId; + public int getExp() { + return exp; } /** - * optional uint32 base_avatar_id = 15; - * @param value the baseAvatarId to set + * optional uint32 exp = 14; + * @param value the exp to set * @return this */ - public Relic setBaseAvatarId(final int value) { + public Relic setExp(final int value) { bitField0_ |= 0x00000020; - baseAvatarId = value; + exp = value; return this; } /** - * optional bool is_protected = 5; + * optional bool is_protected = 8; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -300,7 +300,7 @@ public final class RelicOuterClass { } /** - * optional bool is_protected = 5; + * optional bool is_protected = 8; * @return this */ public Relic clearIsProtected() { @@ -310,7 +310,7 @@ public final class RelicOuterClass { } /** - * optional bool is_protected = 5; + * optional bool is_protected = 8; * @return the isProtected */ public boolean getIsProtected() { @@ -318,7 +318,7 @@ public final class RelicOuterClass { } /** - * optional bool is_protected = 5; + * optional bool is_protected = 8; * @param value the isProtected to set * @return this */ @@ -329,7 +329,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 13; + * repeated .RelicAffix sub_affix_list = 15; * @return whether the subAffixList field is set */ public boolean hasSubAffixList() { @@ -337,7 +337,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 13; + * repeated .RelicAffix sub_affix_list = 15; * @return this */ public Relic clearSubAffixList() { @@ -347,7 +347,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 13; + * repeated .RelicAffix sub_affix_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -361,7 +361,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 13; + * repeated .RelicAffix sub_affix_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -375,7 +375,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 13; + * repeated .RelicAffix sub_affix_list = 15; * @param value the subAffixList to add * @return this */ @@ -386,7 +386,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 13; + * repeated .RelicAffix sub_affix_list = 15; * @param values the subAffixList to add * @return this */ @@ -401,12 +401,12 @@ public final class RelicOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - tid = other.tid; - exp = other.exp; - mainAffixId = other.mainAffixId; - uniqueId = other.uniqueId; - level = other.level; baseAvatarId = other.baseAvatarId; + tid = other.tid; + mainAffixId = other.mainAffixId; + level = other.level; + uniqueId = other.uniqueId; + exp = other.exp; isProtected = other.isProtected; subAffixList.copyFrom(other.subAffixList); } @@ -419,23 +419,23 @@ public final class RelicOuterClass { return this; } cachedSize = -1; + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); + } if (other.hasTid()) { setTid(other.tid); } - if (other.hasExp()) { - setExp(other.exp); - } if (other.hasMainAffixId()) { setMainAffixId(other.mainAffixId); } - if (other.hasUniqueId()) { - setUniqueId(other.uniqueId); - } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); + if (other.hasUniqueId()) { + setUniqueId(other.uniqueId); + } + if (other.hasExp()) { + setExp(other.exp); } if (other.hasIsProtected()) { setIsProtected(other.isProtected); @@ -453,12 +453,12 @@ public final class RelicOuterClass { } cachedSize = -1; bitField0_ = 0; - tid = 0; - exp = 0; - mainAffixId = 0; - uniqueId = 0; - level = 0; baseAvatarId = 0; + tid = 0; + mainAffixId = 0; + level = 0; + uniqueId = 0; + exp = 0; isProtected = false; subAffixList.clear(); return this; @@ -485,12 +485,12 @@ public final class RelicOuterClass { } Relic other = (Relic) o; return bitField0_ == other.bitField0_ - && (!hasTid() || tid == other.tid) - && (!hasExp() || exp == other.exp) - && (!hasMainAffixId() || mainAffixId == other.mainAffixId) - && (!hasUniqueId() || uniqueId == other.uniqueId) - && (!hasLevel() || level == other.level) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasTid() || tid == other.tid) + && (!hasMainAffixId() || mainAffixId == other.mainAffixId) + && (!hasLevel() || level == other.level) + && (!hasUniqueId() || uniqueId == other.uniqueId) + && (!hasExp() || exp == other.exp) && (!hasIsProtected() || isProtected == other.isProtected) && (!hasSubAffixList() || subAffixList.equals(other.subAffixList)); } @@ -499,35 +499,35 @@ public final class RelicOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(tid); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(exp); + output.writeUInt32NoTag(tid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(mainAffixId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(uniqueId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 88); - output.writeUInt32NoTag(level); + output.writeUInt32NoTag(uniqueId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 64); output.writeBoolNoTag(isProtected); } if ((bitField0_ & 0x00000080) != 0) { for (int i = 0; i < subAffixList.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 122); output.writeMessageNoTag(subAffixList.get(i)); } } @@ -537,22 +537,22 @@ public final class RelicOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); - } - if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); + } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000040) != 0) { size += 2; @@ -571,8 +571,8 @@ public final class RelicOuterClass { while (true) { switch (tag) { case 16: { - // tid - tid = input.readUInt32(); + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 32) { @@ -580,26 +580,26 @@ public final class RelicOuterClass { } } case 32: { - // exp - exp = input.readUInt32(); + // tid + tid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 48) { break; } } - case 64: { + case 48: { // mainAffixId mainAffixId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 72) { + if (tag != 56) { break; } } - case 72: { - // uniqueId - uniqueId = input.readUInt32(); + case 56: { + // level + level = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 88) { @@ -607,33 +607,33 @@ public final class RelicOuterClass { } } case 88: { - // level - level = input.readUInt32(); + // uniqueId + uniqueId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 112: { + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 40) { + if (tag != 64) { break; } } - case 40: { + case 64: { // isProtected isProtected = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 106) { + if (tag != 122) { break; } } - case 106: { + case 122: { // subAffixList tag = input.readRepeatedMessage(subAffixList, tag); bitField0_ |= 0x00000080; @@ -659,22 +659,22 @@ public final class RelicOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.tid, tid); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.exp, exp); + output.writeUInt32(FieldNames.tid, tid); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.mainAffixId, mainAffixId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.uniqueId, uniqueId); - } - if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.level, level); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.uniqueId, uniqueId); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.exp, exp); } if ((bitField0_ & 0x00000040) != 0) { output.writeBool(FieldNames.isProtected, isProtected); @@ -692,10 +692,11 @@ public final class RelicOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 114831: { - if (input.isAtField(FieldNames.tid)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - tid = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -703,10 +704,10 @@ public final class RelicOuterClass { } break; } - case 100893: { - if (input.isAtField(FieldNames.exp)) { + case 114831: { + if (input.isAtField(FieldNames.tid)) { if (!input.trySkipNullValue()) { - exp = input.readUInt32(); + tid = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -726,11 +727,10 @@ public final class RelicOuterClass { } break; } - case -294460212: - case -538310583: { - if (input.isAtField(FieldNames.uniqueId)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - uniqueId = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -738,10 +738,11 @@ public final class RelicOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case -294460212: + case -538310583: { + if (input.isAtField(FieldNames.uniqueId)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + uniqueId = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -749,11 +750,10 @@ public final class RelicOuterClass { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case 100893: { + if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + exp = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -837,17 +837,17 @@ public final class RelicOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName tid = FieldName.forField("tid"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - static final FieldName exp = FieldName.forField("exp"); + static final FieldName tid = FieldName.forField("tid"); static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); - static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); - static final FieldName level = FieldName.forField("level"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); + + static final FieldName exp = FieldName.forField("exp"); static final FieldName isProtected = FieldName.forField("isProtected", "is_protected"); diff --git a/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java index 8fbab10..df5611d 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java @@ -19,15 +19,15 @@ public final class RelicParamOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 slot = 1; - */ - private int slot; - - /** - * optional uint32 relic_unique_id = 7; + * optional uint32 relic_unique_id = 8; */ private int relicUniqueId; + /** + * optional uint32 slot = 11; + */ + private int slot; + private RelicParam() { } @@ -39,62 +39,25 @@ public final class RelicParamOuterClass { } /** - * optional uint32 slot = 1; - * @return whether the slot field is set + * optional uint32 relic_unique_id = 8; + * @return whether the relicUniqueId field is set */ - public boolean hasSlot() { + public boolean hasRelicUniqueId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 slot = 1; - * @return this - */ - public RelicParam clearSlot() { - bitField0_ &= ~0x00000001; - slot = 0; - return this; - } - - /** - * optional uint32 slot = 1; - * @return the slot - */ - public int getSlot() { - return slot; - } - - /** - * optional uint32 slot = 1; - * @param value the slot to set - * @return this - */ - public RelicParam setSlot(final int value) { - bitField0_ |= 0x00000001; - slot = value; - return this; - } - - /** - * optional uint32 relic_unique_id = 7; - * @return whether the relicUniqueId field is set - */ - public boolean hasRelicUniqueId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 relic_unique_id = 7; + * optional uint32 relic_unique_id = 8; * @return this */ public RelicParam clearRelicUniqueId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; relicUniqueId = 0; return this; } /** - * optional uint32 relic_unique_id = 7; + * optional uint32 relic_unique_id = 8; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -102,23 +65,60 @@ public final class RelicParamOuterClass { } /** - * optional uint32 relic_unique_id = 7; + * optional uint32 relic_unique_id = 8; * @param value the relicUniqueId to set * @return this */ public RelicParam setRelicUniqueId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; relicUniqueId = value; return this; } + /** + * optional uint32 slot = 11; + * @return whether the slot field is set + */ + public boolean hasSlot() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 slot = 11; + * @return this + */ + public RelicParam clearSlot() { + bitField0_ &= ~0x00000002; + slot = 0; + return this; + } + + /** + * optional uint32 slot = 11; + * @return the slot + */ + public int getSlot() { + return slot; + } + + /** + * optional uint32 slot = 11; + * @param value the slot to set + * @return this + */ + public RelicParam setSlot(final int value) { + bitField0_ |= 0x00000002; + slot = value; + return this; + } + @Override public RelicParam copyFrom(final RelicParam other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - slot = other.slot; relicUniqueId = other.relicUniqueId; + slot = other.slot; } return this; } @@ -129,12 +129,12 @@ public final class RelicParamOuterClass { return this; } cachedSize = -1; - if (other.hasSlot()) { - setSlot(other.slot); - } if (other.hasRelicUniqueId()) { setRelicUniqueId(other.relicUniqueId); } + if (other.hasSlot()) { + setSlot(other.slot); + } return this; } @@ -145,8 +145,8 @@ public final class RelicParamOuterClass { } cachedSize = -1; bitField0_ = 0; - slot = 0; relicUniqueId = 0; + slot = 0; return this; } @@ -170,19 +170,19 @@ public final class RelicParamOuterClass { } RelicParam other = (RelicParam) o; return bitField0_ == other.bitField0_ - && (!hasSlot() || slot == other.slot) - && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId); + && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId) + && (!hasSlot() || slot == other.slot); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(slot); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(relicUniqueId); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(slot); } } @@ -190,10 +190,10 @@ public final class RelicParamOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } return size; } @@ -205,18 +205,18 @@ public final class RelicParamOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // slot - slot = input.readUInt32(); + case 64: { + // relicUniqueId + relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 88) { break; } } - case 56: { - // relicUniqueId - relicUniqueId = input.readUInt32(); + case 88: { + // slot + slot = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class RelicParamOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId); + output.writeUInt32(FieldNames.slot, slot); } output.endObject(); } @@ -256,10 +256,11 @@ public final class RelicParamOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case -1966200481: + case 49648253: { + if (input.isAtField(FieldNames.relicUniqueId)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class RelicParamOuterClass { } break; } - case -1966200481: - case 49648253: { - if (input.isAtField(FieldNames.relicUniqueId)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - relicUniqueId = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public final class RelicParamOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName slot = FieldName.forField("slot"); - static final FieldName relicUniqueId = FieldName.forField("relicUniqueId", "relic_unique_id"); + + static final FieldName slot = FieldName.forField("slot"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java index 9e838d1..30ca980 100644 --- a/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java @@ -20,32 +20,36 @@ public final class ReplaceLineupCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 index = 3; - */ - private int index; - - /** - * optional uint32 GFEFIBHEEGH = 5; - */ - private int gFEFIBHEEGH; - - /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 2; */ private int planeId; /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional uint32 leader_slot = 7; + */ + private int leaderSlot; + + /** + * optional uint32 index = 8; + */ + private int index; + + /** + * optional .ExtraLineupType extra_lineup_type = 9; */ private int extraLineupType; /** - * optional bool is_virtual = 11; + * optional bool is_virtual = 10; */ private boolean isVirtual; /** - * repeated .LineupSlotData slots = 13; + * 
+     *  PFPMJIICDJP
+     *
+ * + * repeated .LineupSlotData slots = 1; */ private final RepeatedMessage slots = RepeatedMessage.newEmptyInstance(LineupSlotDataOuterClass.LineupSlotData.getFactory()); @@ -60,99 +64,25 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional uint32 index = 3; - * @return whether the index field is set + * optional uint32 plane_id = 2; + * @return whether the planeId field is set */ - public boolean hasIndex() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 index = 3; - * @return this - */ - public ReplaceLineupCsReq clearIndex() { - bitField0_ &= ~0x00000001; - index = 0; - return this; - } - - /** - * optional uint32 index = 3; - * @return the index - */ - public int getIndex() { - return index; - } - - /** - * optional uint32 index = 3; - * @param value the index to set - * @return this - */ - public ReplaceLineupCsReq setIndex(final int value) { - bitField0_ |= 0x00000001; - index = value; - return this; - } - - /** - * optional uint32 GFEFIBHEEGH = 5; - * @return whether the gFEFIBHEEGH field is set - */ - public boolean hasGFEFIBHEEGH() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 GFEFIBHEEGH = 5; - * @return this - */ - public ReplaceLineupCsReq clearGFEFIBHEEGH() { - bitField0_ &= ~0x00000002; - gFEFIBHEEGH = 0; - return this; - } - - /** - * optional uint32 GFEFIBHEEGH = 5; - * @return the gFEFIBHEEGH - */ - public int getGFEFIBHEEGH() { - return gFEFIBHEEGH; - } - - /** - * optional uint32 GFEFIBHEEGH = 5; - * @param value the gFEFIBHEEGH to set - * @return this - */ - public ReplaceLineupCsReq setGFEFIBHEEGH(final int value) { - bitField0_ |= 0x00000002; - gFEFIBHEEGH = 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 = 2; * @return this */ public ReplaceLineupCsReq clearPlaneId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; planeId = 0; return this; } /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 2; * @return the planeId */ public int getPlaneId() { @@ -160,18 +90,92 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 10; + * optional uint32 plane_id = 2; * @param value the planeId to set * @return this */ public ReplaceLineupCsReq setPlaneId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; planeId = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional uint32 leader_slot = 7; + * @return whether the leaderSlot field is set + */ + public boolean hasLeaderSlot() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 leader_slot = 7; + * @return this + */ + public ReplaceLineupCsReq clearLeaderSlot() { + bitField0_ &= ~0x00000002; + leaderSlot = 0; + return this; + } + + /** + * optional uint32 leader_slot = 7; + * @return the leaderSlot + */ + public int getLeaderSlot() { + return leaderSlot; + } + + /** + * optional uint32 leader_slot = 7; + * @param value the leaderSlot to set + * @return this + */ + public ReplaceLineupCsReq setLeaderSlot(final int value) { + bitField0_ |= 0x00000002; + leaderSlot = value; + return this; + } + + /** + * optional uint32 index = 8; + * @return whether the index field is set + */ + public boolean hasIndex() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 index = 8; + * @return this + */ + public ReplaceLineupCsReq clearIndex() { + bitField0_ &= ~0x00000004; + index = 0; + return this; + } + + /** + * optional uint32 index = 8; + * @return the index + */ + public int getIndex() { + return index; + } + + /** + * optional uint32 index = 8; + * @param value the index to set + * @return this + */ + public ReplaceLineupCsReq setIndex(final int value) { + bitField0_ |= 0x00000004; + index = value; + return this; + } + + /** + * optional .ExtraLineupType extra_lineup_type = 9; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -179,7 +183,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 9; * @return this */ public ReplaceLineupCsReq clearExtraLineupType() { @@ -189,7 +193,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 9; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -222,7 +226,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 9; * @param value the extraLineupType to set * @return this */ @@ -234,7 +238,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 11; + * optional bool is_virtual = 10; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -242,7 +246,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 11; + * optional bool is_virtual = 10; * @return this */ public ReplaceLineupCsReq clearIsVirtual() { @@ -252,7 +256,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 11; + * optional bool is_virtual = 10; * @return the isVirtual */ public boolean getIsVirtual() { @@ -260,7 +264,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 11; + * optional bool is_virtual = 10; * @param value the isVirtual to set * @return this */ @@ -271,7 +275,11 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 13; + * 
+     *  PFPMJIICDJP
+     *
+ * + * repeated .LineupSlotData slots = 1; * @return whether the slots field is set */ public boolean hasSlots() { @@ -279,7 +287,11 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 13; + * 
+     *  PFPMJIICDJP
+     *
+ * + * repeated .LineupSlotData slots = 1; * @return this */ public ReplaceLineupCsReq clearSlots() { @@ -289,7 +301,11 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 13; + * 
+     *  PFPMJIICDJP
+     *
+ * + * repeated .LineupSlotData slots = 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. @@ -303,7 +319,11 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 13; + * 
+     *  PFPMJIICDJP
+     *
+ * + * repeated .LineupSlotData slots = 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 @@ -317,7 +337,11 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 13; + * 
+     *  PFPMJIICDJP
+     *
+ * + * repeated .LineupSlotData slots = 1; * @param value the slots to add * @return this */ @@ -328,7 +352,11 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 13; + * 
+     *  PFPMJIICDJP
+     *
+ * + * repeated .LineupSlotData slots = 1; * @param values the slots to add * @return this */ @@ -343,9 +371,9 @@ public final class ReplaceLineupCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - index = other.index; - gFEFIBHEEGH = other.gFEFIBHEEGH; planeId = other.planeId; + leaderSlot = other.leaderSlot; + index = other.index; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; slots.copyFrom(other.slots); @@ -359,15 +387,15 @@ public final class ReplaceLineupCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasIndex()) { - setIndex(other.index); - } - if (other.hasGFEFIBHEEGH()) { - setGFEFIBHEEGH(other.gFEFIBHEEGH); - } if (other.hasPlaneId()) { setPlaneId(other.planeId); } + if (other.hasLeaderSlot()) { + setLeaderSlot(other.leaderSlot); + } + if (other.hasIndex()) { + setIndex(other.index); + } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); } @@ -387,9 +415,9 @@ public final class ReplaceLineupCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - index = 0; - gFEFIBHEEGH = 0; planeId = 0; + leaderSlot = 0; + index = 0; extraLineupType = 0; isVirtual = false; slots.clear(); @@ -417,9 +445,9 @@ public final class ReplaceLineupCsReqOuterClass { } ReplaceLineupCsReq other = (ReplaceLineupCsReq) o; return bitField0_ == other.bitField0_ - && (!hasIndex() || index == other.index) - && (!hasGFEFIBHEEGH() || gFEFIBHEEGH == other.gFEFIBHEEGH) && (!hasPlaneId() || planeId == other.planeId) + && (!hasLeaderSlot() || leaderSlot == other.leaderSlot) + && (!hasIndex() || index == other.index) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual) && (!hasSlots() || slots.equals(other.slots)); @@ -428,28 +456,28 @@ public final class ReplaceLineupCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(index); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(gFEFIBHEEGH); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(planeId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 56); + output.writeUInt32NoTag(leaderSlot); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(index); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 72); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 80); output.writeBoolNoTag(isVirtual); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < slots.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 10); output.writeMessageNoTag(slots.get(i)); } } @@ -459,13 +487,13 @@ public final class ReplaceLineupCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gFEFIBHEEGH); + size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); @@ -486,34 +514,34 @@ public final class ReplaceLineupCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // index - index = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // gFEFIBHEEGH - gFEFIBHEEGH = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 16: { // planeId planeId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 56) { break; } } case 56: { + // leaderSlot + leaderSlot = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // index + index = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { @@ -521,20 +549,20 @@ public final class ReplaceLineupCsReqOuterClass { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 88) { + if (tag != 80) { break; } } - case 88: { + case 80: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 106) { + if (tag != 10) { break; } } - case 106: { + case 10: { // slots tag = input.readRepeatedMessage(slots, tag); bitField0_ |= 0x00000020; @@ -560,13 +588,13 @@ public final class ReplaceLineupCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.gFEFIBHEEGH, gFEFIBHEEGH); + output.writeUInt32(FieldNames.leaderSlot, leaderSlot); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); @@ -587,10 +615,11 @@ public final class ReplaceLineupCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + planeId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -598,10 +627,11 @@ public final class ReplaceLineupCsReqOuterClass { } break; } - case -1804656: { - if (input.isAtField(FieldNames.gFEFIBHEEGH)) { + case 1191442087: + case -1708713100: { + if (input.isAtField(FieldNames.leaderSlot)) { if (!input.trySkipNullValue()) { - gFEFIBHEEGH = input.readUInt32(); + leaderSlot = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -609,11 +639,10 @@ public final class ReplaceLineupCsReqOuterClass { } break; } - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -714,12 +743,12 @@ public final class ReplaceLineupCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName index = FieldName.forField("index"); - - static final FieldName gFEFIBHEEGH = FieldName.forField("GFEFIBHEEGH"); - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); + static final FieldName leaderSlot = FieldName.forField("leaderSlot", "leader_slot"); + + static final FieldName index = FieldName.forField("index"); + static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); static final FieldName isVirtual = FieldName.forField("isVirtual", "is_virtual"); diff --git a/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java index 32e71d0..a04342f 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 to_uid = 2; - */ - private int toUid; - - /** - * optional uint32 from_uid = 4; + * optional uint32 fromUid = 6; */ private int fromUid; /** - * optional uint32 emote = 7; + * optional uint32 toUid = 9; + */ + private int toUid; + + /** + * optional uint32 emote = 14; */ private int emote; /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 10; */ private int msgType; /** - * optional .ChatType chat_type = 13; + * optional .ChatType chat_type = 11; */ private int chatType; /** - * optional string text = 5; + * optional string text = 12; */ private final Utf8String text = Utf8String.newEmptyInstance(); @@ -60,62 +60,25 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 to_uid = 2; - * @return whether the toUid field is set + * optional uint32 fromUid = 6; + * @return whether the fromUid field is set */ - public boolean hasToUid() { + public boolean hasFromUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 to_uid = 2; - * @return this - */ - public RevcMsgScNotify clearToUid() { - bitField0_ &= ~0x00000001; - toUid = 0; - return this; - } - - /** - * optional uint32 to_uid = 2; - * @return the toUid - */ - public int getToUid() { - return toUid; - } - - /** - * optional uint32 to_uid = 2; - * @param value the toUid to set - * @return this - */ - public RevcMsgScNotify setToUid(final int value) { - bitField0_ |= 0x00000001; - toUid = value; - return this; - } - - /** - * optional uint32 from_uid = 4; - * @return whether the fromUid field is set - */ - public boolean hasFromUid() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 from_uid = 4; + * optional uint32 fromUid = 6; * @return this */ public RevcMsgScNotify clearFromUid() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; fromUid = 0; return this; } /** - * optional uint32 from_uid = 4; + * optional uint32 fromUid = 6; * @return the fromUid */ public int getFromUid() { @@ -123,18 +86,55 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 from_uid = 4; + * optional uint32 fromUid = 6; * @param value the fromUid to set * @return this */ public RevcMsgScNotify setFromUid(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; fromUid = value; return this; } /** - * optional uint32 emote = 7; + * optional uint32 toUid = 9; + * @return whether the toUid field is set + */ + public boolean hasToUid() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 toUid = 9; + * @return this + */ + public RevcMsgScNotify clearToUid() { + bitField0_ &= ~0x00000002; + toUid = 0; + return this; + } + + /** + * optional uint32 toUid = 9; + * @return the toUid + */ + public int getToUid() { + return toUid; + } + + /** + * optional uint32 toUid = 9; + * @param value the toUid to set + * @return this + */ + public RevcMsgScNotify setToUid(final int value) { + bitField0_ |= 0x00000002; + toUid = value; + return this; + } + + /** + * optional uint32 emote = 14; * @return whether the emote field is set */ public boolean hasEmote() { @@ -142,7 +142,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 emote = 7; + * optional uint32 emote = 14; * @return this */ public RevcMsgScNotify clearEmote() { @@ -152,7 +152,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 emote = 7; + * optional uint32 emote = 14; * @return the emote */ public int getEmote() { @@ -160,7 +160,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 emote = 7; + * optional uint32 emote = 14; * @param value the emote to set * @return this */ @@ -171,7 +171,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 10; * @return whether the msgType field is set */ public boolean hasMsgType() { @@ -179,7 +179,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 10; * @return this */ public RevcMsgScNotify clearMsgType() { @@ -189,7 +189,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 10; * @return the msgType */ public MsgTypeOuterClass.MsgType getMsgType() { @@ -222,7 +222,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 10; * @param value the msgType to set * @return this */ @@ -233,7 +233,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .ChatType chat_type = 13; + * optional .ChatType chat_type = 11; * @return whether the chatType field is set */ public boolean hasChatType() { @@ -241,7 +241,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .ChatType chat_type = 13; + * optional .ChatType chat_type = 11; * @return this */ public RevcMsgScNotify clearChatType() { @@ -251,7 +251,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .ChatType chat_type = 13; + * optional .ChatType chat_type = 11; * @return the chatType */ public ChatTypeOuterClass.ChatType getChatType() { @@ -284,7 +284,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .ChatType chat_type = 13; + * optional .ChatType chat_type = 11; * @param value the chatType to set * @return this */ @@ -295,7 +295,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 5; + * optional string text = 12; * @return whether the text field is set */ public boolean hasText() { @@ -303,7 +303,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 5; + * optional string text = 12; * @return this */ public RevcMsgScNotify clearText() { @@ -313,7 +313,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 5; + * optional string text = 12; * @return the text */ public String getText() { @@ -321,7 +321,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 5; + * optional string text = 12; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -329,7 +329,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 5; + * optional string text = 12; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -338,7 +338,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 5; + * optional string text = 12; * @param value the text to set * @return this */ @@ -349,7 +349,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 5; + * optional string text = 12; * @param value the text to set * @return this */ @@ -364,8 +364,8 @@ public final class RevcMsgScNotifyOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - toUid = other.toUid; fromUid = other.fromUid; + toUid = other.toUid; emote = other.emote; msgType = other.msgType; chatType = other.chatType; @@ -380,12 +380,12 @@ public final class RevcMsgScNotifyOuterClass { return this; } cachedSize = -1; - if (other.hasToUid()) { - setToUid(other.toUid); - } if (other.hasFromUid()) { setFromUid(other.fromUid); } + if (other.hasToUid()) { + setToUid(other.toUid); + } if (other.hasEmote()) { setEmote(other.emote); } @@ -408,8 +408,8 @@ public final class RevcMsgScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - toUid = 0; fromUid = 0; + toUid = 0; emote = 0; msgType = 0; chatType = 0; @@ -438,8 +438,8 @@ public final class RevcMsgScNotifyOuterClass { } RevcMsgScNotify other = (RevcMsgScNotify) o; return bitField0_ == other.bitField0_ - && (!hasToUid() || toUid == other.toUid) && (!hasFromUid() || fromUid == other.fromUid) + && (!hasToUid() || toUid == other.toUid) && (!hasEmote() || emote == other.emote) && (!hasMsgType() || msgType == other.msgType) && (!hasChatType() || chatType == other.chatType) @@ -449,27 +449,27 @@ public final class RevcMsgScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(toUid); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(fromUid); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(toUid); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(emote); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 80); output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 88); output.writeEnumNoTag(chatType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 98); output.writeStringNoTag(text); } } @@ -478,10 +478,10 @@ public final class RevcMsgScNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(fromUid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(fromUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(emote); @@ -505,34 +505,34 @@ public final class RevcMsgScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // toUid - toUid = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { + case 48: { // fromUid fromUid = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 72) { break; } } - case 56: { + case 72: { + // toUid + toUid = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { // emote emote = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { + if (tag != 80) { break; } } - case 64: { + case 80: { // msgType final int value = input.readInt32(); if (MsgTypeOuterClass.MsgType.forNumber(value) != null) { @@ -540,11 +540,11 @@ public final class RevcMsgScNotifyOuterClass { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 104) { + if (tag != 88) { break; } } - case 104: { + case 88: { // chatType final int value = input.readInt32(); if (ChatTypeOuterClass.ChatType.forNumber(value) != null) { @@ -552,11 +552,11 @@ public final class RevcMsgScNotifyOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 42) { + if (tag != 98) { break; } } - case 42: { + case 98: { // text input.readString(text); bitField0_ |= 0x00000020; @@ -583,10 +583,10 @@ public final class RevcMsgScNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.toUid, toUid); + output.writeUInt32(FieldNames.fromUid, fromUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.fromUid, fromUid); + output.writeUInt32(FieldNames.toUid, toUid); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.emote, emote); @@ -610,11 +610,10 @@ public final class RevcMsgScNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 110520277: - case -868529012: { - if (input.isAtField(FieldNames.toUid)) { + case -594338746: { + if (input.isAtField(FieldNames.fromUid)) { if (!input.trySkipNullValue()) { - toUid = input.readUInt32(); + fromUid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -622,11 +621,10 @@ public final class RevcMsgScNotifyOuterClass { } break; } - case -594338746: - case -1244322245: { - if (input.isAtField(FieldNames.fromUid)) { + case 110520277: { + if (input.isAtField(FieldNames.toUid)) { if (!input.trySkipNullValue()) { - fromUid = input.readUInt32(); + toUid = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -743,9 +741,9 @@ public final class RevcMsgScNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName toUid = FieldName.forField("toUid", "to_uid"); + static final FieldName fromUid = FieldName.forField("fromUid"); - static final FieldName fromUid = FieldName.forField("fromUid", "from_uid"); + static final FieldName toUid = FieldName.forField("toUid"); static final FieldName emote = FieldName.forField("emote"); diff --git a/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java index d51feb4..cea20af 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java @@ -19,20 +19,20 @@ public final class SceneActorInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 5; + * optional uint32 uid = 4; */ private int uid; /** - * optional uint32 map_layer = 9; - */ - private int mapLayer; - - /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 9; */ private int baseAvatarId; + /** + * optional uint32 map_layer = 11; + */ + private int mapLayer; + /** * optional .AvatarType avatar_type = 2; */ @@ -49,7 +49,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 4; * @return whether the uid field is set */ public boolean hasUid() { @@ -57,7 +57,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 4; * @return this */ public SceneActorInfo clearUid() { @@ -67,7 +67,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 4; * @return the uid */ public int getUid() { @@ -75,7 +75,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 4; * @param value the uid to set * @return this */ @@ -86,62 +86,25 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 map_layer = 9; - * @return whether the mapLayer field is set + * optional uint32 base_avatar_id = 9; + * @return whether the baseAvatarId field is set */ - public boolean hasMapLayer() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 map_layer = 9; - * @return this - */ - public SceneActorInfo clearMapLayer() { - bitField0_ &= ~0x00000002; - mapLayer = 0; - return this; - } - - /** - * optional uint32 map_layer = 9; - * @return the mapLayer - */ - public int getMapLayer() { - return mapLayer; - } - - /** - * optional uint32 map_layer = 9; - * @param value the mapLayer to set - * @return this - */ - public SceneActorInfo setMapLayer(final int value) { - bitField0_ |= 0x00000002; - mapLayer = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 12; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 9; * @return this */ public SceneActorInfo clearBaseAvatarId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; baseAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 9; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -149,16 +112,53 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 9; * @param value the baseAvatarId to set * @return this */ public SceneActorInfo setBaseAvatarId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; baseAvatarId = value; return this; } + /** + * optional uint32 map_layer = 11; + * @return whether the mapLayer field is set + */ + public boolean hasMapLayer() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 map_layer = 11; + * @return this + */ + public SceneActorInfo clearMapLayer() { + bitField0_ &= ~0x00000004; + mapLayer = 0; + return this; + } + + /** + * optional uint32 map_layer = 11; + * @return the mapLayer + */ + public int getMapLayer() { + return mapLayer; + } + + /** + * optional uint32 map_layer = 11; + * @param value the mapLayer to set + * @return this + */ + public SceneActorInfo setMapLayer(final int value) { + bitField0_ |= 0x00000004; + mapLayer = value; + return this; + } + /** * optional .AvatarType avatar_type = 2; * @return whether the avatarType field is set @@ -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,24 +290,24 @@ 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) 40); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 72); - output.writeUInt32NoTag(mapLayer); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(mapLayer); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 16); @@ -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,7 +340,7 @@ public final class SceneActorInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 32: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; @@ -350,17 +350,17 @@ public final class SceneActorInfoOuterClass { } } case 72: { - // mapLayer - mapLayer = input.readUInt32(); + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 88) { break; } } - case 96: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 88: { + // mapLayer + mapLayer = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 16) { @@ -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 25ad537..71c3b80 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java @@ -10,7 +10,6 @@ import us.hebi.quickbuf.MessageFactory; import us.hebi.quickbuf.ProtoMessage; import us.hebi.quickbuf.ProtoSink; import us.hebi.quickbuf.ProtoSource; -import us.hebi.quickbuf.RepeatedInt; import us.hebi.quickbuf.RepeatedMessage; public final class SceneBattleInfoOuterClass { @@ -21,59 +20,44 @@ public final class SceneBattleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 rounds_limit = 1; - */ - private int roundsLimit; - - /** - * optional uint32 world_level = 3; - */ - private int worldLevel; - - /** - * optional uint32 battle_id = 7; + * optional uint32 battle_id = 1; */ private int battleId; /** - * optional uint32 logic_random_seed = 11; + * optional uint32 rounds_limit = 2; */ - private int logicRandomSeed; + private int roundsLimit; /** - * optional uint32 KEFEEBINLNN = 12; - */ - private int kEFEEBINLNN; - - /** - * optional uint32 stage_id = 14; + * optional uint32 stage_id = 6; */ private int stageId; /** - * optional bool CAMAJMFLKKL = 2; + * optional uint32 world_level = 7; */ - private boolean cAMAJMFLKKL; + private int worldLevel; /** - * repeated uint32 battle_scoring_list = 4; + * optional uint32 logic_random_seed = 8; */ - private final RepeatedInt battleScoringList = RepeatedInt.newEmptyInstance(); + private int logicRandomSeed; /** - * repeated .SceneMonsterWave monster_wave_list = 6; + * repeated .BattleAvatar battle_avatar_list = 10; */ - private final RepeatedMessage monsterWaveList = RepeatedMessage.newEmptyInstance(SceneMonsterWaveOuterClass.SceneMonsterWave.getFactory()); + private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory()); /** - * repeated .BattleBuff buff_list = 8; + * repeated .BattleBuff buff_list = 14; */ private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(BattleBuffOuterClass.BattleBuff.getFactory()); /** - * repeated .BattleAvatar battle_avatar_list = 13; + * repeated .SceneMonsterWave monster_wave_list = 15; */ - private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory()); + private final RepeatedMessage monsterWaveList = RepeatedMessage.newEmptyInstance(SceneMonsterWaveOuterClass.SceneMonsterWave.getFactory()); private SceneBattleInfo() { } @@ -86,99 +70,25 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 rounds_limit = 1; - * @return whether the roundsLimit field is set + * optional uint32 battle_id = 1; + * @return whether the battleId field is set */ - public boolean hasRoundsLimit() { + public boolean hasBattleId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 rounds_limit = 1; - * @return this - */ - public SceneBattleInfo clearRoundsLimit() { - bitField0_ &= ~0x00000001; - roundsLimit = 0; - return this; - } - - /** - * optional uint32 rounds_limit = 1; - * @return the roundsLimit - */ - public int getRoundsLimit() { - return roundsLimit; - } - - /** - * optional uint32 rounds_limit = 1; - * @param value the roundsLimit to set - * @return this - */ - public SceneBattleInfo setRoundsLimit(final int value) { - bitField0_ |= 0x00000001; - roundsLimit = value; - return this; - } - - /** - * optional uint32 world_level = 3; - * @return whether the worldLevel field is set - */ - public boolean hasWorldLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 world_level = 3; - * @return this - */ - public SceneBattleInfo clearWorldLevel() { - bitField0_ &= ~0x00000002; - worldLevel = 0; - return this; - } - - /** - * optional uint32 world_level = 3; - * @return the worldLevel - */ - public int getWorldLevel() { - return worldLevel; - } - - /** - * optional uint32 world_level = 3; - * @param value the worldLevel to set - * @return this - */ - public SceneBattleInfo setWorldLevel(final int value) { - bitField0_ |= 0x00000002; - worldLevel = value; - return this; - } - - /** - * optional uint32 battle_id = 7; - * @return whether the battleId field is set - */ - public boolean hasBattleId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 battle_id = 7; + * optional uint32 battle_id = 1; * @return this */ public SceneBattleInfo clearBattleId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; battleId = 0; return this; } /** - * optional uint32 battle_id = 7; + * optional uint32 battle_id = 1; * @return the battleId */ public int getBattleId() { @@ -186,110 +96,73 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 battle_id = 7; + * optional uint32 battle_id = 1; * @param value the battleId to set * @return this */ public SceneBattleInfo setBattleId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; battleId = value; return this; } /** - * optional uint32 logic_random_seed = 11; - * @return whether the logicRandomSeed field is set + * optional uint32 rounds_limit = 2; + * @return whether the roundsLimit field is set */ - public boolean hasLogicRandomSeed() { - return (bitField0_ & 0x00000008) != 0; + public boolean hasRoundsLimit() { + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 logic_random_seed = 11; + * optional uint32 rounds_limit = 2; * @return this */ - public SceneBattleInfo clearLogicRandomSeed() { - bitField0_ &= ~0x00000008; - logicRandomSeed = 0; + public SceneBattleInfo clearRoundsLimit() { + bitField0_ &= ~0x00000002; + roundsLimit = 0; return this; } /** - * optional uint32 logic_random_seed = 11; - * @return the logicRandomSeed + * optional uint32 rounds_limit = 2; + * @return the roundsLimit */ - public int getLogicRandomSeed() { - return logicRandomSeed; + public int getRoundsLimit() { + return roundsLimit; } /** - * optional uint32 logic_random_seed = 11; - * @param value the logicRandomSeed to set + * optional uint32 rounds_limit = 2; + * @param value the roundsLimit to set * @return this */ - public SceneBattleInfo setLogicRandomSeed(final int value) { - bitField0_ |= 0x00000008; - logicRandomSeed = value; + public SceneBattleInfo setRoundsLimit(final int value) { + bitField0_ |= 0x00000002; + roundsLimit = value; return this; } /** - * optional uint32 KEFEEBINLNN = 12; - * @return whether the kEFEEBINLNN field is set - */ - public boolean hasKEFEEBINLNN() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 KEFEEBINLNN = 12; - * @return this - */ - public SceneBattleInfo clearKEFEEBINLNN() { - bitField0_ &= ~0x00000010; - kEFEEBINLNN = 0; - return this; - } - - /** - * optional uint32 KEFEEBINLNN = 12; - * @return the kEFEEBINLNN - */ - public int getKEFEEBINLNN() { - return kEFEEBINLNN; - } - - /** - * optional uint32 KEFEEBINLNN = 12; - * @param value the kEFEEBINLNN to set - * @return this - */ - public SceneBattleInfo setKEFEEBINLNN(final int value) { - bitField0_ |= 0x00000010; - kEFEEBINLNN = value; - return this; - } - - /** - * optional uint32 stage_id = 14; + * optional uint32 stage_id = 6; * @return whether the stageId field is set */ public boolean hasStageId() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 stage_id = 14; + * optional uint32 stage_id = 6; * @return this */ public SceneBattleInfo clearStageId() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000004; stageId = 0; return this; } /** - * optional uint32 stage_id = 14; + * optional uint32 stage_id = 6; * @return the stageId */ public int getStageId() { @@ -297,280 +170,110 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 stage_id = 14; + * optional uint32 stage_id = 6; * @param value the stageId to set * @return this */ public SceneBattleInfo setStageId(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000004; stageId = value; return this; } /** - * optional bool CAMAJMFLKKL = 2; - * @return whether the cAMAJMFLKKL field is set + * optional uint32 world_level = 7; + * @return whether the worldLevel field is set */ - public boolean hasCAMAJMFLKKL() { - return (bitField0_ & 0x00000040) != 0; + public boolean hasWorldLevel() { + return (bitField0_ & 0x00000008) != 0; } /** - * optional bool CAMAJMFLKKL = 2; + * optional uint32 world_level = 7; * @return this */ - public SceneBattleInfo clearCAMAJMFLKKL() { - bitField0_ &= ~0x00000040; - cAMAJMFLKKL = false; + public SceneBattleInfo clearWorldLevel() { + bitField0_ &= ~0x00000008; + worldLevel = 0; return this; } /** - * optional bool CAMAJMFLKKL = 2; - * @return the cAMAJMFLKKL + * optional uint32 world_level = 7; + * @return the worldLevel */ - public boolean getCAMAJMFLKKL() { - return cAMAJMFLKKL; + public int getWorldLevel() { + return worldLevel; } /** - * optional bool CAMAJMFLKKL = 2; - * @param value the cAMAJMFLKKL to set + * optional uint32 world_level = 7; + * @param value the worldLevel to set * @return this */ - public SceneBattleInfo setCAMAJMFLKKL(final boolean value) { - bitField0_ |= 0x00000040; - cAMAJMFLKKL = value; + public SceneBattleInfo setWorldLevel(final int value) { + bitField0_ |= 0x00000008; + worldLevel = value; return this; } /** - * repeated uint32 battle_scoring_list = 4; - * @return whether the battleScoringList field is set + * optional uint32 logic_random_seed = 8; + * @return whether the logicRandomSeed field is set */ - public boolean hasBattleScoringList() { - return (bitField0_ & 0x00000080) != 0; + public boolean hasLogicRandomSeed() { + return (bitField0_ & 0x00000010) != 0; } /** - * repeated uint32 battle_scoring_list = 4; + * optional uint32 logic_random_seed = 8; * @return this */ - public SceneBattleInfo clearBattleScoringList() { - bitField0_ &= ~0x00000080; - battleScoringList.clear(); + public SceneBattleInfo clearLogicRandomSeed() { + bitField0_ &= ~0x00000010; + logicRandomSeed = 0; return this; } /** - * repeated uint32 battle_scoring_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 #getMutableBattleScoringList()} if you want to modify it. - * - * @return internal storage object for reading + * optional uint32 logic_random_seed = 8; + * @return the logicRandomSeed */ - public RepeatedInt getBattleScoringList() { - return battleScoringList; + public int getLogicRandomSeed() { + return logicRandomSeed; } /** - * repeated uint32 battle_scoring_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 getMutableBattleScoringList() { - bitField0_ |= 0x00000080; - return battleScoringList; - } - - /** - * repeated uint32 battle_scoring_list = 4; - * @param value the battleScoringList to add + * optional uint32 logic_random_seed = 8; + * @param value the logicRandomSeed to set * @return this */ - public SceneBattleInfo addBattleScoringList(final int value) { - bitField0_ |= 0x00000080; - battleScoringList.add(value); + public SceneBattleInfo setLogicRandomSeed(final int value) { + bitField0_ |= 0x00000010; + logicRandomSeed = value; return this; } /** - * repeated uint32 battle_scoring_list = 4; - * @param values the battleScoringList to add - * @return this - */ - public SceneBattleInfo addAllBattleScoringList(final int... values) { - bitField0_ |= 0x00000080; - battleScoringList.addAll(values); - return this; - } - - /** - * repeated .SceneMonsterWave monster_wave_list = 6; - * @return whether the monsterWaveList field is set - */ - public boolean hasMonsterWaveList() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * repeated .SceneMonsterWave monster_wave_list = 6; - * @return this - */ - public SceneBattleInfo clearMonsterWaveList() { - bitField0_ &= ~0x00000100; - monsterWaveList.clear(); - return this; - } - - /** - * repeated .SceneMonsterWave monster_wave_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 #getMutableMonsterWaveList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMonsterWaveList() { - return monsterWaveList; - } - - /** - * repeated .SceneMonsterWave monster_wave_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 getMutableMonsterWaveList( - ) { - bitField0_ |= 0x00000100; - return monsterWaveList; - } - - /** - * repeated .SceneMonsterWave monster_wave_list = 6; - * @param value the monsterWaveList to add - * @return this - */ - public SceneBattleInfo addMonsterWaveList( - final SceneMonsterWaveOuterClass.SceneMonsterWave value) { - bitField0_ |= 0x00000100; - monsterWaveList.add(value); - return this; - } - - /** - * repeated .SceneMonsterWave monster_wave_list = 6; - * @param values the monsterWaveList to add - * @return this - */ - public SceneBattleInfo addAllMonsterWaveList( - final SceneMonsterWaveOuterClass.SceneMonsterWave... values) { - bitField0_ |= 0x00000100; - monsterWaveList.addAll(values); - return this; - } - - /** - * repeated .BattleBuff buff_list = 8; - * @return whether the buffList field is set - */ - public boolean hasBuffList() { - return (bitField0_ & 0x00000200) != 0; - } - - /** - * repeated .BattleBuff buff_list = 8; - * @return this - */ - public SceneBattleInfo clearBuffList() { - bitField0_ &= ~0x00000200; - buffList.clear(); - return this; - } - - /** - * repeated .BattleBuff buff_list = 8; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableBuffList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getBuffList() { - return buffList; - } - - /** - * repeated .BattleBuff buff_list = 8; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableBuffList() { - bitField0_ |= 0x00000200; - return buffList; - } - - /** - * repeated .BattleBuff buff_list = 8; - * @param value the buffList to add - * @return this - */ - public SceneBattleInfo addBuffList(final BattleBuffOuterClass.BattleBuff value) { - bitField0_ |= 0x00000200; - buffList.add(value); - return this; - } - - /** - * repeated .BattleBuff buff_list = 8; - * @param values the buffList to add - * @return this - */ - public SceneBattleInfo addAllBuffList(final BattleBuffOuterClass.BattleBuff... values) { - bitField0_ |= 0x00000200; - buffList.addAll(values); - return this; - } - - /** - * repeated .BattleAvatar battle_avatar_list = 13; + * repeated .BattleAvatar battle_avatar_list = 10; * @return whether the battleAvatarList field is set */ public boolean hasBattleAvatarList() { - return (bitField0_ & 0x00000400) != 0; + return (bitField0_ & 0x00000020) != 0; } /** - * repeated .BattleAvatar battle_avatar_list = 13; + * repeated .BattleAvatar battle_avatar_list = 10; * @return this */ public SceneBattleInfo clearBattleAvatarList() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00000020; battleAvatarList.clear(); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 13; + * repeated .BattleAvatar battle_avatar_list = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -584,7 +287,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 13; + * repeated .BattleAvatar battle_avatar_list = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -593,49 +296,185 @@ public final class SceneBattleInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableBattleAvatarList() { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000020; return battleAvatarList; } /** - * repeated .BattleAvatar battle_avatar_list = 13; + * repeated .BattleAvatar battle_avatar_list = 10; * @param value the battleAvatarList to add * @return this */ public SceneBattleInfo addBattleAvatarList(final BattleAvatarOuterClass.BattleAvatar value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000020; battleAvatarList.add(value); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 13; + * repeated .BattleAvatar battle_avatar_list = 10; * @param values the battleAvatarList to add * @return this */ public SceneBattleInfo addAllBattleAvatarList( final BattleAvatarOuterClass.BattleAvatar... values) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000020; battleAvatarList.addAll(values); return this; } + /** + * repeated .BattleBuff buff_list = 14; + * @return whether the buffList field is set + */ + public boolean hasBuffList() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * repeated .BattleBuff buff_list = 14; + * @return this + */ + public SceneBattleInfo clearBuffList() { + bitField0_ &= ~0x00000040; + buffList.clear(); + return this; + } + + /** + * repeated .BattleBuff buff_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 #getMutableBuffList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getBuffList() { + return buffList; + } + + /** + * repeated .BattleBuff buff_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 getMutableBuffList() { + bitField0_ |= 0x00000040; + return buffList; + } + + /** + * repeated .BattleBuff buff_list = 14; + * @param value the buffList to add + * @return this + */ + public SceneBattleInfo addBuffList(final BattleBuffOuterClass.BattleBuff value) { + bitField0_ |= 0x00000040; + buffList.add(value); + return this; + } + + /** + * repeated .BattleBuff buff_list = 14; + * @param values the buffList to add + * @return this + */ + public SceneBattleInfo addAllBuffList(final BattleBuffOuterClass.BattleBuff... values) { + bitField0_ |= 0x00000040; + buffList.addAll(values); + return this; + } + + /** + * repeated .SceneMonsterWave monster_wave_list = 15; + * @return whether the monsterWaveList field is set + */ + public boolean hasMonsterWaveList() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * repeated .SceneMonsterWave monster_wave_list = 15; + * @return this + */ + public SceneBattleInfo clearMonsterWaveList() { + bitField0_ &= ~0x00000080; + monsterWaveList.clear(); + return this; + } + + /** + * repeated .SceneMonsterWave monster_wave_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 #getMutableMonsterWaveList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMonsterWaveList() { + return monsterWaveList; + } + + /** + * repeated .SceneMonsterWave monster_wave_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 getMutableMonsterWaveList( + ) { + bitField0_ |= 0x00000080; + return monsterWaveList; + } + + /** + * repeated .SceneMonsterWave monster_wave_list = 15; + * @param value the monsterWaveList to add + * @return this + */ + public SceneBattleInfo addMonsterWaveList( + final SceneMonsterWaveOuterClass.SceneMonsterWave value) { + bitField0_ |= 0x00000080; + monsterWaveList.add(value); + return this; + } + + /** + * repeated .SceneMonsterWave monster_wave_list = 15; + * @param values the monsterWaveList to add + * @return this + */ + public SceneBattleInfo addAllMonsterWaveList( + final SceneMonsterWaveOuterClass.SceneMonsterWave... values) { + bitField0_ |= 0x00000080; + monsterWaveList.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; - kEFEEBINLNN = other.kEFEEBINLNN; + roundsLimit = other.roundsLimit; stageId = other.stageId; - cAMAJMFLKKL = other.cAMAJMFLKKL; - battleScoringList.copyFrom(other.battleScoringList); - monsterWaveList.copyFrom(other.monsterWaveList); - buffList.copyFrom(other.buffList); + worldLevel = other.worldLevel; + logicRandomSeed = other.logicRandomSeed; battleAvatarList.copyFrom(other.battleAvatarList); + buffList.copyFrom(other.buffList); + monsterWaveList.copyFrom(other.monsterWaveList); } return this; } @@ -646,38 +485,29 @@ 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.hasKEFEEBINLNN()) { - setKEFEEBINLNN(other.kEFEEBINLNN); + if (other.hasRoundsLimit()) { + setRoundsLimit(other.roundsLimit); } if (other.hasStageId()) { setStageId(other.stageId); } - if (other.hasCAMAJMFLKKL()) { - setCAMAJMFLKKL(other.cAMAJMFLKKL); + if (other.hasWorldLevel()) { + setWorldLevel(other.worldLevel); } - if (other.hasBattleScoringList()) { - getMutableBattleScoringList().addAll(other.battleScoringList); + if (other.hasLogicRandomSeed()) { + setLogicRandomSeed(other.logicRandomSeed); } - if (other.hasMonsterWaveList()) { - getMutableMonsterWaveList().addAll(other.monsterWaveList); + if (other.hasBattleAvatarList()) { + getMutableBattleAvatarList().addAll(other.battleAvatarList); } if (other.hasBuffList()) { getMutableBuffList().addAll(other.buffList); } - if (other.hasBattleAvatarList()) { - getMutableBattleAvatarList().addAll(other.battleAvatarList); + if (other.hasMonsterWaveList()) { + getMutableMonsterWaveList().addAll(other.monsterWaveList); } return this; } @@ -689,17 +519,14 @@ public final class SceneBattleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - roundsLimit = 0; - worldLevel = 0; battleId = 0; - logicRandomSeed = 0; - kEFEEBINLNN = 0; + roundsLimit = 0; stageId = 0; - cAMAJMFLKKL = false; - battleScoringList.clear(); - monsterWaveList.clear(); - buffList.clear(); + worldLevel = 0; + logicRandomSeed = 0; battleAvatarList.clear(); + buffList.clear(); + monsterWaveList.clear(); return this; } @@ -710,10 +537,9 @@ public final class SceneBattleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - battleScoringList.clear(); - monsterWaveList.clearQuick(); - buffList.clearQuick(); battleAvatarList.clearQuick(); + buffList.clearQuick(); + monsterWaveList.clearQuick(); return this; } @@ -727,71 +553,54 @@ 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) - && (!hasKEFEEBINLNN() || kEFEEBINLNN == other.kEFEEBINLNN) + && (!hasRoundsLimit() || roundsLimit == other.roundsLimit) && (!hasStageId() || stageId == other.stageId) - && (!hasCAMAJMFLKKL() || cAMAJMFLKKL == other.cAMAJMFLKKL) - && (!hasBattleScoringList() || battleScoringList.equals(other.battleScoringList)) - && (!hasMonsterWaveList() || monsterWaveList.equals(other.monsterWaveList)) + && (!hasWorldLevel() || worldLevel == other.worldLevel) + && (!hasLogicRandomSeed() || logicRandomSeed == other.logicRandomSeed) + && (!hasBattleAvatarList() || battleAvatarList.equals(other.battleAvatarList)) && (!hasBuffList() || buffList.equals(other.buffList)) - && (!hasBattleAvatarList() || battleAvatarList.equals(other.battleAvatarList)); + && (!hasMonsterWaveList() || monsterWaveList.equals(other.monsterWaveList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(roundsLimit); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(worldLevel); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); output.writeUInt32NoTag(battleId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(logicRandomSeed); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(roundsLimit); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(kEFEEBINLNN); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 48); output.writeUInt32NoTag(stageId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(worldLevel); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(logicRandomSeed); + } + if ((bitField0_ & 0x00000020) != 0) { + for (int i = 0; i < battleAvatarList.length(); i++) { + output.writeRawByte((byte) 82); + output.writeMessageNoTag(battleAvatarList.get(i)); + } + } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 16); - output.writeBoolNoTag(cAMAJMFLKKL); - } - if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < battleScoringList.length(); i++) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(battleScoringList.array()[i]); - } - } - if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < monsterWaveList.length(); i++) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(monsterWaveList.get(i)); - } - } - if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 114); output.writeMessageNoTag(buffList.get(i)); } } - if ((bitField0_ & 0x00000400) != 0) { - for (int i = 0; i < battleAvatarList.length(); i++) { - output.writeRawByte((byte) 106); - output.writeMessageNoTag(battleAvatarList.get(i)); + if ((bitField0_ & 0x00000080) != 0) { + for (int i = 0; i < monsterWaveList.length(); i++) { + output.writeRawByte((byte) 122); + output.writeMessageNoTag(monsterWaveList.get(i)); } } } @@ -800,37 +609,28 @@ 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) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(logicRandomSeed); + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(roundsLimit); } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kEFEEBINLNN); - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(logicRandomSeed); + } + if ((bitField0_ & 0x00000020) != 0) { + size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList); + } if ((bitField0_ & 0x00000040) != 0) { - size += 2; - } - if ((bitField0_ & 0x00000080) != 0) { - size += (1 * battleScoringList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(battleScoringList); - } - if ((bitField0_ & 0x00000100) != 0) { - size += (1 * monsterWaveList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterWaveList); - } - if ((bitField0_ & 0x00000200) != 0) { size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList); } - if ((bitField0_ & 0x00000400) != 0) { - size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList); + if ((bitField0_ & 0x00000080) != 0) { + size += (1 * monsterWaveList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterWaveList); } return size; } @@ -843,97 +643,70 @@ public final class SceneBattleInfoOuterClass { while (true) { switch (tag) { case 8: { - // roundsLimit - roundsLimit = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // worldLevel - worldLevel = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { // battleId battleId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // logicRandomSeed - logicRandomSeed = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // kEFEEBINLNN - kEFEEBINLNN = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // stageId - stageId = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 16) { break; } } case 16: { - // cAMAJMFLKKL - cAMAJMFLKKL = input.readBool(); - bitField0_ |= 0x00000040; + // roundsLimit + roundsLimit = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 34) { + if (tag != 48) { break; } } - case 34: { - // battleScoringList [packed=true] - input.readPackedUInt32(battleScoringList, tag); - bitField0_ |= 0x00000080; + case 48: { + // stageId + stageId = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 50) { + if (tag != 56) { break; } } - case 50: { - // monsterWaveList - tag = input.readRepeatedMessage(monsterWaveList, tag); - bitField0_ |= 0x00000100; - if (tag != 66) { + case 56: { + // worldLevel + worldLevel = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 64) { break; } } - case 66: { - // buffList - tag = input.readRepeatedMessage(buffList, tag); - bitField0_ |= 0x00000200; - if (tag != 106) { + case 64: { + // logicRandomSeed + logicRandomSeed = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 82) { break; } } - case 106: { + case 82: { // battleAvatarList tag = input.readRepeatedMessage(battleAvatarList, tag); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000020; + if (tag != 114) { + break; + } + } + case 114: { + // buffList + tag = input.readRepeatedMessage(buffList, tag); + bitField0_ |= 0x00000040; + if (tag != 122) { + break; + } + } + case 122: { + // monsterWaveList + tag = input.readRepeatedMessage(monsterWaveList, tag); + bitField0_ |= 0x00000080; if (tag != 0) { break; } @@ -948,12 +721,6 @@ public final class SceneBattleInfoOuterClass { tag = input.readTag(); break; } - case 32: { - // battleScoringList [packed=false] - tag = input.readRepeatedUInt32(battleScoringList, tag); - bitField0_ |= 0x00000080; - break; - } } } } @@ -962,37 +729,28 @@ 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) { - output.writeUInt32(FieldNames.logicRandomSeed, logicRandomSeed); + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.roundsLimit, roundsLimit); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.kEFEEBINLNN, kEFEEBINLNN); - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.stageId, stageId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.worldLevel, worldLevel); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.logicRandomSeed, logicRandomSeed); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeBool(FieldNames.cAMAJMFLKKL, cAMAJMFLKKL); - } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedUInt32(FieldNames.battleScoringList, battleScoringList); - } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.monsterWaveList, monsterWaveList); - } - if ((bitField0_ & 0x00000200) != 0) { output.writeRepeatedMessage(FieldNames.buffList, buffList); } - if ((bitField0_ & 0x00000400) != 0) { - output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList); + if ((bitField0_ & 0x00000080) != 0) { + output.writeRepeatedMessage(FieldNames.monsterWaveList, monsterWaveList); } output.endObject(); } @@ -1004,11 +762,11 @@ public final class SceneBattleInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 306477590: - case 1457479585: { - if (input.isAtField(FieldNames.roundsLimit)) { + case -1678308365: + case -487930366: { + if (input.isAtField(FieldNames.battleId)) { if (!input.trySkipNullValue()) { - roundsLimit = input.readUInt32(); + battleId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -1016,11 +774,11 @@ public final class SceneBattleInfoOuterClass { } break; } - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { + case 306477590: + case 1457479585: { + if (input.isAtField(FieldNames.roundsLimit)) { if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); + roundsLimit = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1028,94 +786,36 @@ public final class SceneBattleInfoOuterClass { } break; } - case -1678308365: - case -487930366: { - if (input.isAtField(FieldNames.battleId)) { - if (!input.trySkipNullValue()) { - battleId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 141999058: - case -1894951668: { - if (input.isAtField(FieldNames.logicRandomSeed)) { - if (!input.trySkipNullValue()) { - logicRandomSeed = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1207275631: { - if (input.isAtField(FieldNames.kEFEEBINLNN)) { - if (!input.trySkipNullValue()) { - kEFEEBINLNN = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } case -1897528135: case 1306191356: { if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { stageId = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); } break; } - case -919425455: { - if (input.isAtField(FieldNames.cAMAJMFLKKL)) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { - cAMAJMFLKKL = input.readBool(); - bitField0_ |= 0x00000040; + worldLevel = input.readUInt32(); + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); } break; } - case -804890571: - case -2008328139: { - if (input.isAtField(FieldNames.battleScoringList)) { + case 141999058: + case -1894951668: { + if (input.isAtField(FieldNames.logicRandomSeed)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(battleScoringList); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } - case 697746737: - case -1492024321: { - if (input.isAtField(FieldNames.monsterWaveList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(monsterWaveList); - bitField0_ |= 0x00000100; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1522789487: - case 55792906: { - if (input.isAtField(FieldNames.buffList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(buffList); - bitField0_ |= 0x00000200; + logicRandomSeed = input.readUInt32(); + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -1127,7 +827,31 @@ public final class SceneBattleInfoOuterClass { if (input.isAtField(FieldNames.battleAvatarList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(battleAvatarList); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1522789487: + case 55792906: { + if (input.isAtField(FieldNames.buffList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(buffList); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } + case 697746737: + case -1492024321: { + if (input.isAtField(FieldNames.monsterWaveList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(monsterWaveList); + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1187,27 +911,21 @@ 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 kEFEEBINLNN = FieldName.forField("KEFEEBINLNN"); + static final FieldName roundsLimit = FieldName.forField("roundsLimit", "rounds_limit"); static final FieldName stageId = FieldName.forField("stageId", "stage_id"); - static final FieldName cAMAJMFLKKL = FieldName.forField("CAMAJMFLKKL"); + static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - static final FieldName battleScoringList = FieldName.forField("battleScoringList", "battle_scoring_list"); + static final FieldName logicRandomSeed = FieldName.forField("logicRandomSeed", "logic_random_seed"); - static final FieldName monsterWaveList = FieldName.forField("monsterWaveList", "monster_wave_list"); + static final FieldName battleAvatarList = FieldName.forField("battleAvatarList", "battle_avatar_list"); static final FieldName buffList = FieldName.forField("buffList", "buff_list"); - static final FieldName battleAvatarList = FieldName.forField("battleAvatarList", "battle_avatar_list"); + static final FieldName monsterWaveList = FieldName.forField("monsterWaveList", "monster_wave_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java index ec6056b..43a9c66 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.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.RepeatedEnum; import us.hebi.quickbuf.RepeatedInt; public final class SceneCastSkillCsReqOuterClass { @@ -21,44 +20,34 @@ public final class SceneCastSkillCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 attacked_group_id = 5; - */ - private int attackedGroupId; - - /** - * optional uint32 skill_index = 7; + * optional uint32 skill_index = 3; */ private int skillIndex; /** - * optional uint32 LCFDKABNDLM = 8; + * optional uint32 caster_id = 4; */ - private int lCFDKABNDLM; + private int casterId; /** - * optional uint32 attacker_id = 13; + * optional uint32 attacked_group_id = 14; */ - private int attackerId; + private int attackedGroupId; /** - * optional .MotionInfo target_motion = 10; + * optional .MotionInfo target_motion = 8; */ private final MotionInfoOuterClass.MotionInfo targetMotion = MotionInfoOuterClass.MotionInfo.newInstance(); /** - * repeated uint32 attacked_entity_id_list = 4; - */ - private final RepeatedInt attackedEntityIdList = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 cast_entity_id_list = 11; + * repeated uint32 cast_entity_id_list = 12; */ private final RepeatedInt castEntityIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .SceneCastSkill cast_skill_type = 2; + * repeated uint32 attacked_entity_id_list = 15; */ - private final RepeatedEnum castSkillType = RepeatedEnum.newEmptyInstance(SceneCastSkillOuterClass.SceneCastSkill.converter()); + private final RepeatedInt attackedEntityIdList = RepeatedInt.newEmptyInstance(); private SceneCastSkillCsReq() { } @@ -71,62 +60,25 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 attacked_group_id = 5; - * @return whether the attackedGroupId field is set + * optional uint32 skill_index = 3; + * @return whether the skillIndex field is set */ - public boolean hasAttackedGroupId() { + public boolean hasSkillIndex() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 attacked_group_id = 5; - * @return this - */ - public SceneCastSkillCsReq clearAttackedGroupId() { - bitField0_ &= ~0x00000001; - attackedGroupId = 0; - return this; - } - - /** - * optional uint32 attacked_group_id = 5; - * @return the attackedGroupId - */ - public int getAttackedGroupId() { - return attackedGroupId; - } - - /** - * optional uint32 attacked_group_id = 5; - * @param value the attackedGroupId to set - * @return this - */ - public SceneCastSkillCsReq setAttackedGroupId(final int value) { - bitField0_ |= 0x00000001; - attackedGroupId = value; - return this; - } - - /** - * optional uint32 skill_index = 7; - * @return whether the skillIndex field is set - */ - public boolean hasSkillIndex() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 skill_index = 7; + * optional uint32 skill_index = 3; * @return this */ public SceneCastSkillCsReq clearSkillIndex() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; skillIndex = 0; return this; } /** - * optional uint32 skill_index = 7; + * optional uint32 skill_index = 3; * @return the skillIndex */ public int getSkillIndex() { @@ -134,110 +86,110 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 skill_index = 7; + * optional uint32 skill_index = 3; * @param value the skillIndex to set * @return this */ public SceneCastSkillCsReq setSkillIndex(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; skillIndex = value; return this; } /** - * optional uint32 LCFDKABNDLM = 8; - * @return whether the lCFDKABNDLM field is set + * optional uint32 caster_id = 4; + * @return whether the casterId field is set */ - public boolean hasLCFDKABNDLM() { + public boolean hasCasterId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 caster_id = 4; + * @return this + */ + public SceneCastSkillCsReq clearCasterId() { + bitField0_ &= ~0x00000002; + casterId = 0; + return this; + } + + /** + * optional uint32 caster_id = 4; + * @return the casterId + */ + public int getCasterId() { + return casterId; + } + + /** + * optional uint32 caster_id = 4; + * @param value the casterId to set + * @return this + */ + public SceneCastSkillCsReq setCasterId(final int value) { + bitField0_ |= 0x00000002; + casterId = value; + return this; + } + + /** + * optional uint32 attacked_group_id = 14; + * @return whether the attackedGroupId field is set + */ + public boolean hasAttackedGroupId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 LCFDKABNDLM = 8; + * optional uint32 attacked_group_id = 14; * @return this */ - public SceneCastSkillCsReq clearLCFDKABNDLM() { + public SceneCastSkillCsReq clearAttackedGroupId() { bitField0_ &= ~0x00000004; - lCFDKABNDLM = 0; + attackedGroupId = 0; return this; } /** - * optional uint32 LCFDKABNDLM = 8; - * @return the lCFDKABNDLM + * optional uint32 attacked_group_id = 14; + * @return the attackedGroupId */ - public int getLCFDKABNDLM() { - return lCFDKABNDLM; + public int getAttackedGroupId() { + return attackedGroupId; } /** - * optional uint32 LCFDKABNDLM = 8; - * @param value the lCFDKABNDLM to set + * optional uint32 attacked_group_id = 14; + * @param value the attackedGroupId to set * @return this */ - public SceneCastSkillCsReq setLCFDKABNDLM(final int value) { + public SceneCastSkillCsReq setAttackedGroupId(final int value) { bitField0_ |= 0x00000004; - lCFDKABNDLM = value; + attackedGroupId = value; return this; } /** - * optional uint32 attacker_id = 13; - * @return whether the attackerId field is set + * optional .MotionInfo target_motion = 8; + * @return whether the targetMotion field is set */ - public boolean hasAttackerId() { + public boolean hasTargetMotion() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 attacker_id = 13; - * @return this - */ - public SceneCastSkillCsReq clearAttackerId() { - bitField0_ &= ~0x00000008; - attackerId = 0; - return this; - } - - /** - * optional uint32 attacker_id = 13; - * @return the attackerId - */ - public int getAttackerId() { - return attackerId; - } - - /** - * optional uint32 attacker_id = 13; - * @param value the attackerId to set - * @return this - */ - public SceneCastSkillCsReq setAttackerId(final int value) { - bitField0_ |= 0x00000008; - attackerId = value; - return this; - } - - /** - * optional .MotionInfo target_motion = 10; - * @return whether the targetMotion field is set - */ - public boolean hasTargetMotion() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .MotionInfo target_motion = 10; + * optional .MotionInfo target_motion = 8; * @return this */ public SceneCastSkillCsReq clearTargetMotion() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; targetMotion.clear(); return this; } /** - * optional .MotionInfo target_motion = 10; + * optional .MotionInfo target_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. @@ -251,7 +203,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 10; + * optional .MotionInfo target_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 @@ -260,109 +212,41 @@ public final class SceneCastSkillCsReqOuterClass { * @return internal storage object for modifications */ public MotionInfoOuterClass.MotionInfo getMutableTargetMotion() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return targetMotion; } /** - * optional .MotionInfo target_motion = 10; + * optional .MotionInfo target_motion = 8; * @param value the targetMotion to set * @return this */ public SceneCastSkillCsReq setTargetMotion(final MotionInfoOuterClass.MotionInfo value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; targetMotion.copyFrom(value); return this; } /** - * repeated uint32 attacked_entity_id_list = 4; - * @return whether the attackedEntityIdList field is set - */ - public boolean hasAttackedEntityIdList() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * repeated uint32 attacked_entity_id_list = 4; - * @return this - */ - public SceneCastSkillCsReq clearAttackedEntityIdList() { - bitField0_ &= ~0x00000020; - attackedEntityIdList.clear(); - return this; - } - - /** - * repeated uint32 attacked_entity_id_list = 4; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableAttackedEntityIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getAttackedEntityIdList() { - return attackedEntityIdList; - } - - /** - * repeated uint32 attacked_entity_id_list = 4; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableAttackedEntityIdList() { - bitField0_ |= 0x00000020; - return attackedEntityIdList; - } - - /** - * repeated uint32 attacked_entity_id_list = 4; - * @param value the attackedEntityIdList to add - * @return this - */ - public SceneCastSkillCsReq addAttackedEntityIdList(final int value) { - bitField0_ |= 0x00000020; - attackedEntityIdList.add(value); - return this; - } - - /** - * repeated uint32 attacked_entity_id_list = 4; - * @param values the attackedEntityIdList to add - * @return this - */ - public SceneCastSkillCsReq addAllAttackedEntityIdList(final int... values) { - bitField0_ |= 0x00000020; - attackedEntityIdList.addAll(values); - return this; - } - - /** - * repeated uint32 cast_entity_id_list = 11; + * repeated uint32 cast_entity_id_list = 12; * @return whether the castEntityIdList field is set */ public boolean hasCastEntityIdList() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000010) != 0; } /** - * repeated uint32 cast_entity_id_list = 11; + * repeated uint32 cast_entity_id_list = 12; * @return this */ public SceneCastSkillCsReq clearCastEntityIdList() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000010; castEntityIdList.clear(); return this; } /** - * repeated uint32 cast_entity_id_list = 11; + * repeated uint32 cast_entity_id_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -376,7 +260,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated uint32 cast_entity_id_list = 11; + * repeated uint32 cast_entity_id_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -385,66 +269,66 @@ public final class SceneCastSkillCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableCastEntityIdList() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; return castEntityIdList; } /** - * repeated uint32 cast_entity_id_list = 11; + * repeated uint32 cast_entity_id_list = 12; * @param value the castEntityIdList to add * @return this */ public SceneCastSkillCsReq addCastEntityIdList(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; castEntityIdList.add(value); return this; } /** - * repeated uint32 cast_entity_id_list = 11; + * repeated uint32 cast_entity_id_list = 12; * @param values the castEntityIdList to add * @return this */ public SceneCastSkillCsReq addAllCastEntityIdList(final int... values) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; castEntityIdList.addAll(values); return this; } /** - * repeated .SceneCastSkill cast_skill_type = 2; - * @return whether the castSkillType field is set + * repeated uint32 attacked_entity_id_list = 15; + * @return whether the attackedEntityIdList field is set */ - public boolean hasCastSkillType() { - return (bitField0_ & 0x00000080) != 0; + public boolean hasAttackedEntityIdList() { + return (bitField0_ & 0x00000020) != 0; } /** - * repeated .SceneCastSkill cast_skill_type = 2; + * repeated uint32 attacked_entity_id_list = 15; * @return this */ - public SceneCastSkillCsReq clearCastSkillType() { - bitField0_ &= ~0x00000080; - castSkillType.clear(); + public SceneCastSkillCsReq clearAttackedEntityIdList() { + bitField0_ &= ~0x00000020; + attackedEntityIdList.clear(); return this; } /** - * repeated .SceneCastSkill cast_skill_type = 2; + * repeated uint32 attacked_entity_id_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableCastSkillType()} if you want to modify it. + * Use {@link #getMutableAttackedEntityIdList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedEnum getCastSkillType() { - return castSkillType; + public RepeatedInt getAttackedEntityIdList() { + return attackedEntityIdList; } /** - * repeated .SceneCastSkill cast_skill_type = 2; + * repeated uint32 attacked_entity_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 @@ -452,32 +336,30 @@ public final class SceneCastSkillCsReqOuterClass { * * @return internal storage object for modifications */ - public RepeatedEnum getMutableCastSkillType() { - bitField0_ |= 0x00000080; - return castSkillType; + public RepeatedInt getMutableAttackedEntityIdList() { + bitField0_ |= 0x00000020; + return attackedEntityIdList; } /** - * repeated .SceneCastSkill cast_skill_type = 2; - * @param value the castSkillType to add + * repeated uint32 attacked_entity_id_list = 15; + * @param value the attackedEntityIdList to add * @return this */ - public SceneCastSkillCsReq addCastSkillType( - final SceneCastSkillOuterClass.SceneCastSkill value) { - bitField0_ |= 0x00000080; - castSkillType.add(value); + public SceneCastSkillCsReq addAttackedEntityIdList(final int value) { + bitField0_ |= 0x00000020; + attackedEntityIdList.add(value); return this; } /** - * repeated .SceneCastSkill cast_skill_type = 2; - * @param values the castSkillType to add + * repeated uint32 attacked_entity_id_list = 15; + * @param values the attackedEntityIdList to add * @return this */ - public SceneCastSkillCsReq addAllCastSkillType( - final SceneCastSkillOuterClass.SceneCastSkill... values) { - bitField0_ |= 0x00000080; - castSkillType.addAll(values); + public SceneCastSkillCsReq addAllAttackedEntityIdList(final int... values) { + bitField0_ |= 0x00000020; + attackedEntityIdList.addAll(values); return this; } @@ -486,14 +368,12 @@ public final class SceneCastSkillCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - attackedGroupId = other.attackedGroupId; skillIndex = other.skillIndex; - lCFDKABNDLM = other.lCFDKABNDLM; - attackerId = other.attackerId; + casterId = other.casterId; + attackedGroupId = other.attackedGroupId; targetMotion.copyFrom(other.targetMotion); - attackedEntityIdList.copyFrom(other.attackedEntityIdList); castEntityIdList.copyFrom(other.castEntityIdList); - castSkillType.copyFrom(other.castSkillType); + attackedEntityIdList.copyFrom(other.attackedEntityIdList); } return this; } @@ -504,29 +384,23 @@ public final class SceneCastSkillCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasAttackedGroupId()) { - setAttackedGroupId(other.attackedGroupId); - } if (other.hasSkillIndex()) { setSkillIndex(other.skillIndex); } - if (other.hasLCFDKABNDLM()) { - setLCFDKABNDLM(other.lCFDKABNDLM); + if (other.hasCasterId()) { + setCasterId(other.casterId); } - if (other.hasAttackerId()) { - setAttackerId(other.attackerId); + if (other.hasAttackedGroupId()) { + setAttackedGroupId(other.attackedGroupId); } if (other.hasTargetMotion()) { getMutableTargetMotion().mergeFrom(other.targetMotion); } - if (other.hasAttackedEntityIdList()) { - getMutableAttackedEntityIdList().addAll(other.attackedEntityIdList); - } if (other.hasCastEntityIdList()) { getMutableCastEntityIdList().addAll(other.castEntityIdList); } - if (other.hasCastSkillType()) { - getMutableCastSkillType().addAll(other.castSkillType); + if (other.hasAttackedEntityIdList()) { + getMutableAttackedEntityIdList().addAll(other.attackedEntityIdList); } return this; } @@ -538,14 +412,12 @@ public final class SceneCastSkillCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - attackedGroupId = 0; skillIndex = 0; - lCFDKABNDLM = 0; - attackerId = 0; + casterId = 0; + attackedGroupId = 0; targetMotion.clear(); - attackedEntityIdList.clear(); castEntityIdList.clear(); - castSkillType.clear(); + attackedEntityIdList.clear(); return this; } @@ -557,9 +429,8 @@ public final class SceneCastSkillCsReqOuterClass { cachedSize = -1; bitField0_ = 0; targetMotion.clearQuick(); - attackedEntityIdList.clear(); castEntityIdList.clear(); - castSkillType.clear(); + attackedEntityIdList.clear(); return this; } @@ -573,54 +444,42 @@ public final class SceneCastSkillCsReqOuterClass { } SceneCastSkillCsReq other = (SceneCastSkillCsReq) o; return bitField0_ == other.bitField0_ - && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) && (!hasSkillIndex() || skillIndex == other.skillIndex) - && (!hasLCFDKABNDLM() || lCFDKABNDLM == other.lCFDKABNDLM) - && (!hasAttackerId() || attackerId == other.attackerId) + && (!hasCasterId() || casterId == other.casterId) + && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) && (!hasTargetMotion() || targetMotion.equals(other.targetMotion)) - && (!hasAttackedEntityIdList() || attackedEntityIdList.equals(other.attackedEntityIdList)) && (!hasCastEntityIdList() || castEntityIdList.equals(other.castEntityIdList)) - && (!hasCastSkillType() || castSkillType.equals(other.castSkillType)); + && (!hasAttackedEntityIdList() || attackedEntityIdList.equals(other.attackedEntityIdList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(attackedGroupId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(skillIndex); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(casterId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(lCFDKABNDLM); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(attackedGroupId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(attackerId); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 66); output.writeMessageNoTag(targetMotion); } - if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < attackedEntityIdList.length(); i++) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(attackedEntityIdList.array()[i]); - } - } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < castEntityIdList.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(castEntityIdList.array()[i]); } } - if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < castSkillType.length(); i++) { - output.writeRawByte((byte) 16); - output.writeEnumNoTag(castSkillType.array()[i]); + if ((bitField0_ & 0x00000020) != 0) { + for (int i = 0; i < attackedEntityIdList.length(); i++) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(attackedEntityIdList.array()[i]); } } } @@ -629,29 +488,23 @@ public final class SceneCastSkillCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(skillIndex); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(casterId); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lCFDKABNDLM); + size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(attackerId); + size += 1 + ProtoSink.computeMessageSizeNoTag(targetMotion); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(targetMotion); + size += (1 * castEntityIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(castEntityIdList); } if ((bitField0_ & 0x00000020) != 0) { size += (1 * attackedEntityIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(attackedEntityIdList); } - if ((bitField0_ & 0x00000040) != 0) { - size += (1 * castEntityIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(castEntityIdList); - } - if ((bitField0_ & 0x00000080) != 0) { - size += (1 * castSkillType.length()) + ProtoSink.computeRepeatedEnumSizeNoTag(castSkillType); - } return size; } @@ -662,74 +515,56 @@ public final class SceneCastSkillCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // attackedGroupId - attackedGroupId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 24: { // skillIndex skillIndex = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // casterId + casterId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 112) { break; } } - case 64: { - // lCFDKABNDLM - lCFDKABNDLM = input.readUInt32(); + case 112: { + // attackedGroupId + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 66) { break; } } - case 104: { - // attackerId - attackerId = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 82) { - break; - } - } - case 82: { + case 66: { // targetMotion input.readMessage(targetMotion); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 34) { + if (tag != 98) { break; } } - case 34: { + case 98: { + // castEntityIdList [packed=true] + input.readPackedUInt32(castEntityIdList, tag); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { // attackedEntityIdList [packed=true] input.readPackedUInt32(attackedEntityIdList, tag); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { - // castEntityIdList [packed=true] - input.readPackedUInt32(castEntityIdList, tag); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 18) { - break; - } - } - case 18: { - // castSkillType [packed=true] - input.readPackedEnum(castSkillType, tag); - bitField0_ |= 0x00000080; - tag = input.readTag(); if (tag != 0) { break; } @@ -744,24 +579,18 @@ public final class SceneCastSkillCsReqOuterClass { tag = input.readTag(); break; } - case 32: { + case 96: { + // castEntityIdList [packed=false] + tag = input.readRepeatedUInt32(castEntityIdList, tag); + bitField0_ |= 0x00000010; + break; + } + case 120: { // attackedEntityIdList [packed=false] tag = input.readRepeatedUInt32(attackedEntityIdList, tag); bitField0_ |= 0x00000020; break; } - case 88: { - // castEntityIdList [packed=false] - tag = input.readRepeatedUInt32(castEntityIdList, tag); - bitField0_ |= 0x00000040; - break; - } - case 16: { - // castSkillType [packed=false] - tag = input.readRepeatedEnum(castSkillType, tag); - bitField0_ |= 0x00000080; - break; - } } } } @@ -770,29 +599,23 @@ public final class SceneCastSkillCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.skillIndex, skillIndex); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.casterId, casterId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.lCFDKABNDLM, lCFDKABNDLM); + output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.attackerId, attackerId); + output.writeMessage(FieldNames.targetMotion, targetMotion); } if ((bitField0_ & 0x00000010) != 0) { - output.writeMessage(FieldNames.targetMotion, targetMotion); + output.writeRepeatedUInt32(FieldNames.castEntityIdList, castEntityIdList); } if ((bitField0_ & 0x00000020) != 0) { output.writeRepeatedUInt32(FieldNames.attackedEntityIdList, attackedEntityIdList); } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedUInt32(FieldNames.castEntityIdList, castEntityIdList); - } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedEnum(FieldNames.castSkillType, castSkillType); - } output.endObject(); } @@ -803,11 +626,11 @@ public final class SceneCastSkillCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1725961965: - case -715836621: { - if (input.isAtField(FieldNames.attackedGroupId)) { + case 1587034369: + case -1716021916: { + if (input.isAtField(FieldNames.skillIndex)) { if (!input.trySkipNullValue()) { - attackedGroupId = input.readUInt32(); + skillIndex = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -815,11 +638,11 @@ public final class SceneCastSkillCsReqOuterClass { } break; } - case 1587034369: - case -1716021916: { - if (input.isAtField(FieldNames.skillIndex)) { + case 35676775: + case 1106001422: { + if (input.isAtField(FieldNames.casterId)) { if (!input.trySkipNullValue()) { - skillIndex = input.readUInt32(); + casterId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -827,10 +650,11 @@ public final class SceneCastSkillCsReqOuterClass { } break; } - case 935910222: { - if (input.isAtField(FieldNames.lCFDKABNDLM)) { + case -1725961965: + case -715836621: { + if (input.isAtField(FieldNames.attackedGroupId)) { if (!input.trySkipNullValue()) { - lCFDKABNDLM = input.readUInt32(); + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -838,23 +662,23 @@ public final class SceneCastSkillCsReqOuterClass { } break; } - case -1960957712: - case -660125531: { - if (input.isAtField(FieldNames.attackerId)) { - if (!input.trySkipNullValue()) { - attackerId = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case -716903257: case -2015521244: { if (input.isAtField(FieldNames.targetMotion)) { if (!input.trySkipNullValue()) { input.readMessage(targetMotion); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -182636805: + case -1429767706: { + if (input.isAtField(FieldNames.castEntityIdList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(castEntityIdList); bitField0_ |= 0x00000010; } } else { @@ -874,30 +698,6 @@ public final class SceneCastSkillCsReqOuterClass { } break; } - case -182636805: - case -1429767706: { - if (input.isAtField(FieldNames.castEntityIdList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(castEntityIdList); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1457514324: - case -1762790040: { - if (input.isAtField(FieldNames.castSkillType)) { - if (!input.trySkipNullValue()) { - input.readRepeatedEnum(castSkillType, SceneCastSkillOuterClass.SceneCastSkill.converter()); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } default: { input.skipUnknownField(); break; @@ -951,21 +751,17 @@ public final class SceneCastSkillCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); - static final FieldName skillIndex = FieldName.forField("skillIndex", "skill_index"); - static final FieldName lCFDKABNDLM = FieldName.forField("LCFDKABNDLM"); + static final FieldName casterId = FieldName.forField("casterId", "caster_id"); - static final FieldName attackerId = FieldName.forField("attackerId", "attacker_id"); + static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); static final FieldName targetMotion = FieldName.forField("targetMotion", "target_motion"); - static final FieldName attackedEntityIdList = FieldName.forField("attackedEntityIdList", "attacked_entity_id_list"); - static final FieldName castEntityIdList = FieldName.forField("castEntityIdList", "cast_entity_id_list"); - static final FieldName castSkillType = FieldName.forField("castSkillType", "cast_skill_type"); + static final FieldName attackedEntityIdList = FieldName.forField("attackedEntityIdList", "attacked_entity_id_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java index 8feb06a..6ee45fb 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 = 10; + * optional uint32 attacked_group_id = 1; */ private int attackedGroupId; /** - * optional uint32 mp = 13; + * optional uint32 mp = 4; */ private int mp; @@ -39,7 +39,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 10; + * optional uint32 attacked_group_id = 1; * @return whether the attackedGroupId field is set */ public boolean hasAttackedGroupId() { @@ -47,7 +47,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 10; + * optional uint32 attacked_group_id = 1; * @return this */ public SceneCastSkillMpUpdateScNotify clearAttackedGroupId() { @@ -57,7 +57,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 10; + * optional uint32 attacked_group_id = 1; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -65,7 +65,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 10; + * optional uint32 attacked_group_id = 1; * @param value the attackedGroupId to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 13; + * optional uint32 mp = 4; * @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 = 4; * @return this */ public SceneCastSkillMpUpdateScNotify clearMp() { @@ -94,7 +94,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 13; + * optional uint32 mp = 4; * @return the mp */ public int getMp() { @@ -102,7 +102,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 13; + * optional uint32 mp = 4; * @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) 80); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(attackedGroupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(mp); } } @@ -205,16 +205,16 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 8: { // attackedGroupId attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 32) { break; } } - case 104: { + case 32: { // 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 d138fd9..c9a19eb 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; + * optional uint32 attacked_group_id = 11; */ private int attackedGroupId; /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; */ private int retcode; /** - * optional .SceneBattleInfo battle_info = 4; + * optional .SceneBattleInfo battle_info = 9; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -44,7 +44,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 attacked_group_id = 6; + * optional uint32 attacked_group_id = 11; * @return whether the attackedGroupId field is set */ public boolean hasAttackedGroupId() { @@ -52,7 +52,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 attacked_group_id = 6; + * optional uint32 attacked_group_id = 11; * @return this */ public SceneCastSkillScRsp clearAttackedGroupId() { @@ -62,7 +62,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 attacked_group_id = 6; + * optional uint32 attacked_group_id = 11; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -70,7 +70,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 attacked_group_id = 6; + * optional uint32 attacked_group_id = 11; * @param value the attackedGroupId to set * @return this */ @@ -81,7 +81,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -89,7 +89,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @return this */ public SceneCastSkillScRsp clearRetcode() { @@ -99,7 +99,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -107,7 +107,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -118,7 +118,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 4; + * optional .SceneBattleInfo battle_info = 9; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -126,7 +126,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 4; + * optional .SceneBattleInfo battle_info = 9; * @return this */ public SceneCastSkillScRsp clearBattleInfo() { @@ -136,7 +136,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 4; + * optional .SceneBattleInfo battle_info = 9; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -150,7 +150,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 4; + * optional .SceneBattleInfo battle_info = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 4; + * optional .SceneBattleInfo battle_info = 9; * @param value the battleInfo to set * @return this */ @@ -247,15 +247,15 @@ public final class SceneCastSkillScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(attackedGroupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 74); output.writeMessageNoTag(battleInfo); } } @@ -282,25 +282,25 @@ public final class SceneCastSkillScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 88: { // attackedGroupId attackedGroupId = 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 != 34) { + if (tag != 74) { break; } } - case 34: { + case 74: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityGroupInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityGroupInfoOuterClass.java index 12c8e68..809134a 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 = 1; + * optional uint32 state = 2; */ private int state; /** - * optional uint32 group_id = 9; + * optional uint32 group_id = 3; */ private int groupId; /** - * repeated .SceneEntityInfo entity_list = 5; + * repeated .SceneEntityInfo entity_list = 13; */ private final RepeatedMessage entityList = RepeatedMessage.newEmptyInstance(SceneEntityInfoOuterClass.SceneEntityInfo.getFactory()); @@ -45,7 +45,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 1; + * optional uint32 state = 2; * @return whether the state field is set */ public boolean hasState() { @@ -53,7 +53,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 1; + * optional uint32 state = 2; * @return this */ public SceneEntityGroupInfo clearState() { @@ -63,7 +63,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 1; + * optional uint32 state = 2; * @return the state */ public int getState() { @@ -71,7 +71,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 1; + * optional uint32 state = 2; * @param value the state to set * @return this */ @@ -82,7 +82,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 9; + * optional uint32 group_id = 3; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -90,7 +90,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 9; + * optional uint32 group_id = 3; * @return this */ public SceneEntityGroupInfo clearGroupId() { @@ -100,7 +100,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 9; + * optional uint32 group_id = 3; * @return the groupId */ public int getGroupId() { @@ -108,7 +108,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 9; + * optional uint32 group_id = 3; * @param value the groupId to set * @return this */ @@ -119,7 +119,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 5; + * repeated .SceneEntityInfo entity_list = 13; * @return whether the entityList field is set */ public boolean hasEntityList() { @@ -127,7 +127,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 5; + * repeated .SceneEntityInfo entity_list = 13; * @return this */ public SceneEntityGroupInfo clearEntityList() { @@ -137,7 +137,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 5; + * repeated .SceneEntityInfo entity_list = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 5; + * repeated .SceneEntityInfo entity_list = 13; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 5; + * repeated .SceneEntityInfo entity_list = 13; * @param value the entityList to add * @return this */ @@ -177,7 +177,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 5; + * repeated .SceneEntityInfo entity_list = 13; * @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) 8); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < entityList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 106); output.writeMessageNoTag(entityList.get(i)); } } @@ -297,25 +297,25 @@ public final class SceneEntityGroupInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 16: { // state state = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 24) { break; } } - case 72: { + case 24: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 106) { break; } } - case 42: { + case 106: { // 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 5813786..d509eca 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java @@ -18,50 +18,50 @@ public final class SceneEntityInfoOuterClass { public static final class SceneEntityInfo extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 inst_id = 3; - */ - private int instId; - /** * optional uint32 entity_id = 4; */ private int entityId; /** - * optional uint32 group_id = 9; + * optional uint32 group_id = 10; */ private int groupId; + /** + * optional uint32 inst_id = 15; + */ + private int instId; + + /** + * optional .SceneNpcInfo npc = 1; + */ + private final SceneNpcInfoOuterClass.SceneNpcInfo npc = SceneNpcInfoOuterClass.SceneNpcInfo.newInstance(); + + /** + * optional .MotionInfo motion = 5; + */ + private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); + + /** + * optional .SceneActorInfo actor = 8; + */ + private final SceneActorInfoOuterClass.SceneActorInfo actor = SceneActorInfoOuterClass.SceneActorInfo.newInstance(); + + /** + * optional .SceneNpcMonsterInfo npc_monster = 11; + */ + private final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo npcMonster = SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo.newInstance(); + /** * 
      * SceneSummonUnitInfo summon_unit = 12;
      *
* - * optional .SceneNpcInfo npc = 1; - */ - private final SceneNpcInfoOuterClass.SceneNpcInfo npc = SceneNpcInfoOuterClass.SceneNpcInfo.newInstance(); - - /** - * optional .MotionInfo motion = 2; - */ - private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); - - /** - * optional .ScenePropInfo prop = 5; + * optional .ScenePropInfo prop = 13; */ private final ScenePropInfoOuterClass.ScenePropInfo prop = ScenePropInfoOuterClass.ScenePropInfo.newInstance(); - /** - * optional .SceneNpcMonsterInfo npc_monster = 10; - */ - private final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo npcMonster = SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo.newInstance(); - - /** - * optional .SceneActorInfo actor = 11; - */ - private final SceneActorInfoOuterClass.SceneActorInfo actor = SceneActorInfoOuterClass.SceneActorInfo.newInstance(); - private SceneEntityInfo() { } @@ -79,88 +79,51 @@ public final class SceneEntityInfoOuterClass { public SceneEntityInfo clearEntityCase() { if (hasEntityCase()) { clearNpc(); - clearProp(); - clearNpcMonster(); clearActor(); + clearNpcMonster(); + clearProp(); } return this; } private void clearEntityCaseOtherNpc() { if ((((bitField0_ & 0x0000000e)) != 0)) { - clearProp(); - clearNpcMonster(); clearActor(); + clearNpcMonster(); + clearProp(); } } - private void clearEntityCaseOtherProp() { + private void clearEntityCaseOtherActor() { if ((((bitField0_ & 0x0000000d)) != 0)) { clearNpc(); clearNpcMonster(); - clearActor(); + clearProp(); } } private void clearEntityCaseOtherNpcMonster() { if ((((bitField0_ & 0x0000000b)) != 0)) { clearNpc(); - clearProp(); clearActor(); + clearProp(); } } - private void clearEntityCaseOtherActor() { + private void clearEntityCaseOtherProp() { if ((((bitField0_ & 0x00000007)) != 0)) { clearNpc(); - clearProp(); + clearActor(); clearNpcMonster(); } } - /** - * optional uint32 inst_id = 3; - * @return whether the instId field is set - */ - public boolean hasInstId() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 inst_id = 3; - * @return this - */ - public SceneEntityInfo clearInstId() { - bitField0_ &= ~0x00000010; - instId = 0; - return this; - } - - /** - * optional uint32 inst_id = 3; - * @return the instId - */ - public int getInstId() { - return instId; - } - - /** - * optional uint32 inst_id = 3; - * @param value the instId to set - * @return this - */ - public SceneEntityInfo setInstId(final int value) { - bitField0_ |= 0x00000010; - instId = value; - return this; - } - /** * optional uint32 entity_id = 4; * @return whether the entityId field is set */ public boolean hasEntityId() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000010) != 0; } /** @@ -168,7 +131,7 @@ public final class SceneEntityInfoOuterClass { * @return this */ public SceneEntityInfo clearEntityId() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; entityId = 0; return this; } @@ -187,31 +150,31 @@ public final class SceneEntityInfoOuterClass { * @return this */ public SceneEntityInfo setEntityId(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; entityId = value; return this; } /** - * optional uint32 group_id = 9; + * optional uint32 group_id = 10; * @return whether the groupId field is set */ public boolean hasGroupId() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 group_id = 9; + * optional uint32 group_id = 10; * @return this */ public SceneEntityInfo clearGroupId() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000020; groupId = 0; return this; } /** - * optional uint32 group_id = 9; + * optional uint32 group_id = 10; * @return the groupId */ public int getGroupId() { @@ -219,21 +182,54 @@ public final class SceneEntityInfoOuterClass { } /** - * optional uint32 group_id = 9; + * optional uint32 group_id = 10; * @param value the groupId to set * @return this */ public SceneEntityInfo setGroupId(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; groupId = value; return this; } /** - * 
-     * SceneSummonUnitInfo summon_unit = 12;
-     *
- * + * optional uint32 inst_id = 15; + * @return whether the instId field is set + */ + public boolean hasInstId() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional uint32 inst_id = 15; + * @return this + */ + public SceneEntityInfo clearInstId() { + bitField0_ &= ~0x00000040; + instId = 0; + return this; + } + + /** + * optional uint32 inst_id = 15; + * @return the instId + */ + public int getInstId() { + return instId; + } + + /** + * optional uint32 inst_id = 15; + * @param value the instId to set + * @return this + */ + public SceneEntityInfo setInstId(final int value) { + bitField0_ |= 0x00000040; + instId = value; + return this; + } + + /** * optional .SceneNpcInfo npc = 1; * @return whether the npc field is set */ @@ -242,10 +238,6 @@ public final class SceneEntityInfoOuterClass { } /** - * 
-     * SceneSummonUnitInfo summon_unit = 12;
-     *
- * * optional .SceneNpcInfo npc = 1; * @return this */ @@ -256,10 +248,6 @@ public final class SceneEntityInfoOuterClass { } /** - * 
-     * SceneSummonUnitInfo summon_unit = 12;
-     *
- * * optional .SceneNpcInfo npc = 1; * * This method returns the internal storage object without modifying any has state. @@ -274,10 +262,6 @@ public final class SceneEntityInfoOuterClass { } /** - * 
-     * SceneSummonUnitInfo summon_unit = 12;
-     *
- * * optional .SceneNpcInfo npc = 1; * * This method returns the internal storage object and sets the corresponding @@ -293,10 +277,6 @@ public final class SceneEntityInfoOuterClass { } /** - * 
-     * SceneSummonUnitInfo summon_unit = 12;
-     *
- * * optional .SceneNpcInfo npc = 1; * @param value the npc to set * @return this @@ -309,7 +289,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .MotionInfo motion = 2; + * optional .MotionInfo motion = 5; * @return whether the motion field is set */ public boolean hasMotion() { @@ -317,7 +297,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .MotionInfo motion = 2; + * optional .MotionInfo motion = 5; * @return this */ public SceneEntityInfo clearMotion() { @@ -327,7 +307,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .MotionInfo motion = 2; + * optional .MotionInfo motion = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -341,7 +321,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .MotionInfo motion = 2; + * optional .MotionInfo motion = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -355,7 +335,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .MotionInfo motion = 2; + * optional .MotionInfo motion = 5; * @param value the motion to set * @return this */ @@ -366,39 +346,39 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .ScenePropInfo prop = 5; - * @return whether the prop field is set + * optional .SceneActorInfo actor = 8; + * @return whether the actor field is set */ - public boolean hasProp() { + public boolean hasActor() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .ScenePropInfo prop = 5; + * optional .SceneActorInfo actor = 8; * @return this */ - public SceneEntityInfo clearProp() { + public SceneEntityInfo clearActor() { bitField0_ &= ~0x00000002; - prop.clear(); + actor.clear(); return this; } /** - * optional .ScenePropInfo prop = 5; + * optional .SceneActorInfo actor = 8; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableProp()} if you want to modify it. + * Use {@link #getMutableActor()} if you want to modify it. * * @return internal storage object for reading */ - public ScenePropInfoOuterClass.ScenePropInfo getProp() { - return prop; + public SceneActorInfoOuterClass.SceneActorInfo getActor() { + return actor; } /** - * optional .ScenePropInfo prop = 5; + * optional .SceneActorInfo actor = 8; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -406,26 +386,26 @@ public final class SceneEntityInfoOuterClass { * * @return internal storage object for modifications */ - public ScenePropInfoOuterClass.ScenePropInfo getMutableProp() { - clearEntityCaseOtherProp(); + public SceneActorInfoOuterClass.SceneActorInfo getMutableActor() { + clearEntityCaseOtherActor(); bitField0_ |= 0x00000002; - return prop; + return actor; } /** - * optional .ScenePropInfo prop = 5; - * @param value the prop to set + * optional .SceneActorInfo actor = 8; + * @param value the actor to set * @return this */ - public SceneEntityInfo setProp(final ScenePropInfoOuterClass.ScenePropInfo value) { - clearEntityCaseOtherProp(); + public SceneEntityInfo setActor(final SceneActorInfoOuterClass.SceneActorInfo value) { + clearEntityCaseOtherActor(); bitField0_ |= 0x00000002; - prop.copyFrom(value); + actor.copyFrom(value); return this; } /** - * optional .SceneNpcMonsterInfo npc_monster = 10; + * optional .SceneNpcMonsterInfo npc_monster = 11; * @return whether the npcMonster field is set */ public boolean hasNpcMonster() { @@ -433,7 +413,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneNpcMonsterInfo npc_monster = 10; + * optional .SceneNpcMonsterInfo npc_monster = 11; * @return this */ public SceneEntityInfo clearNpcMonster() { @@ -443,7 +423,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneNpcMonsterInfo npc_monster = 10; + * optional .SceneNpcMonsterInfo npc_monster = 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 +437,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneNpcMonsterInfo npc_monster = 10; + * optional .SceneNpcMonsterInfo npc_monster = 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 @@ -472,7 +452,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneNpcMonsterInfo npc_monster = 10; + * optional .SceneNpcMonsterInfo npc_monster = 11; * @param value the npcMonster to set * @return this */ @@ -485,39 +465,55 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneActorInfo actor = 11; - * @return whether the actor field is set + * 
+     * SceneSummonUnitInfo summon_unit = 12;
+     *
+ * + * optional .ScenePropInfo prop = 13; + * @return whether the prop field is set */ - public boolean hasActor() { + public boolean hasProp() { return (bitField0_ & 0x00000008) != 0; } /** - * optional .SceneActorInfo actor = 11; + * 
+     * SceneSummonUnitInfo summon_unit = 12;
+     *
+ * + * optional .ScenePropInfo prop = 13; * @return this */ - public SceneEntityInfo clearActor() { + public SceneEntityInfo clearProp() { bitField0_ &= ~0x00000008; - actor.clear(); + prop.clear(); return this; } /** - * optional .SceneActorInfo actor = 11; + * 
+     * SceneSummonUnitInfo summon_unit = 12;
+     *
+ * + * optional .ScenePropInfo prop = 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. + * Use {@link #getMutableProp()} if you want to modify it. * * @return internal storage object for reading */ - public SceneActorInfoOuterClass.SceneActorInfo getActor() { - return actor; + public ScenePropInfoOuterClass.ScenePropInfo getProp() { + return prop; } /** - * optional .SceneActorInfo actor = 11; + * 
+     * SceneSummonUnitInfo summon_unit = 12;
+     *
+ * + * optional .ScenePropInfo prop = 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 @@ -525,21 +521,25 @@ public final class SceneEntityInfoOuterClass { * * @return internal storage object for modifications */ - public SceneActorInfoOuterClass.SceneActorInfo getMutableActor() { - clearEntityCaseOtherActor(); + public ScenePropInfoOuterClass.ScenePropInfo getMutableProp() { + clearEntityCaseOtherProp(); bitField0_ |= 0x00000008; - return actor; + return prop; } /** - * optional .SceneActorInfo actor = 11; - * @param value the actor to set + * 
+     * SceneSummonUnitInfo summon_unit = 12;
+     *
+ * + * optional .ScenePropInfo prop = 13; + * @param value the prop to set * @return this */ - public SceneEntityInfo setActor(final SceneActorInfoOuterClass.SceneActorInfo value) { - clearEntityCaseOtherActor(); + public SceneEntityInfo setProp(final ScenePropInfoOuterClass.ScenePropInfo value) { + clearEntityCaseOtherProp(); bitField0_ |= 0x00000008; - actor.copyFrom(value); + prop.copyFrom(value); return this; } @@ -548,14 +548,14 @@ public final class SceneEntityInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - instId = other.instId; entityId = other.entityId; groupId = other.groupId; + instId = other.instId; npc.copyFrom(other.npc); motion.copyFrom(other.motion); - prop.copyFrom(other.prop); - npcMonster.copyFrom(other.npcMonster); actor.copyFrom(other.actor); + npcMonster.copyFrom(other.npcMonster); + prop.copyFrom(other.prop); } return this; } @@ -566,29 +566,29 @@ public final class SceneEntityInfoOuterClass { return this; } cachedSize = -1; - if (other.hasInstId()) { - setInstId(other.instId); - } if (other.hasEntityId()) { setEntityId(other.entityId); } if (other.hasGroupId()) { setGroupId(other.groupId); } + if (other.hasInstId()) { + setInstId(other.instId); + } if (other.hasNpc()) { getMutableNpc().mergeFrom(other.npc); } if (other.hasMotion()) { getMutableMotion().mergeFrom(other.motion); } - if (other.hasProp()) { - getMutableProp().mergeFrom(other.prop); + if (other.hasActor()) { + getMutableActor().mergeFrom(other.actor); } if (other.hasNpcMonster()) { getMutableNpcMonster().mergeFrom(other.npcMonster); } - if (other.hasActor()) { - getMutableActor().mergeFrom(other.actor); + if (other.hasProp()) { + getMutableProp().mergeFrom(other.prop); } return this; } @@ -600,14 +600,14 @@ public final class SceneEntityInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - instId = 0; entityId = 0; groupId = 0; + instId = 0; npc.clear(); motion.clear(); - prop.clear(); - npcMonster.clear(); actor.clear(); + npcMonster.clear(); + prop.clear(); return this; } @@ -620,9 +620,9 @@ public final class SceneEntityInfoOuterClass { bitField0_ = 0; npc.clearQuick(); motion.clearQuick(); - prop.clearQuick(); - npcMonster.clearQuick(); actor.clearQuick(); + npcMonster.clearQuick(); + prop.clearQuick(); return this; } @@ -636,49 +636,49 @@ public final class SceneEntityInfoOuterClass { } SceneEntityInfo other = (SceneEntityInfo) o; return bitField0_ == other.bitField0_ - && (!hasInstId() || instId == other.instId) && (!hasEntityId() || entityId == other.entityId) && (!hasGroupId() || groupId == other.groupId) + && (!hasInstId() || instId == other.instId) && (!hasNpc() || npc.equals(other.npc)) && (!hasMotion() || motion.equals(other.motion)) - && (!hasProp() || prop.equals(other.prop)) + && (!hasActor() || actor.equals(other.actor)) && (!hasNpcMonster() || npcMonster.equals(other.npcMonster)) - && (!hasActor() || actor.equals(other.actor)); + && (!hasProp() || prop.equals(other.prop)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(instId); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 32); output.writeUInt32NoTag(entityId); } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 72); + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 80); output.writeUInt32NoTag(groupId); } + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(instId); + } if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 10); output.writeMessageNoTag(npc); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 42); output.writeMessageNoTag(motion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(prop); + output.writeRawByte((byte) 66); + output.writeMessageNoTag(actor); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 90); output.writeMessageNoTag(npcMonster); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(actor); + output.writeRawByte((byte) 106); + output.writeMessageNoTag(prop); } } @@ -686,14 +686,14 @@ public final class SceneEntityInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(instId); - } - if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } + if ((bitField0_ & 0x00000040) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(instId); + } if ((bitField0_ & 0x00000001) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(npc); } @@ -701,13 +701,13 @@ public final class SceneEntityInfoOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(motion); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(prop); + size += 1 + ProtoSink.computeMessageSizeNoTag(actor); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(npcMonster); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(actor); + size += 1 + ProtoSink.computeMessageSizeNoTag(prop); } return size; } @@ -719,27 +719,27 @@ public final class SceneEntityInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // instId - instId = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 32) { - break; - } - } case 32: { // entityId entityId = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 72) { + if (tag != 80) { break; } } - case 72: { + case 80: { // groupId groupId = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // instId + instId = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 10) { @@ -752,43 +752,43 @@ public final class SceneEntityInfoOuterClass { input.readMessage(npc); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { - break; - } - } - case 18: { - // motion - input.readMessage(motion); - bitField0_ |= 0x00000080; - tag = input.readTag(); if (tag != 42) { break; } } case 42: { - // prop - clearEntityCaseOtherProp(); - input.readMessage(prop); - bitField0_ |= 0x00000002; + // motion + input.readMessage(motion); + bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 82) { + if (tag != 66) { break; } } - case 82: { - // npcMonster - clearEntityCaseOtherNpcMonster(); - input.readMessage(npcMonster); - bitField0_ |= 0x00000004; + case 66: { + // actor + clearEntityCaseOtherActor(); + input.readMessage(actor); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 90) { break; } } case 90: { - // actor - clearEntityCaseOtherActor(); - input.readMessage(actor); + // npcMonster + clearEntityCaseOtherNpcMonster(); + input.readMessage(npcMonster); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { + // prop + clearEntityCaseOtherProp(); + input.readMessage(prop); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -813,14 +813,14 @@ public final class SceneEntityInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.instId, instId); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.entityId, entityId); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.groupId, groupId); } + if ((bitField0_ & 0x00000040) != 0) { + output.writeUInt32(FieldNames.instId, instId); + } if ((bitField0_ & 0x00000001) != 0) { output.writeMessage(FieldNames.npc, npc); } @@ -828,13 +828,13 @@ public final class SceneEntityInfoOuterClass { output.writeMessage(FieldNames.motion, motion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.prop, prop); + output.writeMessage(FieldNames.actor, actor); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.npcMonster, npcMonster); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.actor, actor); + output.writeMessage(FieldNames.prop, prop); } output.endObject(); } @@ -846,24 +846,12 @@ public final class SceneEntityInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1183779327: - case 1957567924: { - if (input.isAtField(FieldNames.instId)) { - if (!input.trySkipNullValue()) { - instId = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } case -2102099874: case -740565257: { if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { entityId = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -875,6 +863,18 @@ public final class SceneEntityInfoOuterClass { if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { groupId = input.readUInt32(); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1183779327: + case 1957567924: { + if (input.isAtField(FieldNames.instId)) { + if (!input.trySkipNullValue()) { + instId = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -905,11 +905,11 @@ public final class SceneEntityInfoOuterClass { } break; } - case 3449699: { - if (input.isAtField(FieldNames.prop)) { + case 92645877: { + if (input.isAtField(FieldNames.actor)) { if (!input.trySkipNullValue()) { - clearEntityCaseOtherProp(); - input.readMessage(prop); + clearEntityCaseOtherActor(); + input.readMessage(actor); bitField0_ |= 0x00000002; } } else { @@ -930,11 +930,11 @@ public final class SceneEntityInfoOuterClass { } break; } - case 92645877: { - if (input.isAtField(FieldNames.actor)) { + case 3449699: { + if (input.isAtField(FieldNames.prop)) { if (!input.trySkipNullValue()) { - clearEntityCaseOtherActor(); - input.readMessage(actor); + clearEntityCaseOtherProp(); + input.readMessage(prop); bitField0_ |= 0x00000008; } } else { @@ -995,21 +995,21 @@ public final class SceneEntityInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName instId = FieldName.forField("instId", "inst_id"); - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName instId = FieldName.forField("instId", "inst_id"); + static final FieldName npc = FieldName.forField("npc"); static final FieldName motion = FieldName.forField("motion"); - static final FieldName prop = FieldName.forField("prop"); + static final FieldName actor = FieldName.forField("actor"); static final FieldName npcMonster = FieldName.forField("npcMonster", "npc_monster"); - static final FieldName actor = FieldName.forField("actor"); + static final FieldName prop = FieldName.forField("prop"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java index e34f296..8302b8c 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java @@ -20,17 +20,12 @@ public final class SceneEntityMoveCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 ECMCBPIJPMF = 10; - */ - private long eCMCBPIJPMF; - - /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 10; */ private int entryId; /** - * repeated .EntityMotion entity_motion_list = 5; + * repeated .EntityMotion entity_motion_list = 11; */ private final RepeatedMessage entityMotionList = RepeatedMessage.newEmptyInstance(EntityMotionOuterClass.EntityMotion.getFactory()); @@ -45,62 +40,25 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * optional uint64 ECMCBPIJPMF = 10; - * @return whether the eCMCBPIJPMF field is set + * optional uint32 entry_id = 10; + * @return whether the entryId field is set */ - public boolean hasECMCBPIJPMF() { + public boolean hasEntryId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint64 ECMCBPIJPMF = 10; - * @return this - */ - public SceneEntityMoveCsReq clearECMCBPIJPMF() { - bitField0_ &= ~0x00000001; - eCMCBPIJPMF = 0L; - return this; - } - - /** - * optional uint64 ECMCBPIJPMF = 10; - * @return the eCMCBPIJPMF - */ - public long getECMCBPIJPMF() { - return eCMCBPIJPMF; - } - - /** - * optional uint64 ECMCBPIJPMF = 10; - * @param value the eCMCBPIJPMF to set - * @return this - */ - public SceneEntityMoveCsReq setECMCBPIJPMF(final long value) { - bitField0_ |= 0x00000001; - eCMCBPIJPMF = value; - return this; - } - - /** - * optional uint32 entry_id = 9; - * @return whether the entryId field is set - */ - public boolean hasEntryId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 10; * @return this */ public SceneEntityMoveCsReq clearEntryId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; entryId = 0; return this; } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 10; * @return the entryId */ public int getEntryId() { @@ -108,36 +66,36 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 10; * @param value the entryId to set * @return this */ public SceneEntityMoveCsReq setEntryId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; entryId = value; return this; } /** - * repeated .EntityMotion entity_motion_list = 5; + * repeated .EntityMotion entity_motion_list = 11; * @return whether the entityMotionList field is set */ public boolean hasEntityMotionList() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * repeated .EntityMotion entity_motion_list = 5; + * repeated .EntityMotion entity_motion_list = 11; * @return this */ public SceneEntityMoveCsReq clearEntityMotionList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; entityMotionList.clear(); return this; } /** - * repeated .EntityMotion entity_motion_list = 5; + * repeated .EntityMotion entity_motion_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. @@ -151,7 +109,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 5; + * repeated .EntityMotion entity_motion_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 @@ -160,30 +118,30 @@ public final class SceneEntityMoveCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableEntityMotionList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return entityMotionList; } /** - * repeated .EntityMotion entity_motion_list = 5; + * repeated .EntityMotion entity_motion_list = 11; * @param value the entityMotionList to add * @return this */ public SceneEntityMoveCsReq addEntityMotionList( final EntityMotionOuterClass.EntityMotion value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; entityMotionList.add(value); return this; } /** - * repeated .EntityMotion entity_motion_list = 5; + * repeated .EntityMotion entity_motion_list = 11; * @param values the entityMotionList to add * @return this */ public SceneEntityMoveCsReq addAllEntityMotionList( final EntityMotionOuterClass.EntityMotion... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; entityMotionList.addAll(values); return this; } @@ -193,7 +151,6 @@ public final class SceneEntityMoveCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - eCMCBPIJPMF = other.eCMCBPIJPMF; entryId = other.entryId; entityMotionList.copyFrom(other.entityMotionList); } @@ -206,9 +163,6 @@ public final class SceneEntityMoveCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasECMCBPIJPMF()) { - setECMCBPIJPMF(other.eCMCBPIJPMF); - } if (other.hasEntryId()) { setEntryId(other.entryId); } @@ -225,7 +179,6 @@ public final class SceneEntityMoveCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - eCMCBPIJPMF = 0L; entryId = 0; entityMotionList.clear(); return this; @@ -252,7 +205,6 @@ public final class SceneEntityMoveCsReqOuterClass { } SceneEntityMoveCsReq other = (SceneEntityMoveCsReq) o; return bitField0_ == other.bitField0_ - && (!hasECMCBPIJPMF() || eCMCBPIJPMF == other.eCMCBPIJPMF) && (!hasEntryId() || entryId == other.entryId) && (!hasEntityMotionList() || entityMotionList.equals(other.entityMotionList)); } @@ -261,15 +213,11 @@ public final class SceneEntityMoveCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 80); - output.writeUInt64NoTag(eCMCBPIJPMF); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); output.writeUInt32NoTag(entryId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < entityMotionList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 90); output.writeMessageNoTag(entityMotionList.get(i)); } } @@ -279,12 +227,9 @@ public final class SceneEntityMoveCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(eCMCBPIJPMF); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += (1 * entityMotionList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityMotionList); } return size; @@ -298,27 +243,18 @@ public final class SceneEntityMoveCsReqOuterClass { while (true) { switch (tag) { case 80: { - // eCMCBPIJPMF - eCMCBPIJPMF = input.readUInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { // entryId entryId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 90) { break; } } - case 42: { + case 90: { // entityMotionList tag = input.readRepeatedMessage(entityMotionList, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; if (tag != 0) { break; } @@ -341,12 +277,9 @@ public final class SceneEntityMoveCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt64(FieldNames.eCMCBPIJPMF, eCMCBPIJPMF); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.entryId, entryId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedMessage(FieldNames.entityMotionList, entityMotionList); } output.endObject(); @@ -359,23 +292,12 @@ public final class SceneEntityMoveCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 157773926: { - if (input.isAtField(FieldNames.eCMCBPIJPMF)) { - if (!input.trySkipNullValue()) { - eCMCBPIJPMF = input.readUInt64(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -1591558867: case -2093663224: { if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { entryId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -387,7 +309,7 @@ public final class SceneEntityMoveCsReqOuterClass { if (input.isAtField(FieldNames.entityMotionList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(entityMotionList); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -447,8 +369,6 @@ public final class SceneEntityMoveCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName eCMCBPIJPMF = FieldName.forField("ECMCBPIJPMF"); - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); static final FieldName entityMotionList = FieldName.forField("entityMotionList", "entity_motion_list"); diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java index aa94a60..5987a35 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 entity_id = 3; + * optional uint32 entity_id = 5; */ private int entityId; /** - * optional uint32 ADMBBNBNIBK = 5; + * optional uint32 client_pos_version = 9; */ - private int aDMBBNBNIBK; + private int clientPosVersion; /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 14; */ private int entryId; /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 6; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -49,7 +49,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entity_id = 3; + * optional uint32 entity_id = 5; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -57,7 +57,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entity_id = 3; + * optional uint32 entity_id = 5; * @return this */ public SceneEntityMoveScNotify clearEntityId() { @@ -67,7 +67,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entity_id = 3; + * optional uint32 entity_id = 5; * @return the entityId */ public int getEntityId() { @@ -75,7 +75,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entity_id = 3; + * optional uint32 entity_id = 5; * @param value the entityId to set * @return this */ @@ -86,44 +86,44 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 ADMBBNBNIBK = 5; - * @return whether the aDMBBNBNIBK field is set + * optional uint32 client_pos_version = 9; + * @return whether the clientPosVersion field is set */ - public boolean hasADMBBNBNIBK() { + public boolean hasClientPosVersion() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 ADMBBNBNIBK = 5; + * optional uint32 client_pos_version = 9; * @return this */ - public SceneEntityMoveScNotify clearADMBBNBNIBK() { + public SceneEntityMoveScNotify clearClientPosVersion() { bitField0_ &= ~0x00000002; - aDMBBNBNIBK = 0; + clientPosVersion = 0; return this; } /** - * optional uint32 ADMBBNBNIBK = 5; - * @return the aDMBBNBNIBK + * optional uint32 client_pos_version = 9; + * @return the clientPosVersion */ - public int getADMBBNBNIBK() { - return aDMBBNBNIBK; + public int getClientPosVersion() { + return clientPosVersion; } /** - * optional uint32 ADMBBNBNIBK = 5; - * @param value the aDMBBNBNIBK to set + * optional uint32 client_pos_version = 9; + * @param value the clientPosVersion to set * @return this */ - public SceneEntityMoveScNotify setADMBBNBNIBK(final int value) { + public SceneEntityMoveScNotify setClientPosVersion(final int value) { bitField0_ |= 0x00000002; - aDMBBNBNIBK = value; + clientPosVersion = value; return this; } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 14; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -131,7 +131,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 14; * @return this */ public SceneEntityMoveScNotify clearEntryId() { @@ -141,7 +141,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 14; * @return the entryId */ public int getEntryId() { @@ -149,7 +149,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 14; * @param value the entryId to set * @return this */ @@ -160,7 +160,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 6; * @return whether the motion field is set */ public boolean hasMotion() { @@ -168,7 +168,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 6; * @return this */ public SceneEntityMoveScNotify clearMotion() { @@ -178,7 +178,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 12; + * 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. @@ -192,7 +192,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 12; + * 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 @@ -206,7 +206,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 6; * @param value the motion to set * @return this */ @@ -222,7 +222,7 @@ public final class SceneEntityMoveScNotifyOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; entityId = other.entityId; - aDMBBNBNIBK = other.aDMBBNBNIBK; + clientPosVersion = other.clientPosVersion; entryId = other.entryId; motion.copyFrom(other.motion); } @@ -238,8 +238,8 @@ public final class SceneEntityMoveScNotifyOuterClass { if (other.hasEntityId()) { setEntityId(other.entityId); } - if (other.hasADMBBNBNIBK()) { - setADMBBNBNIBK(other.aDMBBNBNIBK); + if (other.hasClientPosVersion()) { + setClientPosVersion(other.clientPosVersion); } if (other.hasEntryId()) { setEntryId(other.entryId); @@ -258,7 +258,7 @@ public final class SceneEntityMoveScNotifyOuterClass { cachedSize = -1; bitField0_ = 0; entityId = 0; - aDMBBNBNIBK = 0; + clientPosVersion = 0; entryId = 0; motion.clear(); return this; @@ -286,7 +286,7 @@ public final class SceneEntityMoveScNotifyOuterClass { SceneEntityMoveScNotify other = (SceneEntityMoveScNotify) o; return bitField0_ == other.bitField0_ && (!hasEntityId() || entityId == other.entityId) - && (!hasADMBBNBNIBK() || aDMBBNBNIBK == other.aDMBBNBNIBK) + && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) && (!hasEntryId() || entryId == other.entryId) && (!hasMotion() || motion.equals(other.motion)); } @@ -294,19 +294,19 @@ public final class SceneEntityMoveScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(aDMBBNBNIBK); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 50); output.writeMessageNoTag(motion); } } @@ -318,7 +318,7 @@ public final class SceneEntityMoveScNotifyOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(aDMBBNBNIBK); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); @@ -336,34 +336,34 @@ public final class SceneEntityMoveScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 40: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // aDMBBNBNIBK - aDMBBNBNIBK = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 72) { break; } } case 72: { + // clientPosVersion + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 98) { + if (tag != 50) { break; } } - case 98: { + case 50: { // motion input.readMessage(motion); bitField0_ |= 0x00000008; @@ -393,7 +393,7 @@ public final class SceneEntityMoveScNotifyOuterClass { output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.aDMBBNBNIBK, aDMBBNBNIBK); + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.entryId, entryId); @@ -423,10 +423,11 @@ public final class SceneEntityMoveScNotifyOuterClass { } break; } - case 1047677378: { - if (input.isAtField(FieldNames.aDMBBNBNIBK)) { + case 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { if (!input.trySkipNullValue()) { - aDMBBNBNIBK = input.readUInt32(); + clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -512,7 +513,7 @@ public final class SceneEntityMoveScNotifyOuterClass { static class FieldNames { static final FieldName entityId = FieldName.forField("entityId", "entity_id"); - static final FieldName aDMBBNBNIBK = FieldName.forField("ADMBBNBNIBK"); + static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); static final FieldName entryId = FieldName.forField("entryId", "entry_id"); diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java index 6f77777..7d6cc09 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java @@ -19,17 +19,17 @@ public final class SceneEntityRefreshInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 LFEHNPMNFMG = 2; + * optional uint32 LFEHNPMNFMG = 3; */ private int lFEHNPMNFMG; /** - * optional uint32 del_entity = 15; + * optional uint32 del_entity = 9; */ private int delEntity; /** - * optional .SceneEntityInfo add_entity = 13; + * optional .SceneEntityInfo add_entity = 6; */ private final SceneEntityInfoOuterClass.SceneEntityInfo addEntity = SceneEntityInfoOuterClass.SceneEntityInfo.newInstance(); @@ -78,7 +78,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 LFEHNPMNFMG = 2; + * optional uint32 LFEHNPMNFMG = 3; * @return whether the lFEHNPMNFMG field is set */ public boolean hasLFEHNPMNFMG() { @@ -86,7 +86,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 LFEHNPMNFMG = 2; + * optional uint32 LFEHNPMNFMG = 3; * @return this */ public SceneEntityRefreshInfo clearLFEHNPMNFMG() { @@ -96,7 +96,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 LFEHNPMNFMG = 2; + * optional uint32 LFEHNPMNFMG = 3; * @return the lFEHNPMNFMG */ public int getLFEHNPMNFMG() { @@ -104,7 +104,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 LFEHNPMNFMG = 2; + * optional uint32 LFEHNPMNFMG = 3; * @param value the lFEHNPMNFMG to set * @return this */ @@ -116,7 +116,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 15; + * optional uint32 del_entity = 9; * @return whether the delEntity field is set */ public boolean hasDelEntity() { @@ -124,7 +124,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 15; + * optional uint32 del_entity = 9; * @return this */ public SceneEntityRefreshInfo clearDelEntity() { @@ -134,7 +134,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 15; + * optional uint32 del_entity = 9; * @return the delEntity */ public int getDelEntity() { @@ -142,7 +142,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 15; + * optional uint32 del_entity = 9; * @param value the delEntity to set * @return this */ @@ -154,7 +154,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 13; + * optional .SceneEntityInfo add_entity = 6; * @return whether the addEntity field is set */ public boolean hasAddEntity() { @@ -162,7 +162,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 13; + * optional .SceneEntityInfo add_entity = 6; * @return this */ public SceneEntityRefreshInfo clearAddEntity() { @@ -172,7 +172,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 13; + * optional .SceneEntityInfo add_entity = 6; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -186,7 +186,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 13; + * optional .SceneEntityInfo add_entity = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -201,7 +201,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 13; + * optional .SceneEntityInfo add_entity = 6; * @param value the addEntity to set * @return this */ @@ -285,15 +285,15 @@ public final class SceneEntityRefreshInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(lFEHNPMNFMG); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(delEntity); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 50); output.writeMessageNoTag(addEntity); } } @@ -320,27 +320,27 @@ public final class SceneEntityRefreshInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 24: { // lFEHNPMNFMG clearUpdateTypeOtherLFEHNPMNFMG(); lFEHNPMNFMG = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 72) { break; } } - case 120: { + case 72: { // delEntity clearUpdateTypeOtherDelEntity(); delEntity = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 106) { + if (tag != 50) { break; } } - case 106: { + case 50: { // addEntity clearUpdateTypeOtherAddEntity(); input.readMessage(addEntity); diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityUpdateScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityUpdateScNotifyOuterClass.java index c8cf03c..20b5533 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityUpdateScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityUpdateScNotifyOuterClass.java @@ -20,10 +20,6 @@ public final class SceneEntityUpdateScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     *  52
-     *
- * * repeated .SceneEntityInfo entity_list = 11; */ private final RepeatedMessage entityList = RepeatedMessage.newEmptyInstance(SceneEntityInfoOuterClass.SceneEntityInfo.getFactory()); @@ -39,10 +35,6 @@ public final class SceneEntityUpdateScNotifyOuterClass { } /** - * 
-     *  52
-     *
- * * repeated .SceneEntityInfo entity_list = 11; * @return whether the entityList field is set */ @@ -51,10 +43,6 @@ public final class SceneEntityUpdateScNotifyOuterClass { } /** - * 
-     *  52
-     *
- * * repeated .SceneEntityInfo entity_list = 11; * @return this */ @@ -65,10 +53,6 @@ public final class SceneEntityUpdateScNotifyOuterClass { } /** - * 
-     *  52
-     *
- * * repeated .SceneEntityInfo entity_list = 11; * * This method returns the internal storage object without modifying any has state. @@ -83,10 +67,6 @@ public final class SceneEntityUpdateScNotifyOuterClass { } /** - * 
-     *  52
-     *
- * * repeated .SceneEntityInfo entity_list = 11; * * This method returns the internal storage object and sets the corresponding @@ -101,10 +81,6 @@ public final class SceneEntityUpdateScNotifyOuterClass { } /** - * 
-     *  52
-     *
- * * repeated .SceneEntityInfo entity_list = 11; * @param value the entityList to add * @return this @@ -117,10 +93,6 @@ public final class SceneEntityUpdateScNotifyOuterClass { } /** - * 
-     *  52
-     *
- * * repeated .SceneEntityInfo entity_list = 11; * @param values the entityList to add * @return this diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java index 8c9c6a0..7a008bf 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java @@ -20,17 +20,17 @@ public final class SceneGroupRefreshInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 state = 7; + * optional uint32 state = 1; */ private int state; /** - * optional uint32 group_id = 11; + * optional uint32 group_id = 12; */ private int groupId; /** - * repeated .SceneEntityRefreshInfo refresh_entity = 9; + * repeated .SceneEntityRefreshInfo refresh_entity = 2; */ private final RepeatedMessage refreshEntity = RepeatedMessage.newEmptyInstance(SceneEntityRefreshInfoOuterClass.SceneEntityRefreshInfo.getFactory()); @@ -45,7 +45,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 state = 7; + * optional uint32 state = 1; * @return whether the state field is set */ public boolean hasState() { @@ -53,7 +53,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 state = 7; + * optional uint32 state = 1; * @return this */ public SceneGroupRefreshInfo clearState() { @@ -63,7 +63,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 state = 7; + * optional uint32 state = 1; * @return the state */ public int getState() { @@ -71,7 +71,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 state = 7; + * optional uint32 state = 1; * @param value the state to set * @return this */ @@ -82,7 +82,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 group_id = 11; + * optional uint32 group_id = 12; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -90,7 +90,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 group_id = 11; + * optional uint32 group_id = 12; * @return this */ public SceneGroupRefreshInfo clearGroupId() { @@ -100,7 +100,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 group_id = 11; + * optional uint32 group_id = 12; * @return the groupId */ public int getGroupId() { @@ -108,7 +108,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 group_id = 11; + * optional uint32 group_id = 12; * @param value the groupId to set * @return this */ @@ -119,7 +119,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 9; + * repeated .SceneEntityRefreshInfo refresh_entity = 2; * @return whether the refreshEntity field is set */ public boolean hasRefreshEntity() { @@ -127,7 +127,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 9; + * repeated .SceneEntityRefreshInfo refresh_entity = 2; * @return this */ public SceneGroupRefreshInfo clearRefreshEntity() { @@ -137,7 +137,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 9; + * repeated .SceneEntityRefreshInfo refresh_entity = 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. @@ -152,7 +152,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 9; + * repeated .SceneEntityRefreshInfo refresh_entity = 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 @@ -167,7 +167,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 9; + * repeated .SceneEntityRefreshInfo refresh_entity = 2; * @param value the refreshEntity to add * @return this */ @@ -179,7 +179,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 9; + * repeated .SceneEntityRefreshInfo refresh_entity = 2; * @param values the refreshEntity to add * @return this */ @@ -262,16 +262,16 @@ public final class SceneGroupRefreshInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < refreshEntity.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 18); output.writeMessageNoTag(refreshEntity.get(i)); } } @@ -299,25 +299,25 @@ public final class SceneGroupRefreshInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 8: { // state state = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { + case 96: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 74) { + if (tag != 18) { break; } } - case 74: { + case 18: { // refreshEntity tag = input.readRepeatedMessage(refreshEntity, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java index e9b5f47..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 = 7; + * 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 = 7; + * 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 = 7; + * repeated .SceneGroupRefreshInfo group_refresh_info = 11; * @return this */ public SceneGroupRefreshScNotify clearGroupRefreshInfo() { @@ -53,7 +53,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 7; + * 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 = 7; + * 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 = 7; + * 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 = 7; + * 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) 58); + 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 58: { + case 90: { // groupRefreshInfo tag = input.readRepeatedMessage(groupRefreshInfo, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java index 723cfb7..777a301 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java @@ -10,9 +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; public final class SceneInfoOuterClass { /** @@ -22,141 +20,50 @@ public final class SceneInfoOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     *  32
-     *
- * - * optional uint32 world_id = 1; - */ - private int worldId; - - /** - * 
-     *  96 EKENODLJHKK
-     *
- * - * optional uint32 client_pos_version = 5; - */ - private int clientPosVersion; - - /** - * 
-     *  36
-     *
- * - * optional uint32 floor_id = 6; - */ - private int floorId; - - /** - * 
-     *  48
-     *
- * - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 1; */ private int planeId; /** - * 
-     *  100 CCECJOJHKEO
-     *
- * - * optional uint32 leader_entity_id = 13; + * optional uint32 world_id = 3; + */ + private int worldId; + + /** + * optional uint32 game_mode_type = 5; + */ + private int gameModeType; + + /** + * optional uint32 leader_entity_id = 8; */ private int leaderEntityId; /** - * 
-     * map KOCFNLDMPHI = 8; // 76
-     *
- * + * optional uint32 floor_id = 12; + */ + private int floorId; + + /** + * optional uint32 client_pos_version = 13; + */ + private int clientPosVersion; + + /** * optional uint32 entry_id = 14; */ private int entryId; /** - * 
-     *  128
-     *
- * - * optional uint32 game_mode_type = 15; - */ - private int gameModeType; - - /** - * 
-     *  60
-     *
- * - * optional .MechanismBarInfo ABDCMNBLEPA = 10; - */ - private final MechanismBarInfoOuterClass.MechanismBarInfo aBDCMNBLEPA = MechanismBarInfoOuterClass.MechanismBarInfo.newInstance(); - - /** - * 
-     *  88
-     *
- * - * repeated uint32 OONDMDFABLJ = 2; - */ - private final RepeatedInt oONDMDFABLJ = RepeatedInt.newEmptyInstance(); - - /** - * 
-     *  40
-     *
- * - * repeated uint32 PLHHEJPGCNP = 12; - */ - private final RepeatedInt pLHHEJPGCNP = RepeatedInt.newEmptyInstance(); - - /** - * 
-     * repeated OLEJDNBFIJI LABPAKNGNNB = 4; // 104
-     * repeated NFDPJPAEOEC OGOFBAICEHD = 1882; // 112
-     *
- * - * repeated .BuffInfo PHBNCDKDJFO = 3; - */ - private final RepeatedMessage pHBNCDKDJFO = RepeatedMessage.newEmptyInstance(BuffInfoOuterClass.BuffInfo.getFactory()); - - /** - * 
-     *  132
-     *
- * - * repeated .EntityBuffInfo LKFHFABMMKJ = 9; - */ - private final RepeatedMessage lKFHFABMMKJ = RepeatedMessage.newEmptyInstance(EntityBuffInfoOuterClass.EntityBuffInfo.getFactory()); - - /** - * 
-     *  52
-     *
- * - * repeated .SceneEntityInfo entity_list = 11; + * repeated .SceneEntityInfo entity_list = 9; */ private final RepeatedMessage entityList = RepeatedMessage.newEmptyInstance(SceneEntityInfoOuterClass.SceneEntityInfo.getFactory()); /** - * 
-     *  68
-     *
- * - * repeated .SceneEntityGroupInfo entity_group_list = 1496; + * repeated .SceneEntityGroupInfo entity_group_list = 1421; */ private final RepeatedMessage entityGroupList = RepeatedMessage.newEmptyInstance(SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo.getFactory()); - /** - * 
-     *  24
-     *
- * - * repeated .SceneInfo.FFHKBOLIGAJEntry FFHKBOLIGAJ = 2028; - */ - private final RepeatedMessage fFHKBOLIGAJ = RepeatedMessage.newEmptyInstance(FFHKBOLIGAJEntry.getFactory()); - private SceneInfo() { } @@ -168,196 +75,25 @@ public final class SceneInfoOuterClass { } /** - * 
-     *  32
-     *
- * - * optional uint32 world_id = 1; - * @return whether the worldId field is set + * optional uint32 plane_id = 1; + * @return whether the planeId field is set */ - public boolean hasWorldId() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000001) != 0; } /** - * 
-     *  32
-     *
- * - * optional uint32 world_id = 1; - * @return this - */ - public SceneInfo clearWorldId() { - bitField0_ &= ~0x00000001; - worldId = 0; - return this; - } - - /** - * 
-     *  32
-     *
- * - * optional uint32 world_id = 1; - * @return the worldId - */ - public int getWorldId() { - return worldId; - } - - /** - * 
-     *  32
-     *
- * - * optional uint32 world_id = 1; - * @param value the worldId to set - * @return this - */ - public SceneInfo setWorldId(final int value) { - bitField0_ |= 0x00000001; - worldId = value; - return this; - } - - /** - * 
-     *  96 EKENODLJHKK
-     *
- * - * optional uint32 client_pos_version = 5; - * @return whether the clientPosVersion field is set - */ - public boolean hasClientPosVersion() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * 
-     *  96 EKENODLJHKK
-     *
- * - * optional uint32 client_pos_version = 5; - * @return this - */ - public SceneInfo clearClientPosVersion() { - bitField0_ &= ~0x00000002; - clientPosVersion = 0; - return this; - } - - /** - * 
-     *  96 EKENODLJHKK
-     *
- * - * optional uint32 client_pos_version = 5; - * @return the clientPosVersion - */ - public int getClientPosVersion() { - return clientPosVersion; - } - - /** - * 
-     *  96 EKENODLJHKK
-     *
- * - * optional uint32 client_pos_version = 5; - * @param value the clientPosVersion to set - * @return this - */ - public SceneInfo setClientPosVersion(final int value) { - bitField0_ |= 0x00000002; - clientPosVersion = value; - return this; - } - - /** - * 
-     *  36
-     *
- * - * optional uint32 floor_id = 6; - * @return whether the floorId field is set - */ - public boolean hasFloorId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * 
-     *  36
-     *
- * - * optional uint32 floor_id = 6; - * @return this - */ - public SceneInfo clearFloorId() { - bitField0_ &= ~0x00000004; - floorId = 0; - return this; - } - - /** - * 
-     *  36
-     *
- * - * optional uint32 floor_id = 6; - * @return the floorId - */ - public int getFloorId() { - return floorId; - } - - /** - * 
-     *  36
-     *
- * - * optional uint32 floor_id = 6; - * @param value the floorId to set - * @return this - */ - public SceneInfo setFloorId(final int value) { - bitField0_ |= 0x00000004; - floorId = value; - return this; - } - - /** - * 
-     *  48
-     *
- * - * optional uint32 plane_id = 7; - * @return whether the planeId field is set - */ - public boolean hasPlaneId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * 
-     *  48
-     *
- * - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 1; * @return this */ public SceneInfo clearPlaneId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; planeId = 0; return this; } /** - * 
-     *  48
-     *
- * - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 1; * @return the planeId */ public int getPlaneId() { @@ -365,52 +101,110 @@ public final class SceneInfoOuterClass { } /** - * 
-     *  48
-     *
- * - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 1; * @param value the planeId to set * @return this */ public SceneInfo setPlaneId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; planeId = value; return this; } /** - * 
-     *  100 CCECJOJHKEO
-     *
- * - * optional uint32 leader_entity_id = 13; - * @return whether the leaderEntityId field is set + * optional uint32 world_id = 3; + * @return whether the worldId field is set */ - public boolean hasLeaderEntityId() { - return (bitField0_ & 0x00000010) != 0; + public boolean hasWorldId() { + return (bitField0_ & 0x00000002) != 0; } /** - * 
-     *  100 CCECJOJHKEO
-     *
- * - * optional uint32 leader_entity_id = 13; + * optional uint32 world_id = 3; + * @return this + */ + public SceneInfo clearWorldId() { + bitField0_ &= ~0x00000002; + worldId = 0; + return this; + } + + /** + * optional uint32 world_id = 3; + * @return the worldId + */ + public int getWorldId() { + return worldId; + } + + /** + * optional uint32 world_id = 3; + * @param value the worldId to set + * @return this + */ + public SceneInfo setWorldId(final int value) { + bitField0_ |= 0x00000002; + worldId = value; + return this; + } + + /** + * optional uint32 game_mode_type = 5; + * @return whether the gameModeType field is set + */ + public boolean hasGameModeType() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 game_mode_type = 5; + * @return this + */ + public SceneInfo clearGameModeType() { + bitField0_ &= ~0x00000004; + gameModeType = 0; + return this; + } + + /** + * optional uint32 game_mode_type = 5; + * @return the gameModeType + */ + public int getGameModeType() { + return gameModeType; + } + + /** + * optional uint32 game_mode_type = 5; + * @param value the gameModeType to set + * @return this + */ + public SceneInfo setGameModeType(final int value) { + bitField0_ |= 0x00000004; + gameModeType = value; + return this; + } + + /** + * optional uint32 leader_entity_id = 8; + * @return whether the leaderEntityId field is set + */ + public boolean hasLeaderEntityId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 leader_entity_id = 8; * @return this */ public SceneInfo clearLeaderEntityId() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; leaderEntityId = 0; return this; } /** - * 
-     *  100 CCECJOJHKEO
-     *
- * - * optional uint32 leader_entity_id = 13; + * optional uint32 leader_entity_id = 8; * @return the leaderEntityId */ public int getLeaderEntityId() { @@ -418,51 +212,109 @@ public final class SceneInfoOuterClass { } /** - * 
-     *  100 CCECJOJHKEO
-     *
- * - * optional uint32 leader_entity_id = 13; + * optional uint32 leader_entity_id = 8; * @param value the leaderEntityId to set * @return this */ public SceneInfo setLeaderEntityId(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; leaderEntityId = value; return this; } /** - * 
-     * map KOCFNLDMPHI = 8; // 76
-     *
- * - * optional uint32 entry_id = 14; - * @return whether the entryId field is set + * optional uint32 floor_id = 12; + * @return whether the floorId field is set */ - public boolean hasEntryId() { + public boolean hasFloorId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 floor_id = 12; + * @return this + */ + public SceneInfo clearFloorId() { + bitField0_ &= ~0x00000010; + 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 SceneInfo setFloorId(final int value) { + bitField0_ |= 0x00000010; + floorId = value; + return this; + } + + /** + * optional uint32 client_pos_version = 13; + * @return whether the clientPosVersion field is set + */ + public boolean hasClientPosVersion() { return (bitField0_ & 0x00000020) != 0; } /** - * 
-     * map KOCFNLDMPHI = 8; // 76
-     *
- * + * optional uint32 client_pos_version = 13; + * @return this + */ + public SceneInfo clearClientPosVersion() { + bitField0_ &= ~0x00000020; + clientPosVersion = 0; + return this; + } + + /** + * optional uint32 client_pos_version = 13; + * @return the clientPosVersion + */ + public int getClientPosVersion() { + return clientPosVersion; + } + + /** + * optional uint32 client_pos_version = 13; + * @param value the clientPosVersion to set + * @return this + */ + public SceneInfo setClientPosVersion(final int value) { + bitField0_ |= 0x00000020; + clientPosVersion = value; + return this; + } + + /** + * optional uint32 entry_id = 14; + * @return whether the entryId field is set + */ + public boolean hasEntryId() { + return (bitField0_ & 0x00000040) != 0; + } + + /** * optional uint32 entry_id = 14; * @return this */ public SceneInfo clearEntryId() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000040; entryId = 0; return this; } /** - * 
-     * map KOCFNLDMPHI = 8; // 76
-     *
- * * optional uint32 entry_id = 14; * @return the entryId */ @@ -471,556 +323,36 @@ public final class SceneInfoOuterClass { } /** - * 
-     * map KOCFNLDMPHI = 8; // 76
-     *
- * * optional uint32 entry_id = 14; * @param value the entryId to set * @return this */ public SceneInfo setEntryId(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; entryId = value; return this; } /** - * 
-     *  128
-     *
- * - * optional uint32 game_mode_type = 15; - * @return whether the gameModeType field is set + * repeated .SceneEntityInfo entity_list = 9; + * @return whether the entityList field is set */ - public boolean hasGameModeType() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * 
-     *  128
-     *
- * - * optional uint32 game_mode_type = 15; - * @return this - */ - public SceneInfo clearGameModeType() { - bitField0_ &= ~0x00000040; - gameModeType = 0; - return this; - } - - /** - * 
-     *  128
-     *
- * - * optional uint32 game_mode_type = 15; - * @return the gameModeType - */ - public int getGameModeType() { - return gameModeType; - } - - /** - * 
-     *  128
-     *
- * - * optional uint32 game_mode_type = 15; - * @param value the gameModeType to set - * @return this - */ - public SceneInfo setGameModeType(final int value) { - bitField0_ |= 0x00000040; - gameModeType = value; - return this; - } - - /** - * 
-     *  60
-     *
- * - * optional .MechanismBarInfo ABDCMNBLEPA = 10; - * @return whether the aBDCMNBLEPA field is set - */ - public boolean hasABDCMNBLEPA() { + public boolean hasEntityList() { return (bitField0_ & 0x00000080) != 0; } /** - * 
-     *  60
-     *
- * - * optional .MechanismBarInfo ABDCMNBLEPA = 10; - * @return this - */ - public SceneInfo clearABDCMNBLEPA() { - bitField0_ &= ~0x00000080; - aBDCMNBLEPA.clear(); - return this; - } - - /** - * 
-     *  60
-     *
- * - * optional .MechanismBarInfo ABDCMNBLEPA = 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 #getMutableABDCMNBLEPA()} if you want to modify it. - * - * @return internal storage object for reading - */ - public MechanismBarInfoOuterClass.MechanismBarInfo getABDCMNBLEPA() { - return aBDCMNBLEPA; - } - - /** - * 
-     *  60
-     *
- * - * optional .MechanismBarInfo ABDCMNBLEPA = 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 MechanismBarInfoOuterClass.MechanismBarInfo getMutableABDCMNBLEPA() { - bitField0_ |= 0x00000080; - return aBDCMNBLEPA; - } - - /** - * 
-     *  60
-     *
- * - * optional .MechanismBarInfo ABDCMNBLEPA = 10; - * @param value the aBDCMNBLEPA to set - * @return this - */ - public SceneInfo setABDCMNBLEPA(final MechanismBarInfoOuterClass.MechanismBarInfo value) { - bitField0_ |= 0x00000080; - aBDCMNBLEPA.copyFrom(value); - return this; - } - - /** - * 
-     *  88
-     *
- * - * repeated uint32 OONDMDFABLJ = 2; - * @return whether the oONDMDFABLJ field is set - */ - public boolean hasOONDMDFABLJ() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * 
-     *  88
-     *
- * - * repeated uint32 OONDMDFABLJ = 2; - * @return this - */ - public SceneInfo clearOONDMDFABLJ() { - bitField0_ &= ~0x00000100; - oONDMDFABLJ.clear(); - return this; - } - - /** - * 
-     *  88
-     *
- * - * repeated uint32 OONDMDFABLJ = 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 #getMutableOONDMDFABLJ()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getOONDMDFABLJ() { - return oONDMDFABLJ; - } - - /** - * 
-     *  88
-     *
- * - * repeated uint32 OONDMDFABLJ = 2; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableOONDMDFABLJ() { - bitField0_ |= 0x00000100; - return oONDMDFABLJ; - } - - /** - * 
-     *  88
-     *
- * - * repeated uint32 OONDMDFABLJ = 2; - * @param value the oONDMDFABLJ to add - * @return this - */ - public SceneInfo addOONDMDFABLJ(final int value) { - bitField0_ |= 0x00000100; - oONDMDFABLJ.add(value); - return this; - } - - /** - * 
-     *  88
-     *
- * - * repeated uint32 OONDMDFABLJ = 2; - * @param values the oONDMDFABLJ to add - * @return this - */ - public SceneInfo addAllOONDMDFABLJ(final int... values) { - bitField0_ |= 0x00000100; - oONDMDFABLJ.addAll(values); - return this; - } - - /** - * 
-     *  40
-     *
- * - * repeated uint32 PLHHEJPGCNP = 12; - * @return whether the pLHHEJPGCNP field is set - */ - public boolean hasPLHHEJPGCNP() { - return (bitField0_ & 0x00000200) != 0; - } - - /** - * 
-     *  40
-     *
- * - * repeated uint32 PLHHEJPGCNP = 12; - * @return this - */ - public SceneInfo clearPLHHEJPGCNP() { - bitField0_ &= ~0x00000200; - pLHHEJPGCNP.clear(); - return this; - } - - /** - * 
-     *  40
-     *
- * - * repeated uint32 PLHHEJPGCNP = 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 #getMutablePLHHEJPGCNP()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getPLHHEJPGCNP() { - return pLHHEJPGCNP; - } - - /** - * 
-     *  40
-     *
- * - * repeated uint32 PLHHEJPGCNP = 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 getMutablePLHHEJPGCNP() { - bitField0_ |= 0x00000200; - return pLHHEJPGCNP; - } - - /** - * 
-     *  40
-     *
- * - * repeated uint32 PLHHEJPGCNP = 12; - * @param value the pLHHEJPGCNP to add - * @return this - */ - public SceneInfo addPLHHEJPGCNP(final int value) { - bitField0_ |= 0x00000200; - pLHHEJPGCNP.add(value); - return this; - } - - /** - * 
-     *  40
-     *
- * - * repeated uint32 PLHHEJPGCNP = 12; - * @param values the pLHHEJPGCNP to add - * @return this - */ - public SceneInfo addAllPLHHEJPGCNP(final int... values) { - bitField0_ |= 0x00000200; - pLHHEJPGCNP.addAll(values); - return this; - } - - /** - * 
-     * repeated OLEJDNBFIJI LABPAKNGNNB = 4; // 104
-     * repeated NFDPJPAEOEC OGOFBAICEHD = 1882; // 112
-     *
- * - * repeated .BuffInfo PHBNCDKDJFO = 3; - * @return whether the pHBNCDKDJFO field is set - */ - public boolean hasPHBNCDKDJFO() { - return (bitField0_ & 0x00000400) != 0; - } - - /** - * 
-     * repeated OLEJDNBFIJI LABPAKNGNNB = 4; // 104
-     * repeated NFDPJPAEOEC OGOFBAICEHD = 1882; // 112
-     *
- * - * repeated .BuffInfo PHBNCDKDJFO = 3; - * @return this - */ - public SceneInfo clearPHBNCDKDJFO() { - bitField0_ &= ~0x00000400; - pHBNCDKDJFO.clear(); - return this; - } - - /** - * 
-     * repeated OLEJDNBFIJI LABPAKNGNNB = 4; // 104
-     * repeated NFDPJPAEOEC OGOFBAICEHD = 1882; // 112
-     *
- * - * repeated .BuffInfo PHBNCDKDJFO = 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 #getMutablePHBNCDKDJFO()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getPHBNCDKDJFO() { - return pHBNCDKDJFO; - } - - /** - * 
-     * repeated OLEJDNBFIJI LABPAKNGNNB = 4; // 104
-     * repeated NFDPJPAEOEC OGOFBAICEHD = 1882; // 112
-     *
- * - * repeated .BuffInfo PHBNCDKDJFO = 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 getMutablePHBNCDKDJFO() { - bitField0_ |= 0x00000400; - return pHBNCDKDJFO; - } - - /** - * 
-     * repeated OLEJDNBFIJI LABPAKNGNNB = 4; // 104
-     * repeated NFDPJPAEOEC OGOFBAICEHD = 1882; // 112
-     *
- * - * repeated .BuffInfo PHBNCDKDJFO = 3; - * @param value the pHBNCDKDJFO to add - * @return this - */ - public SceneInfo addPHBNCDKDJFO(final BuffInfoOuterClass.BuffInfo value) { - bitField0_ |= 0x00000400; - pHBNCDKDJFO.add(value); - return this; - } - - /** - * 
-     * repeated OLEJDNBFIJI LABPAKNGNNB = 4; // 104
-     * repeated NFDPJPAEOEC OGOFBAICEHD = 1882; // 112
-     *
- * - * repeated .BuffInfo PHBNCDKDJFO = 3; - * @param values the pHBNCDKDJFO to add - * @return this - */ - public SceneInfo addAllPHBNCDKDJFO(final BuffInfoOuterClass.BuffInfo... values) { - bitField0_ |= 0x00000400; - pHBNCDKDJFO.addAll(values); - return this; - } - - /** - * 
-     *  132
-     *
- * - * repeated .EntityBuffInfo LKFHFABMMKJ = 9; - * @return whether the lKFHFABMMKJ field is set - */ - public boolean hasLKFHFABMMKJ() { - return (bitField0_ & 0x00000800) != 0; - } - - /** - * 
-     *  132
-     *
- * - * repeated .EntityBuffInfo LKFHFABMMKJ = 9; - * @return this - */ - public SceneInfo clearLKFHFABMMKJ() { - bitField0_ &= ~0x00000800; - lKFHFABMMKJ.clear(); - return this; - } - - /** - * 
-     *  132
-     *
- * - * repeated .EntityBuffInfo LKFHFABMMKJ = 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 #getMutableLKFHFABMMKJ()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getLKFHFABMMKJ() { - return lKFHFABMMKJ; - } - - /** - * 
-     *  132
-     *
- * - * repeated .EntityBuffInfo LKFHFABMMKJ = 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 getMutableLKFHFABMMKJ() { - bitField0_ |= 0x00000800; - return lKFHFABMMKJ; - } - - /** - * 
-     *  132
-     *
- * - * repeated .EntityBuffInfo LKFHFABMMKJ = 9; - * @param value the lKFHFABMMKJ to add - * @return this - */ - public SceneInfo addLKFHFABMMKJ(final EntityBuffInfoOuterClass.EntityBuffInfo value) { - bitField0_ |= 0x00000800; - lKFHFABMMKJ.add(value); - return this; - } - - /** - * 
-     *  132
-     *
- * - * repeated .EntityBuffInfo LKFHFABMMKJ = 9; - * @param values the lKFHFABMMKJ to add - * @return this - */ - public SceneInfo addAllLKFHFABMMKJ(final EntityBuffInfoOuterClass.EntityBuffInfo... values) { - bitField0_ |= 0x00000800; - lKFHFABMMKJ.addAll(values); - return this; - } - - /** - * 
-     *  52
-     *
- * - * repeated .SceneEntityInfo entity_list = 11; - * @return whether the entityList field is set - */ - public boolean hasEntityList() { - return (bitField0_ & 0x00001000) != 0; - } - - /** - * 
-     *  52
-     *
- * - * repeated .SceneEntityInfo entity_list = 11; + * repeated .SceneEntityInfo entity_list = 9; * @return this */ public SceneInfo clearEntityList() { - bitField0_ &= ~0x00001000; + bitField0_ &= ~0x00000080; entityList.clear(); return this; } /** - * 
-     *  52
-     *
- * - * repeated .SceneEntityInfo entity_list = 11; + * repeated .SceneEntityInfo entity_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. @@ -1034,11 +366,7 @@ public final class SceneInfoOuterClass { } /** - * 
-     *  52
-     *
- * - * repeated .SceneEntityInfo entity_list = 11; + * repeated .SceneEntityInfo entity_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 @@ -1047,72 +375,52 @@ public final class SceneInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableEntityList() { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000080; return entityList; } /** - * 
-     *  52
-     *
- * - * repeated .SceneEntityInfo entity_list = 11; + * repeated .SceneEntityInfo entity_list = 9; * @param value the entityList to add * @return this */ public SceneInfo addEntityList(final SceneEntityInfoOuterClass.SceneEntityInfo value) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000080; entityList.add(value); return this; } /** - * 
-     *  52
-     *
- * - * repeated .SceneEntityInfo entity_list = 11; + * repeated .SceneEntityInfo entity_list = 9; * @param values the entityList to add * @return this */ public SceneInfo addAllEntityList(final SceneEntityInfoOuterClass.SceneEntityInfo... values) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000080; entityList.addAll(values); return this; } /** - * 
-     *  68
-     *
- * - * repeated .SceneEntityGroupInfo entity_group_list = 1496; + * repeated .SceneEntityGroupInfo entity_group_list = 1421; * @return whether the entityGroupList field is set */ public boolean hasEntityGroupList() { - return (bitField0_ & 0x00002000) != 0; + return (bitField0_ & 0x00000100) != 0; } /** - * 
-     *  68
-     *
- * - * repeated .SceneEntityGroupInfo entity_group_list = 1496; + * repeated .SceneEntityGroupInfo entity_group_list = 1421; * @return this */ public SceneInfo clearEntityGroupList() { - bitField0_ &= ~0x00002000; + bitField0_ &= ~0x00000100; entityGroupList.clear(); return this; } /** - * 
-     *  68
-     *
- * - * repeated .SceneEntityGroupInfo entity_group_list = 1496; + * repeated .SceneEntityGroupInfo entity_group_list = 1421; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -1127,11 +435,7 @@ public final class SceneInfoOuterClass { } /** - * 
-     *  68
-     *
- * - * repeated .SceneEntityGroupInfo entity_group_list = 1496; + * repeated .SceneEntityGroupInfo entity_group_list = 1421; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -1141,154 +445,48 @@ public final class SceneInfoOuterClass { */ public RepeatedMessage getMutableEntityGroupList( ) { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000100; return entityGroupList; } /** - * 
-     *  68
-     *
- * - * repeated .SceneEntityGroupInfo entity_group_list = 1496; + * repeated .SceneEntityGroupInfo entity_group_list = 1421; * @param value the entityGroupList to add * @return this */ public SceneInfo addEntityGroupList( final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo value) { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000100; entityGroupList.add(value); return this; } /** - * 
-     *  68
-     *
- * - * repeated .SceneEntityGroupInfo entity_group_list = 1496; + * repeated .SceneEntityGroupInfo entity_group_list = 1421; * @param values the entityGroupList to add * @return this */ public SceneInfo addAllEntityGroupList( final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo... values) { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000100; entityGroupList.addAll(values); return this; } - /** - * 
-     *  24
-     *
- * - * repeated .SceneInfo.FFHKBOLIGAJEntry FFHKBOLIGAJ = 2028; - * @return whether the fFHKBOLIGAJ field is set - */ - public boolean hasFFHKBOLIGAJ() { - return (bitField0_ & 0x00004000) != 0; - } - - /** - * 
-     *  24
-     *
- * - * repeated .SceneInfo.FFHKBOLIGAJEntry FFHKBOLIGAJ = 2028; - * @return this - */ - public SceneInfo clearFFHKBOLIGAJ() { - bitField0_ &= ~0x00004000; - fFHKBOLIGAJ.clear(); - return this; - } - - /** - * 
-     *  24
-     *
- * - * repeated .SceneInfo.FFHKBOLIGAJEntry FFHKBOLIGAJ = 2028; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableFFHKBOLIGAJ()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getFFHKBOLIGAJ() { - return fFHKBOLIGAJ; - } - - /** - * 
-     *  24
-     *
- * - * repeated .SceneInfo.FFHKBOLIGAJEntry FFHKBOLIGAJ = 2028; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of 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 getMutableFFHKBOLIGAJ() { - bitField0_ |= 0x00004000; - return fFHKBOLIGAJ; - } - - /** - * 
-     *  24
-     *
- * - * repeated .SceneInfo.FFHKBOLIGAJEntry FFHKBOLIGAJ = 2028; - * @param value the fFHKBOLIGAJ to add - * @return this - */ - public SceneInfo addFFHKBOLIGAJ(final FFHKBOLIGAJEntry value) { - bitField0_ |= 0x00004000; - fFHKBOLIGAJ.add(value); - return this; - } - - /** - * 
-     *  24
-     *
- * - * repeated .SceneInfo.FFHKBOLIGAJEntry FFHKBOLIGAJ = 2028; - * @param values the fFHKBOLIGAJ to add - * @return this - */ - public SceneInfo addAllFFHKBOLIGAJ(final FFHKBOLIGAJEntry... values) { - bitField0_ |= 0x00004000; - fFHKBOLIGAJ.addAll(values); - return this; - } - @Override public SceneInfo copyFrom(final SceneInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - worldId = other.worldId; - clientPosVersion = other.clientPosVersion; - floorId = other.floorId; planeId = other.planeId; - leaderEntityId = other.leaderEntityId; - entryId = other.entryId; + worldId = other.worldId; gameModeType = other.gameModeType; - aBDCMNBLEPA.copyFrom(other.aBDCMNBLEPA); - oONDMDFABLJ.copyFrom(other.oONDMDFABLJ); - pLHHEJPGCNP.copyFrom(other.pLHHEJPGCNP); - pHBNCDKDJFO.copyFrom(other.pHBNCDKDJFO); - lKFHFABMMKJ.copyFrom(other.lKFHFABMMKJ); + leaderEntityId = other.leaderEntityId; + floorId = other.floorId; + clientPosVersion = other.clientPosVersion; + entryId = other.entryId; entityList.copyFrom(other.entityList); entityGroupList.copyFrom(other.entityGroupList); - fFHKBOLIGAJ.copyFrom(other.fFHKBOLIGAJ); } return this; } @@ -1299,41 +497,26 @@ public final class SceneInfoOuterClass { return this; } cachedSize = -1; - if (other.hasWorldId()) { - setWorldId(other.worldId); - } - if (other.hasClientPosVersion()) { - setClientPosVersion(other.clientPosVersion); - } - if (other.hasFloorId()) { - setFloorId(other.floorId); - } if (other.hasPlaneId()) { setPlaneId(other.planeId); } - if (other.hasLeaderEntityId()) { - setLeaderEntityId(other.leaderEntityId); - } - if (other.hasEntryId()) { - setEntryId(other.entryId); + if (other.hasWorldId()) { + setWorldId(other.worldId); } if (other.hasGameModeType()) { setGameModeType(other.gameModeType); } - if (other.hasABDCMNBLEPA()) { - getMutableABDCMNBLEPA().mergeFrom(other.aBDCMNBLEPA); + if (other.hasLeaderEntityId()) { + setLeaderEntityId(other.leaderEntityId); } - if (other.hasOONDMDFABLJ()) { - getMutableOONDMDFABLJ().addAll(other.oONDMDFABLJ); + if (other.hasFloorId()) { + setFloorId(other.floorId); } - if (other.hasPLHHEJPGCNP()) { - getMutablePLHHEJPGCNP().addAll(other.pLHHEJPGCNP); + if (other.hasClientPosVersion()) { + setClientPosVersion(other.clientPosVersion); } - if (other.hasPHBNCDKDJFO()) { - getMutablePHBNCDKDJFO().addAll(other.pHBNCDKDJFO); - } - if (other.hasLKFHFABMMKJ()) { - getMutableLKFHFABMMKJ().addAll(other.lKFHFABMMKJ); + if (other.hasEntryId()) { + setEntryId(other.entryId); } if (other.hasEntityList()) { getMutableEntityList().addAll(other.entityList); @@ -1341,9 +524,6 @@ public final class SceneInfoOuterClass { if (other.hasEntityGroupList()) { getMutableEntityGroupList().addAll(other.entityGroupList); } - if (other.hasFFHKBOLIGAJ()) { - getMutableFFHKBOLIGAJ().addAll(other.fFHKBOLIGAJ); - } return this; } @@ -1354,21 +534,15 @@ public final class SceneInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - worldId = 0; - clientPosVersion = 0; - floorId = 0; planeId = 0; - leaderEntityId = 0; - entryId = 0; + worldId = 0; gameModeType = 0; - aBDCMNBLEPA.clear(); - oONDMDFABLJ.clear(); - pLHHEJPGCNP.clear(); - pHBNCDKDJFO.clear(); - lKFHFABMMKJ.clear(); + leaderEntityId = 0; + floorId = 0; + clientPosVersion = 0; + entryId = 0; entityList.clear(); entityGroupList.clear(); - fFHKBOLIGAJ.clear(); return this; } @@ -1379,14 +553,8 @@ public final class SceneInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - aBDCMNBLEPA.clearQuick(); - oONDMDFABLJ.clear(); - pLHHEJPGCNP.clear(); - pHBNCDKDJFO.clearQuick(); - lKFHFABMMKJ.clearQuick(); entityList.clearQuick(); entityGroupList.clearQuick(); - fFHKBOLIGAJ.clearQuick(); return this; } @@ -1400,149 +568,91 @@ public final class SceneInfoOuterClass { } SceneInfo other = (SceneInfo) o; return bitField0_ == other.bitField0_ - && (!hasWorldId() || worldId == other.worldId) - && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) - && (!hasFloorId() || floorId == other.floorId) && (!hasPlaneId() || planeId == other.planeId) - && (!hasLeaderEntityId() || leaderEntityId == other.leaderEntityId) - && (!hasEntryId() || entryId == other.entryId) + && (!hasWorldId() || worldId == other.worldId) && (!hasGameModeType() || gameModeType == other.gameModeType) - && (!hasABDCMNBLEPA() || aBDCMNBLEPA.equals(other.aBDCMNBLEPA)) - && (!hasOONDMDFABLJ() || oONDMDFABLJ.equals(other.oONDMDFABLJ)) - && (!hasPLHHEJPGCNP() || pLHHEJPGCNP.equals(other.pLHHEJPGCNP)) - && (!hasPHBNCDKDJFO() || pHBNCDKDJFO.equals(other.pHBNCDKDJFO)) - && (!hasLKFHFABMMKJ() || lKFHFABMMKJ.equals(other.lKFHFABMMKJ)) + && (!hasLeaderEntityId() || leaderEntityId == other.leaderEntityId) + && (!hasFloorId() || floorId == other.floorId) + && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) + && (!hasEntryId() || entryId == other.entryId) && (!hasEntityList() || entityList.equals(other.entityList)) - && (!hasEntityGroupList() || entityGroupList.equals(other.entityGroupList)) - && (!hasFFHKBOLIGAJ() || fFHKBOLIGAJ.equals(other.fFHKBOLIGAJ)); + && (!hasEntityGroupList() || entityGroupList.equals(other.entityGroupList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(worldId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(clientPosVersion); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(floorId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 56); output.writeUInt32NoTag(planeId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(worldId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(gameModeType); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 64); output.writeUInt32NoTag(leaderEntityId); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(floorId); + } if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(clientPosVersion); + } + if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 112); output.writeUInt32NoTag(entryId); } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(gameModeType); - } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 82); - output.writeMessageNoTag(aBDCMNBLEPA); - } - if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < oONDMDFABLJ.length(); i++) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(oONDMDFABLJ.array()[i]); - } - } - if ((bitField0_ & 0x00000200) != 0) { - for (int i = 0; i < pLHHEJPGCNP.length(); i++) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(pLHHEJPGCNP.array()[i]); - } - } - if ((bitField0_ & 0x00000400) != 0) { - for (int i = 0; i < pHBNCDKDJFO.length(); i++) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(pHBNCDKDJFO.get(i)); - } - } - if ((bitField0_ & 0x00000800) != 0) { - for (int i = 0; i < lKFHFABMMKJ.length(); i++) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(lKFHFABMMKJ.get(i)); - } - } - if ((bitField0_ & 0x00001000) != 0) { for (int i = 0; i < entityList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 74); output.writeMessageNoTag(entityList.get(i)); } } - if ((bitField0_ & 0x00002000) != 0) { + if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < entityGroupList.length(); i++) { - output.writeRawLittleEndian16((short) 24002); + output.writeRawLittleEndian16((short) 22762); output.writeMessageNoTag(entityGroupList.get(i)); } } - if ((bitField0_ & 0x00004000) != 0) { - for (int i = 0; i < fFHKBOLIGAJ.length(); i++) { - output.writeRawLittleEndian16((short) 32482); - output.writeMessageNoTag(fFHKBOLIGAJ.get(i)); - } - } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderEntityId); + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldId); } - if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); - } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gameModeType); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderEntityId); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); + } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + } + if ((bitField0_ & 0x00000040) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(aBDCMNBLEPA); - } - if ((bitField0_ & 0x00000100) != 0) { - size += (1 * oONDMDFABLJ.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(oONDMDFABLJ); - } - if ((bitField0_ & 0x00000200) != 0) { - size += (1 * pLHHEJPGCNP.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(pLHHEJPGCNP); - } - if ((bitField0_ & 0x00000400) != 0) { - size += (1 * pHBNCDKDJFO.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(pHBNCDKDJFO); - } - if ((bitField0_ & 0x00000800) != 0) { - size += (1 * lKFHFABMMKJ.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(lKFHFABMMKJ); - } - if ((bitField0_ & 0x00001000) != 0) { size += (1 * entityList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityList); } - if ((bitField0_ & 0x00002000) != 0) { + if ((bitField0_ & 0x00000100) != 0) { size += (2 * entityGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityGroupList); } - if ((bitField0_ & 0x00004000) != 0) { - size += (2 * fFHKBOLIGAJ.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(fFHKBOLIGAJ); - } return size; } @@ -1554,45 +664,54 @@ public final class SceneInfoOuterClass { while (true) { switch (tag) { case 8: { + // planeId + planeId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { // worldId worldId = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 40) { break; } } case 40: { - // clientPosVersion - clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // floorId - floorId = input.readUInt32(); + // gameModeType + gameModeType = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 56) { + if (tag != 64) { break; } } - case 56: { - // planeId - planeId = input.readUInt32(); + case 64: { + // leaderEntityId + leaderEntityId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // floorId + floorId = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // leaderEntityId - leaderEntityId = input.readUInt32(); - bitField0_ |= 0x00000010; + // clientPosVersion + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 112) { break; @@ -1601,84 +720,24 @@ public final class SceneInfoOuterClass { case 112: { // entryId entryId = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // gameModeType - gameModeType = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 82) { - break; - } - } - case 82: { - // aBDCMNBLEPA - input.readMessage(aBDCMNBLEPA); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 18) { - break; - } - } - case 18: { - // oONDMDFABLJ [packed=true] - input.readPackedUInt32(oONDMDFABLJ, tag); - bitField0_ |= 0x00000100; - tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { - // pLHHEJPGCNP [packed=true] - input.readPackedUInt32(pLHHEJPGCNP, tag); - bitField0_ |= 0x00000200; - tag = input.readTag(); - if (tag != 26) { - break; - } - } - case 26: { - // pHBNCDKDJFO - tag = input.readRepeatedMessage(pHBNCDKDJFO, tag); - bitField0_ |= 0x00000400; if (tag != 74) { break; } } case 74: { - // lKFHFABMMKJ - tag = input.readRepeatedMessage(lKFHFABMMKJ, tag); - bitField0_ |= 0x00000800; - if (tag != 90) { - break; - } - } - case 90: { // entityList tag = input.readRepeatedMessage(entityList, tag); - bitField0_ |= 0x00001000; - if (tag != 11970) { + bitField0_ |= 0x00000080; + if (tag != 11370) { break; } } - case 11970: { + case 11370: { // entityGroupList tag = input.readRepeatedMessage(entityGroupList, tag); - bitField0_ |= 0x00002000; - if (tag != 16226) { - break; - } - } - case 16226: { - // fFHKBOLIGAJ - tag = input.readRepeatedMessage(fFHKBOLIGAJ, tag); - bitField0_ |= 0x00004000; + bitField0_ |= 0x00000100; if (tag != 0) { break; } @@ -1693,18 +752,6 @@ public final class SceneInfoOuterClass { tag = input.readTag(); break; } - case 16: { - // oONDMDFABLJ [packed=false] - tag = input.readRepeatedUInt32(oONDMDFABLJ, tag); - bitField0_ |= 0x00000100; - break; - } - case 96: { - // pLHHEJPGCNP [packed=false] - tag = input.readRepeatedUInt32(pLHHEJPGCNP, tag); - bitField0_ |= 0x00000200; - break; - } } } } @@ -1713,50 +760,32 @@ public final class SceneInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.worldId, worldId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.floorId, floorId); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.planeId, planeId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.leaderEntityId, leaderEntityId); + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.worldId, worldId); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); - } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.gameModeType, gameModeType); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.leaderEntityId, leaderEntityId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.floorId, floorId); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + } + if ((bitField0_ & 0x00000040) != 0) { + output.writeUInt32(FieldNames.entryId, entryId); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeMessage(FieldNames.aBDCMNBLEPA, aBDCMNBLEPA); - } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedUInt32(FieldNames.oONDMDFABLJ, oONDMDFABLJ); - } - if ((bitField0_ & 0x00000200) != 0) { - output.writeRepeatedUInt32(FieldNames.pLHHEJPGCNP, pLHHEJPGCNP); - } - if ((bitField0_ & 0x00000400) != 0) { - output.writeRepeatedMessage(FieldNames.pHBNCDKDJFO, pHBNCDKDJFO); - } - if ((bitField0_ & 0x00000800) != 0) { - output.writeRepeatedMessage(FieldNames.lKFHFABMMKJ, lKFHFABMMKJ); - } - if ((bitField0_ & 0x00001000) != 0) { output.writeRepeatedMessage(FieldNames.entityList, entityList); } - if ((bitField0_ & 0x00002000) != 0) { + if ((bitField0_ & 0x00000100) != 0) { output.writeRepeatedMessage(FieldNames.entityGroupList, entityGroupList); } - if ((bitField0_ & 0x00004000) != 0) { - output.writeRepeatedMessage(FieldNames.fFHKBOLIGAJ, fFHKBOLIGAJ); - } output.endObject(); } @@ -1767,11 +796,11 @@ public final class SceneInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1525188685: - case 36230376: { - if (input.isAtField(FieldNames.worldId)) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { - worldId = input.readUInt32(); + planeId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -1779,11 +808,11 @@ public final class SceneInfoOuterClass { } break; } - case 1787644431: - case 1278860153: { - if (input.isAtField(FieldNames.clientPosVersion)) { + case 1525188685: + case 36230376: { + if (input.isAtField(FieldNames.worldId)) { if (!input.trySkipNullValue()) { - clientPosVersion = input.readUInt32(); + worldId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1791,59 +820,59 @@ public final class SceneInfoOuterClass { } break; } - case -766027193: - case 2022982190: { - if (input.isAtField(FieldNames.floorId)) { - if (!input.trySkipNullValue()) { - floorId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { - if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1693061255: - case 794634049: { - if (input.isAtField(FieldNames.leaderEntityId)) { - if (!input.trySkipNullValue()) { - leaderEntityId = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1591558867: - case -2093663224: { - if (input.isAtField(FieldNames.entryId)) { - if (!input.trySkipNullValue()) { - entryId = input.readUInt32(); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } case -464498289: case 1937775689: { if (input.isAtField(FieldNames.gameModeType)) { if (!input.trySkipNullValue()) { gameModeType = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1693061255: + case 794634049: { + if (input.isAtField(FieldNames.leaderEntityId)) { + if (!input.trySkipNullValue()) { + leaderEntityId = 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 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { + if (!input.trySkipNullValue()) { + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1591558867: + case -2093663224: { + if (input.isAtField(FieldNames.entryId)) { + if (!input.trySkipNullValue()) { + entryId = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -1851,67 +880,12 @@ public final class SceneInfoOuterClass { } break; } - case -851688693: { - if (input.isAtField(FieldNames.aBDCMNBLEPA)) { - if (!input.trySkipNullValue()) { - input.readMessage(aBDCMNBLEPA); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } - case 2066294552: { - if (input.isAtField(FieldNames.oONDMDFABLJ)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(oONDMDFABLJ); - bitField0_ |= 0x00000100; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1128889619: { - if (input.isAtField(FieldNames.pLHHEJPGCNP)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(pLHHEJPGCNP); - bitField0_ |= 0x00000200; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1827401237: { - if (input.isAtField(FieldNames.pHBNCDKDJFO)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(pHBNCDKDJFO); - bitField0_ |= 0x00000400; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1897503941: { - if (input.isAtField(FieldNames.lKFHFABMMKJ)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(lKFHFABMMKJ); - bitField0_ |= 0x00000800; - } - } else { - input.skipUnknownField(); - } - break; - } case -1483251935: case 1281457018: { if (input.isAtField(FieldNames.entityList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(entityList); - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1923,18 +897,7 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.entityGroupList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(entityGroupList); - bitField0_ |= 0x00002000; - } - } else { - input.skipUnknownField(); - } - break; - } - case -749696829: { - if (input.isAtField(FieldNames.fFHKBOLIGAJ)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(fFHKBOLIGAJ); - bitField0_ |= 0x00004000; + bitField0_ |= 0x00000100; } } else { input.skipUnknownField(); @@ -1980,360 +943,6 @@ public final class SceneInfoOuterClass { return SceneInfoFactory.INSTANCE; } - /** - * Protobuf type {@code FFHKBOLIGAJEntry} - */ - public static final class FFHKBOLIGAJEntry 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 FFHKBOLIGAJEntry() { - } - - /** - * @return a new empty instance of {@code FFHKBOLIGAJEntry} - */ - public static FFHKBOLIGAJEntry newInstance() { - return new FFHKBOLIGAJEntry(); - } - - /** - * 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 FFHKBOLIGAJEntry 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 FFHKBOLIGAJEntry 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 FFHKBOLIGAJEntry 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 FFHKBOLIGAJEntry setKey(final CharSequence value) { - bitField0_ |= 0x00000002; - key.copyFrom(value); - return this; - } - - /** - * optional string key = 1; - * @param value the key to set - * @return this - */ - public FFHKBOLIGAJEntry setKey(final Utf8String value) { - bitField0_ |= 0x00000002; - key.copyFrom(value); - return this; - } - - @Override - public FFHKBOLIGAJEntry copyFrom(final FFHKBOLIGAJEntry other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - value_ = other.value_; - key.copyFrom(other.key); - } - return this; - } - - @Override - public FFHKBOLIGAJEntry mergeFrom(final FFHKBOLIGAJEntry 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 FFHKBOLIGAJEntry clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - value_ = 0; - key.clear(); - return this; - } - - @Override - public FFHKBOLIGAJEntry 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 FFHKBOLIGAJEntry)) { - return false; - } - FFHKBOLIGAJEntry other = (FFHKBOLIGAJEntry) 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 FFHKBOLIGAJEntry 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 FFHKBOLIGAJEntry 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 FFHKBOLIGAJEntry clone() { - return new FFHKBOLIGAJEntry().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static FFHKBOLIGAJEntry parseFrom(final byte[] data) throws - InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new FFHKBOLIGAJEntry(), data).checkInitialized(); - } - - public static FFHKBOLIGAJEntry parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new FFHKBOLIGAJEntry(), input).checkInitialized(); - } - - public static FFHKBOLIGAJEntry parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new FFHKBOLIGAJEntry(), input).checkInitialized(); - } - - /** - * @return factory for creating FFHKBOLIGAJEntry messages - */ - public static MessageFactory getFactory() { - return FFHKBOLIGAJEntryFactory.INSTANCE; - } - - private enum FFHKBOLIGAJEntryFactory implements MessageFactory { - INSTANCE; - - @Override - public FFHKBOLIGAJEntry create() { - return FFHKBOLIGAJEntry.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; @@ -2347,35 +956,23 @@ public final class SceneInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName worldId = FieldName.forField("worldId", "world_id"); - - static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); - - static final FieldName floorId = FieldName.forField("floorId", "floor_id"); - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName leaderEntityId = FieldName.forField("leaderEntityId", "leader_entity_id"); - - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + static final FieldName worldId = FieldName.forField("worldId", "world_id"); static final FieldName gameModeType = FieldName.forField("gameModeType", "game_mode_type"); - static final FieldName aBDCMNBLEPA = FieldName.forField("ABDCMNBLEPA"); + static final FieldName leaderEntityId = FieldName.forField("leaderEntityId", "leader_entity_id"); - static final FieldName oONDMDFABLJ = FieldName.forField("OONDMDFABLJ"); + static final FieldName floorId = FieldName.forField("floorId", "floor_id"); - static final FieldName pLHHEJPGCNP = FieldName.forField("PLHHEJPGCNP"); + static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); - static final FieldName pHBNCDKDJFO = FieldName.forField("PHBNCDKDJFO"); - - static final FieldName lKFHFABMMKJ = FieldName.forField("LKFHFABMMKJ"); + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); static final FieldName entityList = FieldName.forField("entityList", "entity_list"); static final FieldName entityGroupList = FieldName.forField("entityGroupList", "entity_group_list"); - - static final FieldName fFHKBOLIGAJ = FieldName.forField("FFHKBOLIGAJ"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java index 222948c..16964f7 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java @@ -19,20 +19,20 @@ public final class SceneMonsterOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 max_hp = 6; + * optional uint32 monster_id = 6; + */ + private int monsterId; + + /** + * optional uint32 max_hp = 10; */ private int maxHp; /** - * optional uint32 cur_hp = 12; + * optional uint32 cur_hp = 13; */ private int curHp; - /** - * optional uint32 monster_id = 15; - */ - private int monsterId; - private SceneMonster() { } @@ -44,99 +44,25 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 max_hp = 6; - * @return whether the maxHp field is set + * optional uint32 monster_id = 6; + * @return whether the monsterId field is set */ - public boolean hasMaxHp() { + public boolean hasMonsterId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 max_hp = 6; - * @return this - */ - public SceneMonster clearMaxHp() { - bitField0_ &= ~0x00000001; - maxHp = 0; - return this; - } - - /** - * optional uint32 max_hp = 6; - * @return the maxHp - */ - public int getMaxHp() { - return maxHp; - } - - /** - * optional uint32 max_hp = 6; - * @param value the maxHp to set - * @return this - */ - public SceneMonster setMaxHp(final int value) { - bitField0_ |= 0x00000001; - maxHp = value; - return this; - } - - /** - * optional uint32 cur_hp = 12; - * @return whether the curHp field is set - */ - public boolean hasCurHp() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cur_hp = 12; - * @return this - */ - public SceneMonster clearCurHp() { - bitField0_ &= ~0x00000002; - curHp = 0; - return this; - } - - /** - * optional uint32 cur_hp = 12; - * @return the curHp - */ - public int getCurHp() { - return curHp; - } - - /** - * optional uint32 cur_hp = 12; - * @param value the curHp to set - * @return this - */ - public SceneMonster setCurHp(final int value) { - bitField0_ |= 0x00000002; - curHp = 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 = 6; * @return this */ public SceneMonster clearMonsterId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; monsterId = 0; return this; } /** - * optional uint32 monster_id = 15; + * optional uint32 monster_id = 6; * @return the monsterId */ public int getMonsterId() { @@ -144,24 +70,98 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 monster_id = 15; + * optional uint32 monster_id = 6; * @param value the monsterId to set * @return this */ public SceneMonster setMonsterId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; monsterId = value; return this; } + /** + * optional uint32 max_hp = 10; + * @return whether the maxHp field is set + */ + public boolean hasMaxHp() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 max_hp = 10; + * @return this + */ + public SceneMonster clearMaxHp() { + bitField0_ &= ~0x00000002; + 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_ |= 0x00000002; + maxHp = value; + return this; + } + + /** + * optional uint32 cur_hp = 13; + * @return whether the curHp field is set + */ + public boolean hasCurHp() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 cur_hp = 13; + * @return this + */ + public SceneMonster clearCurHp() { + bitField0_ &= ~0x00000004; + curHp = 0; + return this; + } + + /** + * optional uint32 cur_hp = 13; + * @return the curHp + */ + public int getCurHp() { + return curHp; + } + + /** + * optional uint32 cur_hp = 13; + * @param value the curHp to set + * @return this + */ + public SceneMonster setCurHp(final int value) { + bitField0_ |= 0x00000004; + curHp = value; + return this; + } + @Override public SceneMonster copyFrom(final SceneMonster other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + monsterId = other.monsterId; maxHp = other.maxHp; curHp = other.curHp; - 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.hasMaxHp()) { setMaxHp(other.maxHp); } if (other.hasCurHp()) { setCurHp(other.curHp); } - if (other.hasMonsterId()) { - setMonsterId(other.monsterId); - } return this; } @@ -191,9 +191,9 @@ public final class SceneMonsterOuterClass { } cachedSize = -1; bitField0_ = 0; + monsterId = 0; maxHp = 0; curHp = 0; - monsterId = 0; return this; } @@ -217,24 +217,24 @@ public final class SceneMonsterOuterClass { } SceneMonster other = (SceneMonster) o; return bitField0_ == other.bitField0_ + && (!hasMonsterId() || monsterId == other.monsterId) && (!hasMaxHp() || maxHp == other.maxHp) - && (!hasCurHp() || curHp == other.curHp) - && (!hasMonsterId() || monsterId == other.monsterId); + && (!hasCurHp() || curHp == other.curHp); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 48); - output.writeUInt32NoTag(maxHp); + output.writeUInt32NoTag(monsterId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(curHp); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(maxHp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(monsterId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(curHp); } } @@ -242,13 +242,13 @@ public final class SceneMonsterOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(maxHp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curHp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(maxHp); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curHp); } return size; } @@ -261,26 +261,26 @@ public final class SceneMonsterOuterClass { while (true) { switch (tag) { case 48: { - // maxHp - maxHp = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // curHp - curHp = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { // monsterId monsterId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // maxHp + maxHp = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // curHp + curHp = 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.maxHp, maxHp); + output.writeUInt32(FieldNames.monsterId, monsterId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curHp, curHp); + output.writeUInt32(FieldNames.maxHp, maxHp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.monsterId, monsterId); + output.writeUInt32(FieldNames.curHp, curHp); } 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 103671180: case -1081138749: { if (input.isAtField(FieldNames.maxHp)) { if (!input.trySkipNullValue()) { maxHp = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -340,18 +352,6 @@ public final class SceneMonsterOuterClass { if (input.isAtField(FieldNames.curHp)) { if (!input.trySkipNullValue()) { curHp = 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 maxHp = FieldName.forField("maxHp", "max_hp"); static final FieldName curHp = FieldName.forField("curHp", "cur_hp"); - - static final FieldName monsterId = FieldName.forField("monsterId", "monster_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java index 286f942..a60696a 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java @@ -20,25 +20,25 @@ public final class SceneMonsterWaveOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 wave_id = 8; - */ - private int waveId; - - /** - * optional uint32 stage_id = 10; + * optional uint32 stage_id = 4; */ private int stageId; /** - * repeated .ItemList drop_list = 1; + * optional uint32 wave_id = 7; */ - private final RepeatedMessage dropList = RepeatedMessage.newEmptyInstance(ItemListOuterClass.ItemList.getFactory()); + private int waveId; /** - * repeated .SceneMonster monster_list = 9; + * repeated .SceneMonster monster_list = 1; */ private final RepeatedMessage monsterList = RepeatedMessage.newEmptyInstance(SceneMonsterOuterClass.SceneMonster.getFactory()); + /** + * repeated .ItemList drop_list = 10; + */ + private final RepeatedMessage dropList = RepeatedMessage.newEmptyInstance(ItemListOuterClass.ItemList.getFactory()); + private SceneMonsterWave() { } @@ -50,62 +50,25 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 wave_id = 8; - * @return whether the waveId field is set + * optional uint32 stage_id = 4; + * @return whether the stageId field is set */ - public boolean hasWaveId() { + public boolean hasStageId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 wave_id = 8; - * @return this - */ - public SceneMonsterWave clearWaveId() { - bitField0_ &= ~0x00000001; - waveId = 0; - return this; - } - - /** - * optional uint32 wave_id = 8; - * @return the waveId - */ - public int getWaveId() { - return waveId; - } - - /** - * optional uint32 wave_id = 8; - * @param value the waveId to set - * @return this - */ - public SceneMonsterWave setWaveId(final int value) { - bitField0_ |= 0x00000001; - waveId = value; - return this; - } - - /** - * optional uint32 stage_id = 10; - * @return whether the stageId field is set - */ - public boolean hasStageId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 stage_id = 10; + * optional uint32 stage_id = 4; * @return this */ public SceneMonsterWave clearStageId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; stageId = 0; return this; } /** - * optional uint32 stage_id = 10; + * optional uint32 stage_id = 4; * @return the stageId */ public int getStageId() { @@ -113,104 +76,73 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 stage_id = 10; + * optional uint32 stage_id = 4; * @param value the stageId to set * @return this */ public SceneMonsterWave setStageId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; stageId = value; return this; } /** - * repeated .ItemList drop_list = 1; - * @return whether the dropList field is set + * optional uint32 wave_id = 7; + * @return whether the waveId field is set */ - public boolean hasDropList() { + public boolean hasWaveId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 wave_id = 7; + * @return this + */ + public SceneMonsterWave clearWaveId() { + bitField0_ &= ~0x00000002; + waveId = 0; + return this; + } + + /** + * optional uint32 wave_id = 7; + * @return the waveId + */ + public int getWaveId() { + return waveId; + } + + /** + * optional uint32 wave_id = 7; + * @param value the waveId to set + * @return this + */ + public SceneMonsterWave setWaveId(final int value) { + bitField0_ |= 0x00000002; + waveId = value; + return this; + } + + /** + * repeated .SceneMonster monster_list = 1; + * @return whether the monsterList field is set + */ + public boolean hasMonsterList() { return (bitField0_ & 0x00000004) != 0; } /** - * repeated .ItemList drop_list = 1; - * @return this - */ - public SceneMonsterWave clearDropList() { - bitField0_ &= ~0x00000004; - dropList.clear(); - return this; - } - - /** - * repeated .ItemList drop_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 #getMutableDropList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getDropList() { - return dropList; - } - - /** - * repeated .ItemList drop_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 getMutableDropList() { - bitField0_ |= 0x00000004; - return dropList; - } - - /** - * repeated .ItemList drop_list = 1; - * @param value the dropList to add - * @return this - */ - public SceneMonsterWave addDropList(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000004; - dropList.add(value); - return this; - } - - /** - * repeated .ItemList drop_list = 1; - * @param values the dropList to add - * @return this - */ - public SceneMonsterWave addAllDropList(final ItemListOuterClass.ItemList... values) { - bitField0_ |= 0x00000004; - dropList.addAll(values); - return this; - } - - /** - * repeated .SceneMonster monster_list = 9; - * @return whether the monsterList field is set - */ - public boolean hasMonsterList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated .SceneMonster monster_list = 9; + * repeated .SceneMonster monster_list = 1; * @return this */ public SceneMonsterWave clearMonsterList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; monsterList.clear(); return this; } /** - * repeated .SceneMonster monster_list = 9; + * repeated .SceneMonster monster_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. @@ -224,7 +156,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .SceneMonster monster_list = 9; + * repeated .SceneMonster monster_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,41 +165,109 @@ public final class SceneMonsterWaveOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMonsterList() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return monsterList; } /** - * repeated .SceneMonster monster_list = 9; + * repeated .SceneMonster monster_list = 1; * @param value the monsterList to add * @return this */ public SceneMonsterWave addMonsterList(final SceneMonsterOuterClass.SceneMonster value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; monsterList.add(value); return this; } /** - * repeated .SceneMonster monster_list = 9; + * repeated .SceneMonster monster_list = 1; * @param values the monsterList to add * @return this */ public SceneMonsterWave addAllMonsterList(final SceneMonsterOuterClass.SceneMonster... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; monsterList.addAll(values); return this; } + /** + * repeated .ItemList drop_list = 10; + * @return whether the dropList field is set + */ + public boolean hasDropList() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * repeated .ItemList drop_list = 10; + * @return this + */ + public SceneMonsterWave clearDropList() { + bitField0_ &= ~0x00000008; + dropList.clear(); + return this; + } + + /** + * repeated .ItemList drop_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 #getMutableDropList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getDropList() { + return dropList; + } + + /** + * repeated .ItemList drop_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 getMutableDropList() { + bitField0_ |= 0x00000008; + return dropList; + } + + /** + * repeated .ItemList drop_list = 10; + * @param value the dropList to add + * @return this + */ + public SceneMonsterWave addDropList(final ItemListOuterClass.ItemList value) { + bitField0_ |= 0x00000008; + dropList.add(value); + return this; + } + + /** + * repeated .ItemList drop_list = 10; + * @param values the dropList to add + * @return this + */ + public SceneMonsterWave addAllDropList(final ItemListOuterClass.ItemList... values) { + bitField0_ |= 0x00000008; + dropList.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; - dropList.copyFrom(other.dropList); + waveId = other.waveId; monsterList.copyFrom(other.monsterList); + dropList.copyFrom(other.dropList); } return this; } @@ -278,18 +278,18 @@ public final class SceneMonsterWaveOuterClass { return this; } cachedSize = -1; - if (other.hasWaveId()) { - setWaveId(other.waveId); - } if (other.hasStageId()) { setStageId(other.stageId); } - if (other.hasDropList()) { - getMutableDropList().addAll(other.dropList); + if (other.hasWaveId()) { + setWaveId(other.waveId); } if (other.hasMonsterList()) { getMutableMonsterList().addAll(other.monsterList); } + if (other.hasDropList()) { + getMutableDropList().addAll(other.dropList); + } return this; } @@ -300,10 +300,10 @@ public final class SceneMonsterWaveOuterClass { } cachedSize = -1; bitField0_ = 0; - waveId = 0; stageId = 0; - dropList.clear(); + waveId = 0; monsterList.clear(); + dropList.clear(); return this; } @@ -314,8 +314,8 @@ public final class SceneMonsterWaveOuterClass { } cachedSize = -1; bitField0_ = 0; - dropList.clearQuick(); monsterList.clearQuick(); + dropList.clearQuick(); return this; } @@ -329,32 +329,32 @@ public final class SceneMonsterWaveOuterClass { } SceneMonsterWave other = (SceneMonsterWave) o; return bitField0_ == other.bitField0_ - && (!hasWaveId() || waveId == other.waveId) && (!hasStageId() || stageId == other.stageId) - && (!hasDropList() || dropList.equals(other.dropList)) - && (!hasMonsterList() || monsterList.equals(other.monsterList)); + && (!hasWaveId() || waveId == other.waveId) + && (!hasMonsterList() || monsterList.equals(other.monsterList)) + && (!hasDropList() || dropList.equals(other.dropList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(waveId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(stageId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(waveId); + } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < dropList.length(); i++) { + for (int i = 0; i < monsterList.length(); i++) { output.writeRawByte((byte) 10); - output.writeMessageNoTag(dropList.get(i)); + output.writeMessageNoTag(monsterList.get(i)); } } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < monsterList.length(); i++) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(monsterList.get(i)); + for (int i = 0; i < dropList.length(); i++) { + output.writeRawByte((byte) 82); + output.writeMessageNoTag(dropList.get(i)); } } } @@ -363,16 +363,16 @@ public final class SceneMonsterWaveOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(waveId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(waveId); + } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * dropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dropList); + size += (1 * monsterList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterList); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * monsterList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterList); + size += (1 * dropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dropList); } return size; } @@ -384,18 +384,18 @@ public final class SceneMonsterWaveOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // waveId - waveId = input.readUInt32(); + case 32: { + // stageId + stageId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 56) { break; } } - case 80: { - // stageId - stageId = input.readUInt32(); + case 56: { + // waveId + waveId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 10) { @@ -403,16 +403,16 @@ public final class SceneMonsterWaveOuterClass { } } case 10: { - // dropList - tag = input.readRepeatedMessage(dropList, tag); + // monsterList + tag = input.readRepeatedMessage(monsterList, tag); bitField0_ |= 0x00000004; - if (tag != 74) { + if (tag != 82) { break; } } - case 74: { - // monsterList - tag = input.readRepeatedMessage(monsterList, tag); + case 82: { + // dropList + tag = input.readRepeatedMessage(dropList, tag); bitField0_ |= 0x00000008; if (tag != 0) { break; @@ -436,16 +436,16 @@ public final class SceneMonsterWaveOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.waveId, waveId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.stageId, stageId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.waveId, waveId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.dropList, dropList); + output.writeRepeatedMessage(FieldNames.monsterList, monsterList); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedMessage(FieldNames.monsterList, monsterList); + output.writeRepeatedMessage(FieldNames.dropList, dropList); } output.endObject(); } @@ -457,11 +457,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 { @@ -469,11 +469,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 { @@ -481,23 +481,23 @@ public final class SceneMonsterWaveOuterClass { } break; } - case -432782291: - case -513722386: { - if (input.isAtField(FieldNames.dropList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(dropList); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 1541271448: case 552401379: { if (input.isAtField(FieldNames.monsterList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(monsterList); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -432782291: + case -513722386: { + if (input.isAtField(FieldNames.dropList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(dropList); bitField0_ |= 0x00000008; } } else { @@ -558,13 +558,13 @@ 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 dropList = FieldName.forField("dropList", "drop_list"); + static final FieldName waveId = FieldName.forField("waveId", "wave_id"); static final FieldName monsterList = FieldName.forField("monsterList", "monster_list"); + + static final FieldName dropList = FieldName.forField("dropList", "drop_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java index c456f15..38de604 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java @@ -19,7 +19,7 @@ public final class SceneNpcInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 npc_id = 15; + * optional uint32 npc_id = 4; */ private int npcId; @@ -34,7 +34,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 15; + * optional uint32 npc_id = 4; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -42,7 +42,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 15; + * optional uint32 npc_id = 4; * @return this */ public SceneNpcInfo clearNpcId() { @@ -52,7 +52,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 15; + * optional uint32 npc_id = 4; * @return the npcId */ public int getNpcId() { @@ -60,7 +60,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 15; + * optional uint32 npc_id = 4; * @param value the npcId to set * @return this */ @@ -129,7 +129,7 @@ public final class SceneNpcInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(npcId); } } @@ -150,7 +150,7 @@ public final class SceneNpcInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 32: { // npcId npcId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java index bb42ca3..fd43b83 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java @@ -19,33 +19,19 @@ public final class SceneNpcMonsterInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 world_level = 1; - */ - private int worldLevel; - - /** - * optional uint32 event_id = 5; - */ - private int eventId; - - /** - * optional uint32 monster_id = 10; + * optional uint32 monster_id = 6; */ private int monsterId; /** - * 
-     * FNCLFLKHFFH HBAAIJKMJKB = 2;
-     *
- * - * optional bool NKNHAMFJPDJ = 7; + * optional uint32 world_level = 7; */ - private boolean nKNHAMFJPDJ; + private int worldLevel; /** - * optional bool AIMDKIODIIB = 8; + * optional uint32 event_id = 15; */ - private boolean aIMDKIODIIB; + private int eventId; private SceneNpcMonsterInfo() { } @@ -58,99 +44,25 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 world_level = 1; - * @return whether the worldLevel field is set + * optional uint32 monster_id = 6; + * @return whether the monsterId field is set */ - public boolean hasWorldLevel() { + public boolean hasMonsterId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 world_level = 1; - * @return this - */ - public SceneNpcMonsterInfo clearWorldLevel() { - bitField0_ &= ~0x00000001; - worldLevel = 0; - return this; - } - - /** - * optional uint32 world_level = 1; - * @return the worldLevel - */ - public int getWorldLevel() { - return worldLevel; - } - - /** - * optional uint32 world_level = 1; - * @param value the worldLevel to set - * @return this - */ - public SceneNpcMonsterInfo setWorldLevel(final int value) { - bitField0_ |= 0x00000001; - worldLevel = value; - return this; - } - - /** - * optional uint32 event_id = 5; - * @return whether the eventId field is set - */ - public boolean hasEventId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 event_id = 5; - * @return this - */ - public SceneNpcMonsterInfo clearEventId() { - bitField0_ &= ~0x00000002; - eventId = 0; - return this; - } - - /** - * optional uint32 event_id = 5; - * @return the eventId - */ - public int getEventId() { - return eventId; - } - - /** - * optional uint32 event_id = 5; - * @param value the eventId to set - * @return this - */ - public SceneNpcMonsterInfo setEventId(final int value) { - bitField0_ |= 0x00000002; - eventId = value; - return this; - } - - /** - * optional uint32 monster_id = 10; - * @return whether the monsterId field is set - */ - public boolean hasMonsterId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 monster_id = 10; + * optional uint32 monster_id = 6; * @return this */ public SceneNpcMonsterInfo clearMonsterId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; monsterId = 0; return this; } /** - * optional uint32 monster_id = 10; + * optional uint32 monster_id = 6; * @return the monsterId */ public int getMonsterId() { @@ -158,103 +70,87 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 monster_id = 10; + * optional uint32 monster_id = 6; * @param value the monsterId to set * @return this */ public SceneNpcMonsterInfo setMonsterId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; monsterId = value; return this; } /** - * 
-     * FNCLFLKHFFH HBAAIJKMJKB = 2;
-     *
- * - * optional bool NKNHAMFJPDJ = 7; - * @return whether the nKNHAMFJPDJ field is set + * optional uint32 world_level = 7; + * @return whether the worldLevel field is set */ - public boolean hasNKNHAMFJPDJ() { - return (bitField0_ & 0x00000008) != 0; + public boolean hasWorldLevel() { + return (bitField0_ & 0x00000002) != 0; } /** - * 
-     * FNCLFLKHFFH HBAAIJKMJKB = 2;
-     *
- * - * optional bool NKNHAMFJPDJ = 7; + * optional uint32 world_level = 7; * @return this */ - public SceneNpcMonsterInfo clearNKNHAMFJPDJ() { - bitField0_ &= ~0x00000008; - nKNHAMFJPDJ = false; + public SceneNpcMonsterInfo clearWorldLevel() { + bitField0_ &= ~0x00000002; + worldLevel = 0; return this; } /** - * 
-     * FNCLFLKHFFH HBAAIJKMJKB = 2;
-     *
- * - * optional bool NKNHAMFJPDJ = 7; - * @return the nKNHAMFJPDJ + * optional uint32 world_level = 7; + * @return the worldLevel */ - public boolean getNKNHAMFJPDJ() { - return nKNHAMFJPDJ; + public int getWorldLevel() { + return worldLevel; } /** - * 
-     * FNCLFLKHFFH HBAAIJKMJKB = 2;
-     *
- * - * optional bool NKNHAMFJPDJ = 7; - * @param value the nKNHAMFJPDJ to set + * optional uint32 world_level = 7; + * @param value the worldLevel to set * @return this */ - public SceneNpcMonsterInfo setNKNHAMFJPDJ(final boolean value) { - bitField0_ |= 0x00000008; - nKNHAMFJPDJ = value; + public SceneNpcMonsterInfo setWorldLevel(final int value) { + bitField0_ |= 0x00000002; + worldLevel = value; return this; } /** - * optional bool AIMDKIODIIB = 8; - * @return whether the aIMDKIODIIB field is set + * optional uint32 event_id = 15; + * @return whether the eventId field is set */ - public boolean hasAIMDKIODIIB() { - return (bitField0_ & 0x00000010) != 0; + public boolean hasEventId() { + return (bitField0_ & 0x00000004) != 0; } /** - * optional bool AIMDKIODIIB = 8; + * optional uint32 event_id = 15; * @return this */ - public SceneNpcMonsterInfo clearAIMDKIODIIB() { - bitField0_ &= ~0x00000010; - aIMDKIODIIB = false; + public SceneNpcMonsterInfo clearEventId() { + bitField0_ &= ~0x00000004; + eventId = 0; return this; } /** - * optional bool AIMDKIODIIB = 8; - * @return the aIMDKIODIIB + * optional uint32 event_id = 15; + * @return the eventId */ - public boolean getAIMDKIODIIB() { - return aIMDKIODIIB; + public int getEventId() { + return eventId; } /** - * optional bool AIMDKIODIIB = 8; - * @param value the aIMDKIODIIB to set + * optional uint32 event_id = 15; + * @param value the eventId to set * @return this */ - public SceneNpcMonsterInfo setAIMDKIODIIB(final boolean value) { - bitField0_ |= 0x00000010; - aIMDKIODIIB = value; + public SceneNpcMonsterInfo setEventId(final int value) { + bitField0_ |= 0x00000004; + eventId = value; return this; } @@ -263,11 +159,9 @@ public final class SceneNpcMonsterInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + monsterId = other.monsterId; worldLevel = other.worldLevel; eventId = other.eventId; - monsterId = other.monsterId; - nKNHAMFJPDJ = other.nKNHAMFJPDJ; - aIMDKIODIIB = other.aIMDKIODIIB; } return this; } @@ -278,21 +172,15 @@ public final class SceneNpcMonsterInfoOuterClass { return this; } cachedSize = -1; + if (other.hasMonsterId()) { + setMonsterId(other.monsterId); + } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } if (other.hasEventId()) { setEventId(other.eventId); } - if (other.hasMonsterId()) { - setMonsterId(other.monsterId); - } - if (other.hasNKNHAMFJPDJ()) { - setNKNHAMFJPDJ(other.nKNHAMFJPDJ); - } - if (other.hasAIMDKIODIIB()) { - setAIMDKIODIIB(other.aIMDKIODIIB); - } return this; } @@ -303,11 +191,9 @@ public final class SceneNpcMonsterInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + monsterId = 0; worldLevel = 0; eventId = 0; - monsterId = 0; - nKNHAMFJPDJ = false; - aIMDKIODIIB = false; return this; } @@ -331,34 +217,24 @@ public final class SceneNpcMonsterInfoOuterClass { } SceneNpcMonsterInfo other = (SceneNpcMonsterInfo) o; return bitField0_ == other.bitField0_ - && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasEventId() || eventId == other.eventId) && (!hasMonsterId() || monsterId == other.monsterId) - && (!hasNKNHAMFJPDJ() || nKNHAMFJPDJ == other.nKNHAMFJPDJ) - && (!hasAIMDKIODIIB() || aIMDKIODIIB == other.aIMDKIODIIB); + && (!hasWorldLevel() || worldLevel == other.worldLevel) + && (!hasEventId() || eventId == other.eventId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(worldLevel); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(eventId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(monsterId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 56); - output.writeBoolNoTag(nKNHAMFJPDJ); + output.writeUInt32NoTag(worldLevel); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 64); - output.writeBoolNoTag(aIMDKIODIIB); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(eventId); } } @@ -366,19 +242,13 @@ public final class SceneNpcMonsterInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); } - if ((bitField0_ & 0x00000008) != 0) { - size += 2; + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } - if ((bitField0_ & 0x00000010) != 0) { - size += 2; + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); } return size; } @@ -390,46 +260,28 @@ public final class SceneNpcMonsterInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // worldLevel - worldLevel = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // eventId - eventId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 48: { // monsterId monsterId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 56) { break; } } case 56: { - // nKNHAMFJPDJ - nKNHAMFJPDJ = input.readBool(); - bitField0_ |= 0x00000008; + // worldLevel + worldLevel = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 120) { break; } } - case 64: { - // aIMDKIODIIB - aIMDKIODIIB = input.readBool(); - bitField0_ |= 0x00000010; + case 120: { + // eventId + eventId = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { break; @@ -453,19 +305,13 @@ public final class SceneNpcMonsterInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.eventId, eventId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.monsterId, monsterId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeBool(FieldNames.nKNHAMFJPDJ, nKNHAMFJPDJ); + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.worldLevel, worldLevel); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeBool(FieldNames.aIMDKIODIIB, aIMDKIODIIB); + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.eventId, eventId); } output.endObject(); } @@ -477,12 +323,24 @@ public final class SceneNpcMonsterInfoOuterClass { } 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 440007442: case 1305257111: { if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { worldLevel = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -494,18 +352,6 @@ public final class SceneNpcMonsterInfoOuterClass { if (input.isAtField(FieldNames.eventId)) { if (!input.trySkipNullValue()) { eventId = 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 { @@ -513,28 +359,6 @@ public final class SceneNpcMonsterInfoOuterClass { } break; } - case 1228440783: { - if (input.isAtField(FieldNames.nKNHAMFJPDJ)) { - if (!input.trySkipNullValue()) { - nKNHAMFJPDJ = input.readBool(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1478075920: { - if (input.isAtField(FieldNames.aIMDKIODIIB)) { - if (!input.trySkipNullValue()) { - aIMDKIODIIB = input.readBool(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } default: { input.skipUnknownField(); break; @@ -588,15 +412,11 @@ public final class SceneNpcMonsterInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + 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"); - - static final FieldName monsterId = FieldName.forField("monsterId", "monster_id"); - - static final FieldName nKNHAMFJPDJ = FieldName.forField("NKNHAMFJPDJ"); - - static final FieldName aIMDKIODIIB = FieldName.forField("AIMDKIODIIB"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java index b3a7e1d..8465e83 100644 --- a/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.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.RepeatedString; public final class ScenePropInfoOuterClass { /** @@ -20,33 +19,24 @@ public final class ScenePropInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 create_time_ms = 13; + * optional uint64 create_time_ms = 9; */ private long createTimeMs; /** - * 
-     * PropExtraInfo HBAAIJKMJKB = 2;
-     *
- * - * optional uint32 prop_id = 5; - */ - private int propId; - - /** - * optional uint32 life_time_ms = 10; - */ - private int lifeTimeMs; - - /** - * optional uint32 prop_state = 15; + * optional uint32 prop_state = 2; */ private int propState; /** - * repeated string FBMJHHCFAFK = 14; + * optional uint32 life_time_ms = 4; */ - private final RepeatedString fBMJHHCFAFK = RepeatedString.newEmptyInstance(); + private int lifeTimeMs; + + /** + * optional uint32 prop_id = 15; + */ + private int propId; private ScenePropInfo() { } @@ -59,7 +49,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 13; + * optional uint64 create_time_ms = 9; * @return whether the createTimeMs field is set */ public boolean hasCreateTimeMs() { @@ -67,7 +57,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 13; + * optional uint64 create_time_ms = 9; * @return this */ public ScenePropInfo clearCreateTimeMs() { @@ -77,7 +67,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 13; + * optional uint64 create_time_ms = 9; * @return the createTimeMs */ public long getCreateTimeMs() { @@ -85,7 +75,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 13; + * optional uint64 create_time_ms = 9; * @param value the createTimeMs to set * @return this */ @@ -96,60 +86,44 @@ public final class ScenePropInfoOuterClass { } /** - * 
-     * PropExtraInfo HBAAIJKMJKB = 2;
-     *
- * - * optional uint32 prop_id = 5; - * @return whether the propId field is set + * optional uint32 prop_state = 2; + * @return whether the propState field is set */ - public boolean hasPropId() { + public boolean hasPropState() { return (bitField0_ & 0x00000002) != 0; } /** - * 
-     * PropExtraInfo HBAAIJKMJKB = 2;
-     *
- * - * optional uint32 prop_id = 5; + * optional uint32 prop_state = 2; * @return this */ - public ScenePropInfo clearPropId() { + public ScenePropInfo clearPropState() { bitField0_ &= ~0x00000002; - propId = 0; + propState = 0; return this; } /** - * 
-     * PropExtraInfo HBAAIJKMJKB = 2;
-     *
- * - * optional uint32 prop_id = 5; - * @return the propId + * optional uint32 prop_state = 2; + * @return the propState */ - public int getPropId() { - return propId; + public int getPropState() { + return propState; } /** - * 
-     * PropExtraInfo HBAAIJKMJKB = 2;
-     *
- * - * optional uint32 prop_id = 5; - * @param value the propId to set + * optional uint32 prop_state = 2; + * @param value the propState to set * @return this */ - public ScenePropInfo setPropId(final int value) { + public ScenePropInfo setPropState(final int value) { bitField0_ |= 0x00000002; - propId = value; + propState = value; return this; } /** - * optional uint32 life_time_ms = 10; + * optional uint32 life_time_ms = 4; * @return whether the lifeTimeMs field is set */ public boolean hasLifeTimeMs() { @@ -157,7 +131,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 life_time_ms = 10; + * optional uint32 life_time_ms = 4; * @return this */ public ScenePropInfo clearLifeTimeMs() { @@ -167,7 +141,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 life_time_ms = 10; + * optional uint32 life_time_ms = 4; * @return the lifeTimeMs */ public int getLifeTimeMs() { @@ -175,7 +149,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 life_time_ms = 10; + * optional uint32 life_time_ms = 4; * @param value the lifeTimeMs to set * @return this */ @@ -186,107 +160,39 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_state = 15; - * @return whether the propState field is set + * optional uint32 prop_id = 15; + * @return whether the propId field is set */ - public boolean hasPropState() { + public boolean hasPropId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 prop_state = 15; + * optional uint32 prop_id = 15; * @return this */ - public ScenePropInfo clearPropState() { + public ScenePropInfo clearPropId() { bitField0_ &= ~0x00000008; - propState = 0; + propId = 0; return this; } /** - * optional uint32 prop_state = 15; - * @return the propState + * optional uint32 prop_id = 15; + * @return the propId */ - public int getPropState() { - return propState; + public int getPropId() { + return propId; } /** - * optional uint32 prop_state = 15; - * @param value the propState to set + * optional uint32 prop_id = 15; + * @param value the propId to set * @return this */ - public ScenePropInfo setPropState(final int value) { + public ScenePropInfo setPropId(final int value) { bitField0_ |= 0x00000008; - propState = value; - return this; - } - - /** - * repeated string FBMJHHCFAFK = 14; - * @return whether the fBMJHHCFAFK field is set - */ - public boolean hasFBMJHHCFAFK() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated string FBMJHHCFAFK = 14; - * @return this - */ - public ScenePropInfo clearFBMJHHCFAFK() { - bitField0_ &= ~0x00000010; - fBMJHHCFAFK.clear(); - return this; - } - - /** - * repeated string FBMJHHCFAFK = 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 #getMutableFBMJHHCFAFK()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedString getFBMJHHCFAFK() { - return fBMJHHCFAFK; - } - - /** - * repeated string FBMJHHCFAFK = 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 RepeatedString getMutableFBMJHHCFAFK() { - bitField0_ |= 0x00000010; - return fBMJHHCFAFK; - } - - /** - * repeated string FBMJHHCFAFK = 14; - * @param value the fBMJHHCFAFK to add - * @return this - */ - public ScenePropInfo addFBMJHHCFAFK(final CharSequence value) { - bitField0_ |= 0x00000010; - fBMJHHCFAFK.add(value); - return this; - } - - /** - * repeated string FBMJHHCFAFK = 14; - * @param values the fBMJHHCFAFK to add - * @return this - */ - public ScenePropInfo addAllFBMJHHCFAFK(final CharSequence... values) { - bitField0_ |= 0x00000010; - fBMJHHCFAFK.addAll(values); + propId = value; return this; } @@ -296,10 +202,9 @@ public final class ScenePropInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; createTimeMs = other.createTimeMs; - propId = other.propId; - lifeTimeMs = other.lifeTimeMs; propState = other.propState; - fBMJHHCFAFK.copyFrom(other.fBMJHHCFAFK); + lifeTimeMs = other.lifeTimeMs; + propId = other.propId; } return this; } @@ -313,17 +218,14 @@ public final class ScenePropInfoOuterClass { if (other.hasCreateTimeMs()) { setCreateTimeMs(other.createTimeMs); } - if (other.hasPropId()) { - setPropId(other.propId); + if (other.hasPropState()) { + setPropState(other.propState); } if (other.hasLifeTimeMs()) { setLifeTimeMs(other.lifeTimeMs); } - if (other.hasPropState()) { - setPropState(other.propState); - } - if (other.hasFBMJHHCFAFK()) { - getMutableFBMJHHCFAFK().addAll(other.fBMJHHCFAFK); + if (other.hasPropId()) { + setPropId(other.propId); } return this; } @@ -336,10 +238,9 @@ public final class ScenePropInfoOuterClass { cachedSize = -1; bitField0_ = 0; createTimeMs = 0L; - propId = 0; - lifeTimeMs = 0; propState = 0; - fBMJHHCFAFK.clear(); + lifeTimeMs = 0; + propId = 0; return this; } @@ -350,7 +251,6 @@ public final class ScenePropInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - fBMJHHCFAFK.clear(); return this; } @@ -365,35 +265,28 @@ public final class ScenePropInfoOuterClass { ScenePropInfo other = (ScenePropInfo) o; return bitField0_ == other.bitField0_ && (!hasCreateTimeMs() || createTimeMs == other.createTimeMs) - && (!hasPropId() || propId == other.propId) - && (!hasLifeTimeMs() || lifeTimeMs == other.lifeTimeMs) && (!hasPropState() || propState == other.propState) - && (!hasFBMJHHCFAFK() || fBMJHHCFAFK.equals(other.fBMJHHCFAFK)); + && (!hasLifeTimeMs() || lifeTimeMs == other.lifeTimeMs) + && (!hasPropId() || propId == other.propId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 72); output.writeUInt64NoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(propId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(propState); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(lifeTimeMs); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(propState); - } - if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < fBMJHHCFAFK.length(); i++) { - output.writeRawByte((byte) 114); - output.writeStringNoTag(fBMJHHCFAFK.get(i)); - } + output.writeUInt32NoTag(propId); } } @@ -404,16 +297,13 @@ public final class ScenePropInfoOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(lifeTimeMs); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); - } - if ((bitField0_ & 0x00000010) != 0) { - size += (1 * fBMJHHCFAFK.length()) + ProtoSink.computeRepeatedStringSizeNoTag(fBMJHHCFAFK); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propId); } return size; } @@ -425,25 +315,25 @@ public final class ScenePropInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 72: { // createTimeMs createTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 16) { break; } } - case 40: { - // propId - propId = input.readUInt32(); + case 16: { + // propState + propState = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 32) { break; } } - case 80: { + case 32: { // lifeTimeMs lifeTimeMs = input.readUInt32(); bitField0_ |= 0x00000004; @@ -453,18 +343,10 @@ public final class ScenePropInfoOuterClass { } } case 120: { - // propState - propState = input.readUInt32(); + // propId + propId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { - // fBMJHHCFAFK - tag = input.readRepeatedString(fBMJHHCFAFK, tag); - bitField0_ |= 0x00000010; if (tag != 0) { break; } @@ -490,16 +372,13 @@ public final class ScenePropInfoOuterClass { output.writeUInt64(FieldNames.createTimeMs, createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.propId, propId); + output.writeUInt32(FieldNames.propState, propState); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.lifeTimeMs, lifeTimeMs); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.propState, propState); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedString(FieldNames.fBMJHHCFAFK, fBMJHHCFAFK); + output.writeUInt32(FieldNames.propId, propId); } output.endObject(); } @@ -523,11 +402,11 @@ public final class ScenePropInfoOuterClass { } break; } - case -979804194: - case -309137545: { - if (input.isAtField(FieldNames.propId)) { + case -739191058: + case -1096911691: { + if (input.isAtField(FieldNames.propState)) { if (!input.trySkipNullValue()) { - propId = input.readUInt32(); + propState = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -547,11 +426,11 @@ public final class ScenePropInfoOuterClass { } break; } - case -739191058: - case -1096911691: { - if (input.isAtField(FieldNames.propState)) { + case -979804194: + case -309137545: { + if (input.isAtField(FieldNames.propId)) { if (!input.trySkipNullValue()) { - propState = input.readUInt32(); + propId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -559,17 +438,6 @@ public final class ScenePropInfoOuterClass { } break; } - case -1332546806: { - if (input.isAtField(FieldNames.fBMJHHCFAFK)) { - if (!input.trySkipNullValue()) { - input.readRepeatedString(fBMJHHCFAFK); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } default: { input.skipUnknownField(); break; @@ -624,13 +492,11 @@ public final class ScenePropInfoOuterClass { static class FieldNames { static final FieldName createTimeMs = FieldName.forField("createTimeMs", "create_time_ms"); - static final FieldName propId = FieldName.forField("propId", "prop_id"); + static final FieldName 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 fBMJHHCFAFK = FieldName.forField("FBMJHHCFAFK"); + static final FieldName propId = FieldName.forField("propId", "prop_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java index c37f474..c85d3ab 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 .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_list = 8; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -34,7 +34,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_list = 8; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -42,7 +42,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_list = 8; * @return this */ public SellItemCsReq clearItemCostList() { @@ -52,7 +52,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 9; + * 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. @@ -66,7 +66,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 9; + * 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 @@ -80,7 +80,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_list = 8; * @param value the itemCostList to set * @return this */ @@ -150,7 +150,7 @@ public final class SellItemCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 66); output.writeMessageNoTag(itemCostList); } } @@ -171,7 +171,7 @@ public final class SellItemCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 66: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SellItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SellItemScRspOuterClass.java index 7e45da4..0e785b6 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 = 4; + * optional uint32 retcode = 5; */ private int retcode; /** - * optional .ItemList return_item_list = 13; + * optional .ItemList return_item_list = 12; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; * @return this */ public SellItemScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 13; + * optional .ItemList return_item_list = 12; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -84,7 +84,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 13; + * optional .ItemList return_item_list = 12; * @return this */ public SellItemScRsp clearReturnItemList() { @@ -94,7 +94,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 13; + * optional .ItemList return_item_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -108,7 +108,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 13; + * optional .ItemList return_item_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -122,7 +122,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 13; + * optional .ItemList return_item_list = 12; * @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) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 98); output.writeMessageNoTag(returnItemList); } } @@ -226,16 +226,16 @@ public final class SellItemScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 98) { break; } } - case 106: { + case 98: { // 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 de15cae..296d15e 100644 --- a/src/generated/main/emu/lunarcore/proto/SendMsgCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SendMsgCsReqOuterClass.java @@ -21,27 +21,27 @@ public final class SendMsgCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 emote = 11; + * optional uint32 emote = 15; */ private int emote; /** - * optional .MsgType msg_type = 12; + * optional .MsgType msg_type = 9; */ private int msgType; /** - * optional .ChatType chat_type = 14; + * optional .ChatType chat_type = 11; */ private int chatType; /** - * optional string text = 4; + * optional string text = 13; */ private final Utf8String text = Utf8String.newEmptyInstance(); /** - * repeated uint32 toUid = 6; + * repeated uint32 toUid = 12; */ private final RepeatedInt toUid = RepeatedInt.newEmptyInstance(); @@ -56,7 +56,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 15; * @return whether the emote field is set */ public boolean hasEmote() { @@ -64,7 +64,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 15; * @return this */ public SendMsgCsReq clearEmote() { @@ -74,7 +74,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 15; * @return the emote */ public int getEmote() { @@ -82,7 +82,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 15; * @param value the emote to set * @return this */ @@ -93,7 +93,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .MsgType msg_type = 12; + * optional .MsgType msg_type = 9; * @return whether the msgType field is set */ public boolean hasMsgType() { @@ -101,7 +101,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .MsgType msg_type = 12; + * optional .MsgType msg_type = 9; * @return this */ public SendMsgCsReq clearMsgType() { @@ -111,7 +111,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .MsgType msg_type = 12; + * optional .MsgType msg_type = 9; * @return the msgType */ public MsgTypeOuterClass.MsgType getMsgType() { @@ -144,7 +144,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .MsgType msg_type = 12; + * optional .MsgType msg_type = 9; * @param value the msgType to set * @return this */ @@ -155,7 +155,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .ChatType chat_type = 14; + * optional .ChatType chat_type = 11; * @return whether the chatType field is set */ public boolean hasChatType() { @@ -163,7 +163,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .ChatType chat_type = 14; + * optional .ChatType chat_type = 11; * @return this */ public SendMsgCsReq clearChatType() { @@ -173,7 +173,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .ChatType chat_type = 14; + * optional .ChatType chat_type = 11; * @return the chatType */ public ChatTypeOuterClass.ChatType getChatType() { @@ -206,7 +206,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .ChatType chat_type = 14; + * optional .ChatType chat_type = 11; * @param value the chatType to set * @return this */ @@ -217,7 +217,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 4; + * optional string text = 13; * @return whether the text field is set */ public boolean hasText() { @@ -225,7 +225,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 4; + * optional string text = 13; * @return this */ public SendMsgCsReq clearText() { @@ -235,7 +235,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 4; + * optional string text = 13; * @return the text */ public String getText() { @@ -243,7 +243,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 4; + * optional string text = 13; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -251,7 +251,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 4; + * optional string text = 13; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -260,7 +260,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 4; + * optional string text = 13; * @param value the text to set * @return this */ @@ -271,7 +271,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 4; + * optional string text = 13; * @param value the text to set * @return this */ @@ -282,7 +282,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 toUid = 6; + * repeated uint32 toUid = 12; * @return whether the toUid field is set */ public boolean hasToUid() { @@ -290,7 +290,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 toUid = 6; + * repeated uint32 toUid = 12; * @return this */ public SendMsgCsReq clearToUid() { @@ -300,7 +300,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 toUid = 6; + * repeated uint32 toUid = 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. @@ -314,7 +314,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 toUid = 6; + * repeated uint32 toUid = 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 @@ -328,7 +328,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 toUid = 6; + * repeated uint32 toUid = 12; * @param value the toUid to add * @return this */ @@ -339,7 +339,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 toUid = 6; + * repeated uint32 toUid = 12; * @param values the toUid 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) 88); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(emote); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 72); output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 88); output.writeEnumNoTag(chatType); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 106); output.writeStringNoTag(text); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < toUid.length(); i++) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(toUid.array()[i]); } } @@ -485,16 +485,16 @@ public final class SendMsgCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 120: { // emote emote = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 72) { break; } } - case 96: { + case 72: { // 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 != 112) { + if (tag != 88) { break; } } - case 112: { + case 88: { // 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 != 34) { + if (tag != 106) { break; } } - case 34: { + case 106: { // text input.readString(text); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 50) { + if (tag != 98) { break; } } - case 50: { + case 98: { // toUid [packed=true] input.readPackedUInt32(toUid, tag); bitField0_ |= 0x00000010; @@ -546,7 +546,7 @@ public final class SendMsgCsReqOuterClass { tag = input.readTag(); break; } - case 48: { + case 96: { // toUid [packed=false] tag = input.readRepeatedUInt32(toUid, tag); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java index 6a0d886..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 = 15; + * optional bool paused = 5; */ private boolean paused; @@ -34,7 +34,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 15; + * 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 = 15; + * optional bool paused = 5; * @return this */ public SetClientPausedCsReq clearPaused() { @@ -52,7 +52,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 15; + * optional bool paused = 5; * @return the paused */ public boolean getPaused() { @@ -60,7 +60,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 15; + * 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) 120); + output.writeRawByte((byte) 40); output.writeBoolNoTag(paused); } } @@ -150,7 +150,7 @@ public final class SetClientPausedCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + 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 6b78117..7915fc5 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 = 13; + * optional uint32 retcode = 9; */ private int retcode; /** - * optional bool paused = 14; + * optional bool paused = 5; */ private boolean paused; @@ -39,7 +39,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 9; * @return this */ public SetClientPausedScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 14; + * optional bool paused = 5; * @return whether the paused field is set */ public boolean hasPaused() { @@ -84,7 +84,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 14; + * optional bool paused = 5; * @return this */ public SetClientPausedScRsp clearPaused() { @@ -94,7 +94,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 14; + * optional bool paused = 5; * @return the paused */ public boolean getPaused() { @@ -102,7 +102,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 14; + * optional bool paused = 5; * @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) 104); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 40); output.writeBoolNoTag(paused); } } @@ -205,16 +205,16 @@ public final class SetClientPausedScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 40) { break; } } - case 112: { + case 40: { // paused paused = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayCsReqOuterClass.java index 8261d96..532ccd2 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 = 6; + * optional uint32 birthday = 8; */ private int birthday; @@ -34,7 +34,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 6; + * optional uint32 birthday = 8; * @return whether the birthday field is set */ public boolean hasBirthday() { @@ -42,7 +42,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 6; + * optional uint32 birthday = 8; * @return this */ public SetGameplayBirthdayCsReq clearBirthday() { @@ -52,7 +52,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 6; + * optional uint32 birthday = 8; * @return the birthday */ public int getBirthday() { @@ -60,7 +60,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 6; + * optional uint32 birthday = 8; * @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) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(birthday); } } @@ -150,7 +150,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 64: { // 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 0735da6..a976d7f 100644 --- a/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayScRspOuterClass.java @@ -18,16 +18,16 @@ public final class SetGameplayBirthdayScRspOuterClass { public static final class SetGameplayBirthdayScRsp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 retcode = 2; + */ + private int retcode; + /** * optional uint32 birthday = 12; */ private int birthday; - /** - * optional uint32 retcode = 14; - */ - private int retcode; - private SetGameplayBirthdayScRsp() { } @@ -38,12 +38,49 @@ public final class SetGameplayBirthdayScRspOuterClass { return new SetGameplayBirthdayScRsp(); } + /** + * optional uint32 retcode = 2; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 retcode = 2; + * @return this + */ + public SetGameplayBirthdayScRsp 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 SetGameplayBirthdayScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + /** * optional uint32 birthday = 12; * @return whether the birthday field is set */ public boolean hasBirthday() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -51,7 +88,7 @@ public final class SetGameplayBirthdayScRspOuterClass { * @return this */ public SetGameplayBirthdayScRsp clearBirthday() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; birthday = 0; return this; } @@ -70,45 +107,8 @@ public final class SetGameplayBirthdayScRspOuterClass { * @return this */ public SetGameplayBirthdayScRsp setBirthday(final int value) { - bitField0_ |= 0x00000001; - birthday = value; - return this; - } - - /** - * optional uint32 retcode = 14; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 14; - * @return this - */ - public SetGameplayBirthdayScRsp clearRetcode() { - bitField0_ &= ~0x00000002; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 14; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 14; - * @param value the retcode to set - * @return this - */ - public SetGameplayBirthdayScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - retcode = value; + birthday = value; return this; } @@ -117,8 +117,8 @@ public final class SetGameplayBirthdayScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - birthday = other.birthday; retcode = other.retcode; + birthday = other.birthday; } return this; } @@ -129,12 +129,12 @@ public final class SetGameplayBirthdayScRspOuterClass { return this; } cachedSize = -1; - if (other.hasBirthday()) { - setBirthday(other.birthday); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasBirthday()) { + setBirthday(other.birthday); + } return this; } @@ -145,8 +145,8 @@ public final class SetGameplayBirthdayScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - birthday = 0; retcode = 0; + birthday = 0; return this; } @@ -170,19 +170,19 @@ public final class SetGameplayBirthdayScRspOuterClass { } SetGameplayBirthdayScRsp other = (SetGameplayBirthdayScRsp) o; return bitField0_ == other.bitField0_ - && (!hasBirthday() || birthday == other.birthday) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasBirthday() || birthday == other.birthday); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(birthday); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(birthday); } } @@ -190,10 +190,10 @@ public final class SetGameplayBirthdayScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(birthday); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(birthday); } return size; } @@ -205,18 +205,18 @@ public final class SetGameplayBirthdayScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { - // birthday - birthday = input.readUInt32(); + case 16: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 96) { break; } } - case 112: { - // retcode - retcode = input.readUInt32(); + case 96: { + // birthday + birthday = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class SetGameplayBirthdayScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.birthday, birthday); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.birthday, birthday); } output.endObject(); } @@ -256,10 +256,10 @@ public final class SetGameplayBirthdayScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1069376125: { - if (input.isAtField(FieldNames.birthday)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - birthday = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,10 +267,10 @@ public final class SetGameplayBirthdayScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 1069376125: { + if (input.isAtField(FieldNames.birthday)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + birthday = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public final class SetGameplayBirthdayScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName birthday = FieldName.forField("birthday"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName birthday = FieldName.forField("birthday"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java index b6ed877..eb349ee 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 = 7; + * optional uint32 id = 9; */ private int id; @@ -34,7 +34,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 7; + * optional uint32 id = 9; * @return whether the id field is set */ public boolean hasId() { @@ -42,7 +42,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 7; + * optional uint32 id = 9; * @return this */ public SetHeadIconCsReq clearId() { @@ -52,7 +52,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 7; + * optional uint32 id = 9; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 7; + * optional uint32 id = 9; * @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) 56); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public final class SetHeadIconCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 72: { // 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 4d6a057..c26b07a 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java @@ -19,14 +19,14 @@ public final class SetHeadIconScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional uint32 id = 11; + * optional uint32 current_head_icon_id = 14; */ - private int id; + private int currentHeadIconId; private SetHeadIconScRsp() { } @@ -39,7 +39,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @return this */ public SetHeadIconScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -76,39 +76,39 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 id = 11; - * @return whether the id field is set + * optional uint32 current_head_icon_id = 14; + * @return whether the currentHeadIconId field is set */ - public boolean hasId() { + public boolean hasCurrentHeadIconId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 id = 11; + * optional uint32 current_head_icon_id = 14; * @return this */ - public SetHeadIconScRsp clearId() { + public SetHeadIconScRsp clearCurrentHeadIconId() { bitField0_ &= ~0x00000002; - id = 0; + currentHeadIconId = 0; return this; } /** - * optional uint32 id = 11; - * @return the id + * optional uint32 current_head_icon_id = 14; + * @return the currentHeadIconId */ - public int getId() { - return id; + public int getCurrentHeadIconId() { + return currentHeadIconId; } /** - * optional uint32 id = 11; - * @param value the id to set + * optional uint32 current_head_icon_id = 14; + * @param value the currentHeadIconId to set * @return this */ - public SetHeadIconScRsp setId(final int value) { + public SetHeadIconScRsp setCurrentHeadIconId(final int value) { bitField0_ |= 0x00000002; - id = value; + currentHeadIconId = value; return this; } @@ -118,7 +118,7 @@ public final class SetHeadIconScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - id = other.id; + currentHeadIconId = other.currentHeadIconId; } return this; } @@ -132,8 +132,8 @@ public final class SetHeadIconScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasId()) { - setId(other.id); + if (other.hasCurrentHeadIconId()) { + setCurrentHeadIconId(other.currentHeadIconId); } return this; } @@ -146,7 +146,7 @@ public final class SetHeadIconScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - id = 0; + currentHeadIconId = 0; return this; } @@ -171,18 +171,18 @@ public final class SetHeadIconScRspOuterClass { SetHeadIconScRsp other = (SetHeadIconScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasId() || id == other.id); + && (!hasCurrentHeadIconId() || currentHeadIconId == other.currentHeadIconId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(id); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(currentHeadIconId); } } @@ -193,7 +193,7 @@ public final class SetHeadIconScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(currentHeadIconId); } return size; } @@ -205,18 +205,18 @@ public final class SetHeadIconScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 112) { break; } } - case 88: { - // id - id = input.readUInt32(); + case 112: { + // currentHeadIconId + currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -244,7 +244,7 @@ public final class SetHeadIconScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.currentHeadIconId, currentHeadIconId); } output.endObject(); } @@ -267,10 +267,11 @@ public final class SetHeadIconScRspOuterClass { } break; } - case 3355: { - if (input.isAtField(FieldNames.id)) { + case 2107487181: + case -1003133880: { + if (input.isAtField(FieldNames.currentHeadIconId)) { if (!input.trySkipNullValue()) { - id = input.readUInt32(); + currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,7 +334,7 @@ public final class SetHeadIconScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName id = FieldName.forField("id"); + static final FieldName currentHeadIconId = FieldName.forField("currentHeadIconId", "current_head_icon_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeCsReqOuterClass.java index fc665c0..6780cc6 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 = 6; + * optional .HeroBasicType basic_type = 2; */ private int basicType; @@ -34,7 +34,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { } /** - * optional .HeroBasicType basic_type = 6; + * optional .HeroBasicType basic_type = 2; * @return whether the basicType field is set */ public boolean hasBasicType() { @@ -42,7 +42,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { } /** - * optional .HeroBasicType basic_type = 6; + * optional .HeroBasicType basic_type = 2; * @return this */ public SetHeroBasicTypeCsReq clearBasicType() { @@ -52,7 +52,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { } /** - * optional .HeroBasicType basic_type = 6; + * optional .HeroBasicType basic_type = 2; * @return the basicType */ public HeroBasicTypeOuterClass.HeroBasicType getBasicType() { @@ -85,7 +85,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { } /** - * optional .HeroBasicType basic_type = 6; + * optional .HeroBasicType basic_type = 2; * @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) 48); + output.writeRawByte((byte) 16); output.writeEnumNoTag(basicType); } } @@ -175,7 +175,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 16: { // 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 a996478..8b576cf 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 = 3; + * optional uint32 retcode = 13; */ private int retcode; /** - * optional .HeroBasicType basic_type = 6; + * optional .HeroBasicType basic_type = 7; */ private int basicType; @@ -39,7 +39,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 13; * @return this */ public SetHeroBasicTypeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 13; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional .HeroBasicType basic_type = 6; + * optional .HeroBasicType basic_type = 7; * @return whether the basicType field is set */ public boolean hasBasicType() { @@ -84,7 +84,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional .HeroBasicType basic_type = 6; + * optional .HeroBasicType basic_type = 7; * @return this */ public SetHeroBasicTypeScRsp clearBasicType() { @@ -94,7 +94,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional .HeroBasicType basic_type = 6; + * optional .HeroBasicType basic_type = 7; * @return the basicType */ public HeroBasicTypeOuterClass.HeroBasicType getBasicType() { @@ -127,7 +127,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional .HeroBasicType basic_type = 6; + * optional .HeroBasicType basic_type = 7; * @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) 24); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 56); output.writeEnumNoTag(basicType); } } @@ -230,16 +230,16 @@ public final class SetHeroBasicTypeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 104: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 56) { break; } } - case 48: { + case 56: { // 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 1c4d3dc..998d0dc 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 = 1; */ private int index; /** - * optional string name = 6; + * optional string name = 8; */ private final Utf8String name = Utf8String.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 8; + * optional uint32 index = 1; * @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 = 1; * @return this */ public SetLineupNameCsReq clearIndex() { @@ -58,7 +58,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 8; + * optional uint32 index = 1; * @return the index */ public int getIndex() { @@ -66,7 +66,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 8; + * optional uint32 index = 1; * @param value the index to set * @return this */ @@ -77,7 +77,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 6; + * optional string name = 8; * @return whether the name field is set */ public boolean hasName() { @@ -85,7 +85,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 6; + * optional string name = 8; * @return this */ public SetLineupNameCsReq clearName() { @@ -95,7 +95,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 6; + * optional string name = 8; * @return the name */ public String getName() { @@ -103,7 +103,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 6; + * optional string name = 8; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -111,7 +111,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 6; + * optional string name = 8; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -120,7 +120,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 6; + * optional string name = 8; * @param value the name to set * @return this */ @@ -131,7 +131,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 6; + * optional string name = 8; * @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) 8); output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 66); output.writeStringNoTag(name); } } @@ -235,16 +235,16 @@ public final class SetLineupNameCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 8: { // index index = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 66) { break; } } - case 50: { + case 66: { // 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 8b55375..ba36d47 100644 --- a/src/generated/main/emu/lunarcore/proto/SetLineupNameScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetLineupNameScRspOuterClass.java @@ -20,17 +20,17 @@ public final class SetLineupNameScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional uint32 index = 15; + * optional uint32 index = 14; */ private int index; /** - * optional string name = 7; + * optional string name = 11; */ private final Utf8String name = Utf8String.newEmptyInstance(); @@ -45,7 +45,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return this */ public SetLineupNameScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 index = 15; + * optional uint32 index = 14; * @return whether the index field is set */ public boolean hasIndex() { @@ -90,7 +90,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 index = 15; + * optional uint32 index = 14; * @return this */ public SetLineupNameScRsp clearIndex() { @@ -100,7 +100,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 index = 15; + * optional uint32 index = 14; * @return the index */ public int getIndex() { @@ -108,7 +108,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 index = 15; + * optional uint32 index = 14; * @param value the index to set * @return this */ @@ -119,7 +119,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 7; + * optional string name = 11; * @return whether the name field is set */ public boolean hasName() { @@ -127,7 +127,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 7; + * optional string name = 11; * @return this */ public SetLineupNameScRsp clearName() { @@ -137,7 +137,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 7; + * optional string name = 11; * @return the name */ public String getName() { @@ -145,7 +145,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 7; + * optional string name = 11; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -153,7 +153,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 7; + * optional string name = 11; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -162,7 +162,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 7; + * optional string name = 11; * @param value the name to set * @return this */ @@ -173,7 +173,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 7; + * optional string name = 11; * @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) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 90); output.writeStringNoTag(name); } } @@ -290,25 +290,25 @@ public final class SetLineupNameScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { + case 112: { // index index = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 90) { break; } } - case 58: { + case 90: { // 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 c2af212..3c1cb8d 100644 --- a/src/generated/main/emu/lunarcore/proto/SetNicknameCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetNicknameCsReqOuterClass.java @@ -20,12 +20,7 @@ public final class SetNicknameCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool PLHEIKJBKKL = 3; - */ - private boolean pLHEIKJBKKL; - - /** - * optional string nickname = 13; + * optional string nickname = 12; */ private final Utf8String nickname = Utf8String.newEmptyInstance(); @@ -40,62 +35,25 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional bool PLHEIKJBKKL = 3; - * @return whether the pLHEIKJBKKL field is set + * optional string nickname = 12; + * @return whether the nickname field is set */ - public boolean hasPLHEIKJBKKL() { + public boolean hasNickname() { return (bitField0_ & 0x00000001) != 0; } /** - * optional bool PLHEIKJBKKL = 3; - * @return this - */ - public SetNicknameCsReq clearPLHEIKJBKKL() { - bitField0_ &= ~0x00000001; - pLHEIKJBKKL = false; - return this; - } - - /** - * optional bool PLHEIKJBKKL = 3; - * @return the pLHEIKJBKKL - */ - public boolean getPLHEIKJBKKL() { - return pLHEIKJBKKL; - } - - /** - * optional bool PLHEIKJBKKL = 3; - * @param value the pLHEIKJBKKL to set - * @return this - */ - public SetNicknameCsReq setPLHEIKJBKKL(final boolean value) { - bitField0_ |= 0x00000001; - pLHEIKJBKKL = value; - return this; - } - - /** - * optional string nickname = 13; - * @return whether the nickname field is set - */ - public boolean hasNickname() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional string nickname = 13; + * optional string nickname = 12; * @return this */ public SetNicknameCsReq clearNickname() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; nickname.clear(); return this; } /** - * optional string nickname = 13; + * optional string nickname = 12; * @return the nickname */ public String getNickname() { @@ -103,7 +61,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 13; + * optional string nickname = 12; * @return internal {@code Utf8String} representation of nickname for reading */ public Utf8String getNicknameBytes() { @@ -111,32 +69,32 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 13; + * optional string nickname = 12; * @return internal {@code Utf8String} representation of nickname for modifications */ public Utf8String getMutableNicknameBytes() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return this.nickname; } /** - * optional string nickname = 13; + * optional string nickname = 12; * @param value the nickname to set * @return this */ public SetNicknameCsReq setNickname(final CharSequence value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; nickname.copyFrom(value); return this; } /** - * optional string nickname = 13; + * optional string nickname = 12; * @param value the nickname to set * @return this */ public SetNicknameCsReq setNickname(final Utf8String value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; nickname.copyFrom(value); return this; } @@ -146,7 +104,6 @@ public final class SetNicknameCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - pLHEIKJBKKL = other.pLHEIKJBKKL; nickname.copyFrom(other.nickname); } return this; @@ -158,9 +115,6 @@ public final class SetNicknameCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasPLHEIKJBKKL()) { - setPLHEIKJBKKL(other.pLHEIKJBKKL); - } if (other.hasNickname()) { getMutableNicknameBytes().copyFrom(other.nickname); } @@ -174,7 +128,6 @@ public final class SetNicknameCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - pLHEIKJBKKL = false; nickname.clear(); return this; } @@ -200,18 +153,13 @@ public final class SetNicknameCsReqOuterClass { } SetNicknameCsReq other = (SetNicknameCsReq) o; return bitField0_ == other.bitField0_ - && (!hasPLHEIKJBKKL() || pLHEIKJBKKL == other.pLHEIKJBKKL) && (!hasNickname() || nickname.equals(other.nickname)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeBoolNoTag(pLHEIKJBKKL); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 98); output.writeStringNoTag(nickname); } } @@ -220,9 +168,6 @@ public final class SetNicknameCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 2; - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(nickname); } return size; @@ -235,19 +180,10 @@ public final class SetNicknameCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // pLHEIKJBKKL - pLHEIKJBKKL = input.readBool(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { + case 98: { // nickname input.readString(nickname); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { break; @@ -271,9 +207,6 @@ public final class SetNicknameCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeBool(FieldNames.pLHEIKJBKKL, pLHEIKJBKKL); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeString(FieldNames.nickname, nickname); } output.endObject(); @@ -286,22 +219,11 @@ public final class SetNicknameCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1510608057: { - if (input.isAtField(FieldNames.pLHEIKJBKKL)) { - if (!input.trySkipNullValue()) { - pLHEIKJBKKL = input.readBool(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 70690926: { if (input.isAtField(FieldNames.nickname)) { if (!input.trySkipNullValue()) { input.readString(nickname); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -361,8 +283,6 @@ public final class SetNicknameCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName pLHEIKJBKKL = FieldName.forField("PLHEIKJBKKL"); - static final FieldName nickname = FieldName.forField("nickname"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SetSignatureCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetSignatureCsReqOuterClass.java index 651002c..7d70254 100644 --- a/src/generated/main/emu/lunarcore/proto/SetSignatureCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetSignatureCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class SetSignatureCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional string signature = 3; + * optional string signature = 14; */ private final Utf8String signature = Utf8String.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 3; + * optional string signature = 14; * @return whether the signature field is set */ public boolean hasSignature() { @@ -43,7 +43,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 3; + * optional string signature = 14; * @return this */ public SetSignatureCsReq clearSignature() { @@ -53,7 +53,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 3; + * optional string signature = 14; * @return the signature */ public String getSignature() { @@ -61,7 +61,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 3; + * optional string signature = 14; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -69,7 +69,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 3; + * optional string signature = 14; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -78,7 +78,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 3; + * optional string signature = 14; * @param value the signature to set * @return this */ @@ -89,7 +89,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 3; + * optional string signature = 14; * @param value the signature to set * @return this */ @@ -159,7 +159,7 @@ public final class SetSignatureCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 114); output.writeStringNoTag(signature); } } @@ -180,7 +180,7 @@ public final class SetSignatureCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { + case 114: { // signature input.readString(signature); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SetSignatureScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetSignatureScRspOuterClass.java index 8a57671..c315136 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 = 2; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional string signature = 3; + * optional string signature = 15; */ private final Utf8String signature = Utf8String.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 1; * @return this */ public SetSignatureScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 3; + * optional string signature = 15; * @return whether the signature field is set */ public boolean hasSignature() { @@ -85,7 +85,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 3; + * optional string signature = 15; * @return this */ public SetSignatureScRsp clearSignature() { @@ -95,7 +95,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 3; + * optional string signature = 15; * @return the signature */ public String getSignature() { @@ -103,7 +103,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 3; + * optional string signature = 15; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -111,7 +111,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 3; + * optional string signature = 15; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -120,7 +120,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 3; + * optional string signature = 15; * @param value the signature to set * @return this */ @@ -131,7 +131,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 3; + * optional string signature = 15; * @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) 16); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 122); output.writeStringNoTag(signature); } } @@ -235,16 +235,16 @@ public final class SetSignatureScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 122) { break; } } - case 26: { + case 122: { // 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 895157e..e6fc960 100644 --- a/src/generated/main/emu/lunarcore/proto/ShopOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ShopOuterClass.java @@ -20,37 +20,37 @@ public final class ShopOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 1; - */ - private long beginTime; - - /** - * optional int64 end_time = 2; - */ - private long endTime; - - /** - * optional uint64 city_taken_level_reward = 14; + * optional uint64 city_taken_level_reward = 11; */ private long cityTakenLevelReward; /** - * optional uint32 city_exp = 5; + * optional sint64 end_time = 10; */ - private int cityExp; + private long endTime; /** - * optional uint32 shop_id = 6; + * optional sint64 begin_time = 15; */ - private int shopId; + private long beginTime; /** - * optional uint32 city_level = 8; + * optional uint32 city_level = 4; */ private int cityLevel; /** - * repeated .Goods goods_list = 3; + * optional uint32 shop_id = 5; + */ + private int shopId; + + /** + * optional uint32 city_exp = 8; + */ + private int cityExp; + + /** + * repeated .Goods goods_list = 13; */ private final RepeatedMessage goodsList = RepeatedMessage.newEmptyInstance(GoodsOuterClass.Goods.getFactory()); @@ -65,44 +65,44 @@ public final class ShopOuterClass { } /** - * optional int64 begin_time = 1; - * @return whether the beginTime field is set + * optional uint64 city_taken_level_reward = 11; + * @return whether the cityTakenLevelReward field is set */ - public boolean hasBeginTime() { + public boolean hasCityTakenLevelReward() { return (bitField0_ & 0x00000001) != 0; } /** - * optional int64 begin_time = 1; + * optional uint64 city_taken_level_reward = 11; * @return this */ - public Shop clearBeginTime() { + public Shop clearCityTakenLevelReward() { bitField0_ &= ~0x00000001; - beginTime = 0L; + cityTakenLevelReward = 0L; return this; } /** - * optional int64 begin_time = 1; - * @return the beginTime + * optional uint64 city_taken_level_reward = 11; + * @return the cityTakenLevelReward */ - public long getBeginTime() { - return beginTime; + public long getCityTakenLevelReward() { + return cityTakenLevelReward; } /** - * optional int64 begin_time = 1; - * @param value the beginTime to set + * optional uint64 city_taken_level_reward = 11; + * @param value the cityTakenLevelReward to set * @return this */ - public Shop setBeginTime(final long value) { + public Shop setCityTakenLevelReward(final long value) { bitField0_ |= 0x00000001; - beginTime = value; + cityTakenLevelReward = value; return this; } /** - * optional int64 end_time = 2; + * optional sint64 end_time = 10; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -110,7 +110,7 @@ public final class ShopOuterClass { } /** - * optional int64 end_time = 2; + * optional sint64 end_time = 10; * @return this */ public Shop clearEndTime() { @@ -120,7 +120,7 @@ public final class ShopOuterClass { } /** - * optional int64 end_time = 2; + * optional sint64 end_time = 10; * @return the endTime */ public long getEndTime() { @@ -128,7 +128,7 @@ public final class ShopOuterClass { } /** - * optional int64 end_time = 2; + * optional sint64 end_time = 10; * @param value the endTime to set * @return this */ @@ -139,81 +139,81 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 14; - * @return whether the cityTakenLevelReward field is set + * optional sint64 begin_time = 15; + * @return whether the beginTime field is set */ - public boolean hasCityTakenLevelReward() { + public boolean hasBeginTime() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint64 city_taken_level_reward = 14; + * optional sint64 begin_time = 15; * @return this */ - public Shop clearCityTakenLevelReward() { + public Shop clearBeginTime() { bitField0_ &= ~0x00000004; - cityTakenLevelReward = 0L; + beginTime = 0L; return this; } /** - * optional uint64 city_taken_level_reward = 14; - * @return the cityTakenLevelReward + * optional sint64 begin_time = 15; + * @return the beginTime */ - public long getCityTakenLevelReward() { - return cityTakenLevelReward; + public long getBeginTime() { + return beginTime; } /** - * optional uint64 city_taken_level_reward = 14; - * @param value the cityTakenLevelReward to set + * optional sint64 begin_time = 15; + * @param value the beginTime to set * @return this */ - public Shop setCityTakenLevelReward(final long value) { + public Shop setBeginTime(final long value) { bitField0_ |= 0x00000004; - cityTakenLevelReward = value; + beginTime = value; return this; } /** - * optional uint32 city_exp = 5; - * @return whether the cityExp field is set + * optional uint32 city_level = 4; + * @return whether the cityLevel field is set */ - public boolean hasCityExp() { + public boolean hasCityLevel() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 city_exp = 5; + * optional uint32 city_level = 4; * @return this */ - public Shop clearCityExp() { + public Shop clearCityLevel() { bitField0_ &= ~0x00000008; - cityExp = 0; + cityLevel = 0; return this; } /** - * optional uint32 city_exp = 5; - * @return the cityExp + * optional uint32 city_level = 4; + * @return the cityLevel */ - public int getCityExp() { - return cityExp; + public int getCityLevel() { + return cityLevel; } /** - * optional uint32 city_exp = 5; - * @param value the cityExp to set + * optional uint32 city_level = 4; + * @param value the cityLevel to set * @return this */ - public Shop setCityExp(final int value) { + public Shop setCityLevel(final int value) { bitField0_ |= 0x00000008; - cityExp = value; + cityLevel = value; return this; } /** - * optional uint32 shop_id = 6; + * optional uint32 shop_id = 5; * @return whether the shopId field is set */ public boolean hasShopId() { @@ -221,7 +221,7 @@ public final class ShopOuterClass { } /** - * optional uint32 shop_id = 6; + * optional uint32 shop_id = 5; * @return this */ public Shop clearShopId() { @@ -231,7 +231,7 @@ public final class ShopOuterClass { } /** - * optional uint32 shop_id = 6; + * optional uint32 shop_id = 5; * @return the shopId */ public int getShopId() { @@ -239,7 +239,7 @@ public final class ShopOuterClass { } /** - * optional uint32 shop_id = 6; + * optional uint32 shop_id = 5; * @param value the shopId to set * @return this */ @@ -250,44 +250,44 @@ public final class ShopOuterClass { } /** - * optional uint32 city_level = 8; - * @return whether the cityLevel field is set + * optional uint32 city_exp = 8; + * @return whether the cityExp field is set */ - public boolean hasCityLevel() { + public boolean hasCityExp() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 city_level = 8; + * optional uint32 city_exp = 8; * @return this */ - public Shop clearCityLevel() { + public Shop clearCityExp() { bitField0_ &= ~0x00000020; - cityLevel = 0; + cityExp = 0; return this; } /** - * optional uint32 city_level = 8; - * @return the cityLevel + * optional uint32 city_exp = 8; + * @return the cityExp */ - public int getCityLevel() { - return cityLevel; + public int getCityExp() { + return cityExp; } /** - * optional uint32 city_level = 8; - * @param value the cityLevel to set + * optional uint32 city_exp = 8; + * @param value the cityExp to set * @return this */ - public Shop setCityLevel(final int value) { + public Shop setCityExp(final int value) { bitField0_ |= 0x00000020; - cityLevel = value; + cityExp = value; return this; } /** - * repeated .Goods goods_list = 3; + * repeated .Goods goods_list = 13; * @return whether the goodsList field is set */ public boolean hasGoodsList() { @@ -295,7 +295,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 3; + * repeated .Goods goods_list = 13; * @return this */ public Shop clearGoodsList() { @@ -305,7 +305,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 3; + * repeated .Goods goods_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. @@ -319,7 +319,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 3; + * repeated .Goods goods_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 @@ -333,7 +333,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 3; + * repeated .Goods goods_list = 13; * @param value the goodsList to add * @return this */ @@ -344,7 +344,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 3; + * repeated .Goods goods_list = 13; * @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; cityTakenLevelReward = other.cityTakenLevelReward; - cityExp = other.cityExp; - shopId = other.shopId; + endTime = other.endTime; + beginTime = other.beginTime; cityLevel = other.cityLevel; + shopId = other.shopId; + cityExp = other.cityExp; goodsList.copyFrom(other.goodsList); } return this; @@ -376,23 +376,23 @@ public final class ShopOuterClass { return this; } cachedSize = -1; - if (other.hasBeginTime()) { - setBeginTime(other.beginTime); + if (other.hasCityTakenLevelReward()) { + setCityTakenLevelReward(other.cityTakenLevelReward); } if (other.hasEndTime()) { setEndTime(other.endTime); } - if (other.hasCityTakenLevelReward()) { - setCityTakenLevelReward(other.cityTakenLevelReward); + if (other.hasBeginTime()) { + setBeginTime(other.beginTime); } - if (other.hasCityExp()) { - setCityExp(other.cityExp); + if (other.hasCityLevel()) { + setCityLevel(other.cityLevel); } if (other.hasShopId()) { setShopId(other.shopId); } - if (other.hasCityLevel()) { - setCityLevel(other.cityLevel); + if (other.hasCityExp()) { + setCityExp(other.cityExp); } if (other.hasGoodsList()) { getMutableGoodsList().addAll(other.goodsList); @@ -407,12 +407,12 @@ public final class ShopOuterClass { } cachedSize = -1; bitField0_ = 0; - beginTime = 0L; - endTime = 0L; cityTakenLevelReward = 0L; - cityExp = 0; - shopId = 0; + endTime = 0L; + beginTime = 0L; cityLevel = 0; + shopId = 0; + cityExp = 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) && (!hasCityTakenLevelReward() || cityTakenLevelReward == other.cityTakenLevelReward) - && (!hasCityExp() || cityExp == other.cityExp) - && (!hasShopId() || shopId == other.shopId) + && (!hasEndTime() || endTime == other.endTime) + && (!hasBeginTime() || beginTime == other.beginTime) && (!hasCityLevel() || cityLevel == other.cityLevel) + && (!hasShopId() || shopId == other.shopId) + && (!hasCityExp() || cityExp == other.cityExp) && (!hasGoodsList() || goodsList.equals(other.goodsList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeInt64NoTag(beginTime); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeInt64NoTag(endTime); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 88); output.writeUInt64NoTag(cityTakenLevelReward); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 80); + output.writeSInt64NoTag(endTime); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeSInt64NoTag(beginTime); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(cityExp); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(cityLevel); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(shopId); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 64); - output.writeUInt32NoTag(cityLevel); + output.writeUInt32NoTag(cityExp); } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < goodsList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 106); output.writeMessageNoTag(goodsList.get(i)); } } @@ -485,22 +485,22 @@ public final class ShopOuterClass { 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_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt64SizeNoTag(cityTakenLevelReward); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeSInt64SizeNoTag(endTime); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeSInt64SizeNoTag(beginTime); + } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cityExp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cityLevel); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cityLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cityExp); } if ((bitField0_ & 0x00000040) != 0) { size += (1 * goodsList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(goodsList); @@ -515,43 +515,43 @@ public final class ShopOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // beginTime - beginTime = input.readInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { - // endTime - endTime = input.readInt64(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 88: { // cityTakenLevelReward cityTakenLevelReward = input.readUInt64(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // endTime + endTime = input.readSInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // beginTime + beginTime = input.readSInt64(); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // cityLevel + cityLevel = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); if (tag != 40) { break; } } case 40: { - // cityExp - cityExp = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { // shopId shopId = input.readUInt32(); bitField0_ |= 0x00000010; @@ -561,15 +561,15 @@ public final class ShopOuterClass { } } case 64: { - // cityLevel - cityLevel = input.readUInt32(); + // cityExp + cityExp = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 26) { + if (tag != 106) { break; } } - case 26: { + case 106: { // goodsList tag = input.readRepeatedMessage(goodsList, tag); bitField0_ |= 0x00000040; @@ -595,22 +595,22 @@ public final class ShopOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.beginTime, beginTime); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeInt64(FieldNames.endTime, endTime); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt64(FieldNames.cityTakenLevelReward, cityTakenLevelReward); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeSInt64(FieldNames.endTime, endTime); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeSInt64(FieldNames.beginTime, beginTime); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.cityExp, cityExp); + output.writeUInt32(FieldNames.cityLevel, cityLevel); } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.shopId, shopId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.cityLevel, cityLevel); + output.writeUInt32(FieldNames.cityExp, cityExp); } 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 -877911017: + case -1581226986: { + if (input.isAtField(FieldNames.cityTakenLevelReward)) { if (!input.trySkipNullValue()) { - beginTime = input.readInt64(); + cityTakenLevelReward = input.readUInt64(); bitField0_ |= 0x00000001; } } else { @@ -641,7 +641,7 @@ public final class ShopOuterClass { case 1725551537: { if (input.isAtField(FieldNames.endTime)) { if (!input.trySkipNullValue()) { - endTime = input.readInt64(); + endTime = input.readSInt64(); bitField0_ |= 0x00000002; } } else { @@ -649,11 +649,11 @@ public final class ShopOuterClass { } break; } - case -877911017: - case -1581226986: { - if (input.isAtField(FieldNames.cityTakenLevelReward)) { + case -1072839914: + case 1112183971: { + if (input.isAtField(FieldNames.beginTime)) { if (!input.trySkipNullValue()) { - cityTakenLevelReward = input.readUInt64(); + beginTime = input.readSInt64(); bitField0_ |= 0x00000004; } } else { @@ -661,11 +661,11 @@ public final class ShopOuterClass { } break; } - case 785415346: - case -1421171383: { - if (input.isAtField(FieldNames.cityExp)) { + case -1124188967: + case 59808688: { + if (input.isAtField(FieldNames.cityLevel)) { if (!input.trySkipNullValue()) { - cityExp = input.readUInt32(); + cityLevel = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -685,11 +685,11 @@ public final class ShopOuterClass { } break; } - case -1124188967: - case 59808688: { - if (input.isAtField(FieldNames.cityLevel)) { + case 785415346: + case -1421171383: { + if (input.isAtField(FieldNames.cityExp)) { if (!input.trySkipNullValue()) { - cityLevel = input.readUInt32(); + cityExp = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -761,17 +761,17 @@ 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 cityTakenLevelReward = FieldName.forField("cityTakenLevelReward", "city_taken_level_reward"); static final FieldName endTime = FieldName.forField("endTime", "end_time"); - static final FieldName cityTakenLevelReward = FieldName.forField("cityTakenLevelReward", "city_taken_level_reward"); + static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); - static final FieldName cityExp = FieldName.forField("cityExp", "city_exp"); + static final FieldName cityLevel = FieldName.forField("cityLevel", "city_level"); static final FieldName shopId = FieldName.forField("shopId", "shop_id"); - static final FieldName cityLevel = FieldName.forField("cityLevel", "city_level"); + static final FieldName cityExp = FieldName.forField("cityExp", "city_exp"); 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 11cf065..ccbb45a 100644 --- a/src/generated/main/emu/lunarcore/proto/SimpleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SimpleInfoOuterClass.java @@ -20,69 +20,69 @@ public final class SimpleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 last_active_time = 8; + * optional int64 last_active_time = 14; */ private long lastActiveTime; /** - * optional uint32 level = 1; - */ - private int level; - - /** - * optional uint32 JCKIEMDALOB = 7; - */ - private int jCKIEMDALOB; - - /** - * optional uint32 uid = 13; - */ - private int uid; - - /** - * optional uint32 profile_picture = 15; + * optional uint32 profile_picture = 1; */ private int profilePicture; /** - * optional .FriendOnlineStatus online_status = 11; + * optional uint32 uid = 2; + */ + private int uid; + + /** + * optional uint32 level = 3; + */ + private int level; + + /** + * optional uint32 KBLFCBBJKOA = 6; + */ + private int kBLFCBBJKOA; + + /** + * optional .FriendOnlineStatus online_status = 7; */ private int onlineStatus; /** - * optional .PlatformType platform_type = 14; + * optional .PlatformType platform_type = 11; */ private int platformType; /** - * optional bool KCKLEMNIDNK = 4; + * optional bool HACOPLBOGPN = 8; */ - private boolean kCKLEMNIDNK; + private boolean hACOPLBOGPN; /** - * optional .FriendAvatarInfo friend_avatar_info = 12; + * optional .FriendAvatarInfo friend_avatar_info = 5; */ private final FriendAvatarInfoOuterClass.FriendAvatarInfo friendAvatarInfo = FriendAvatarInfoOuterClass.FriendAvatarInfo.newInstance(); /** - * optional string CHFJJPIKGCA = 3; + * optional string BEBEMMGFELC = 4; */ - private final Utf8String cHFJJPIKGCA = Utf8String.newEmptyInstance(); + private final Utf8String bEBEMMGFELC = Utf8String.newEmptyInstance(); /** - * optional string BMMMNJEPNKE = 5; + * optional string FKNMNLICHIF = 9; */ - private final Utf8String bMMMNJEPNKE = Utf8String.newEmptyInstance(); + private final Utf8String fKNMNLICHIF = Utf8String.newEmptyInstance(); /** - * optional string nickname = 6; + * optional string nickname = 10; */ private final Utf8String nickname = Utf8String.newEmptyInstance(); /** - * optional string signature = 10; + * optional string LAAPGMDLJHL = 12; */ - private final Utf8String signature = Utf8String.newEmptyInstance(); + private final Utf8String lAAPGMDLJHL = Utf8String.newEmptyInstance(); private SimpleInfo() { } @@ -95,7 +95,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 8; + * optional int64 last_active_time = 14; * @return whether the lastActiveTime field is set */ public boolean hasLastActiveTime() { @@ -103,7 +103,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 8; + * optional int64 last_active_time = 14; * @return this */ public SimpleInfo clearLastActiveTime() { @@ -113,7 +113,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 8; + * optional int64 last_active_time = 14; * @return the lastActiveTime */ public long getLastActiveTime() { @@ -121,7 +121,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 8; + * optional int64 last_active_time = 14; * @param value the lastActiveTime to set * @return this */ @@ -132,136 +132,25 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 level = 1; - * @return whether the level field is set + * optional uint32 profile_picture = 1; + * @return whether the profilePicture field is set */ - public boolean hasLevel() { + public boolean hasProfilePicture() { return (bitField0_ & 0x00000002) != 0; } /** - * 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 JCKIEMDALOB = 7; - * @return whether the jCKIEMDALOB field is set - */ - public boolean hasJCKIEMDALOB() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 JCKIEMDALOB = 7; - * @return this - */ - public SimpleInfo clearJCKIEMDALOB() { - bitField0_ &= ~0x00000004; - jCKIEMDALOB = 0; - return this; - } - - /** - * optional uint32 JCKIEMDALOB = 7; - * @return the jCKIEMDALOB - */ - public int getJCKIEMDALOB() { - return jCKIEMDALOB; - } - - /** - * optional uint32 JCKIEMDALOB = 7; - * @param value the jCKIEMDALOB to set - * @return this - */ - public SimpleInfo setJCKIEMDALOB(final int value) { - bitField0_ |= 0x00000004; - jCKIEMDALOB = value; - return this; - } - - /** - * optional uint32 uid = 13; - * @return whether the uid field is set - */ - public boolean hasUid() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 uid = 13; - * @return this - */ - public SimpleInfo clearUid() { - bitField0_ &= ~0x00000008; - uid = 0; - return this; - } - - /** - * optional uint32 uid = 13; - * @return the uid - */ - public int getUid() { - return uid; - } - - /** - * optional uint32 uid = 13; - * @param value the uid to set - * @return this - */ - public SimpleInfo setUid(final int value) { - bitField0_ |= 0x00000008; - uid = value; - return this; - } - - /** - * optional uint32 profile_picture = 15; - * @return whether the profilePicture field is set - */ - public boolean hasProfilePicture() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 profile_picture = 15; + * optional uint32 profile_picture = 1; * @return this */ public SimpleInfo clearProfilePicture() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000002; profilePicture = 0; return this; } /** - * optional uint32 profile_picture = 15; + * optional uint32 profile_picture = 1; * @return the profilePicture */ public int getProfilePicture() { @@ -269,18 +158,129 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 profile_picture = 15; + * optional uint32 profile_picture = 1; * @param value the profilePicture to set * @return this */ public SimpleInfo setProfilePicture(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; profilePicture = value; return this; } /** - * optional .FriendOnlineStatus online_status = 11; + * optional uint32 uid = 2; + * @return whether the uid field is set + */ + public boolean hasUid() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 uid = 2; + * @return this + */ + public SimpleInfo clearUid() { + bitField0_ &= ~0x00000004; + uid = 0; + return this; + } + + /** + * optional uint32 uid = 2; + * @return the uid + */ + public int getUid() { + return uid; + } + + /** + * optional uint32 uid = 2; + * @param value the uid to set + * @return this + */ + public SimpleInfo setUid(final int value) { + bitField0_ |= 0x00000004; + uid = value; + return this; + } + + /** + * optional uint32 level = 3; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 level = 3; + * @return this + */ + public SimpleInfo 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 SimpleInfo setLevel(final int value) { + bitField0_ |= 0x00000008; + level = value; + return this; + } + + /** + * optional uint32 KBLFCBBJKOA = 6; + * @return whether the kBLFCBBJKOA field is set + */ + public boolean hasKBLFCBBJKOA() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 KBLFCBBJKOA = 6; + * @return this + */ + public SimpleInfo clearKBLFCBBJKOA() { + bitField0_ &= ~0x00000010; + kBLFCBBJKOA = 0; + return this; + } + + /** + * optional uint32 KBLFCBBJKOA = 6; + * @return the kBLFCBBJKOA + */ + public int getKBLFCBBJKOA() { + return kBLFCBBJKOA; + } + + /** + * optional uint32 KBLFCBBJKOA = 6; + * @param value the kBLFCBBJKOA to set + * @return this + */ + public SimpleInfo setKBLFCBBJKOA(final int value) { + bitField0_ |= 0x00000010; + kBLFCBBJKOA = value; + return this; + } + + /** + * optional .FriendOnlineStatus online_status = 7; * @return whether the onlineStatus field is set */ public boolean hasOnlineStatus() { @@ -288,7 +288,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .FriendOnlineStatus online_status = 11; + * optional .FriendOnlineStatus online_status = 7; * @return this */ public SimpleInfo clearOnlineStatus() { @@ -298,7 +298,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .FriendOnlineStatus online_status = 11; + * optional .FriendOnlineStatus online_status = 7; * @return the onlineStatus */ public FriendOnlineStatusOuterClass.FriendOnlineStatus getOnlineStatus() { @@ -331,7 +331,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .FriendOnlineStatus online_status = 11; + * optional .FriendOnlineStatus online_status = 7; * @param value the onlineStatus to set * @return this */ @@ -342,7 +342,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .PlatformType platform_type = 14; + * optional .PlatformType platform_type = 11; * @return whether the platformType field is set */ public boolean hasPlatformType() { @@ -350,7 +350,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .PlatformType platform_type = 14; + * optional .PlatformType platform_type = 11; * @return this */ public SimpleInfo clearPlatformType() { @@ -360,7 +360,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .PlatformType platform_type = 14; + * optional .PlatformType platform_type = 11; * @return the platformType */ public PlatformTypeOuterClass.PlatformType getPlatformType() { @@ -393,7 +393,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .PlatformType platform_type = 14; + * optional .PlatformType platform_type = 11; * @param value the platformType to set * @return this */ @@ -404,44 +404,44 @@ public final class SimpleInfoOuterClass { } /** - * optional bool KCKLEMNIDNK = 4; - * @return whether the kCKLEMNIDNK field is set + * optional bool HACOPLBOGPN = 8; + * @return whether the hACOPLBOGPN field is set */ - public boolean hasKCKLEMNIDNK() { + public boolean hasHACOPLBOGPN() { return (bitField0_ & 0x00000080) != 0; } /** - * optional bool KCKLEMNIDNK = 4; + * optional bool HACOPLBOGPN = 8; * @return this */ - public SimpleInfo clearKCKLEMNIDNK() { + public SimpleInfo clearHACOPLBOGPN() { bitField0_ &= ~0x00000080; - kCKLEMNIDNK = false; + hACOPLBOGPN = false; return this; } /** - * optional bool KCKLEMNIDNK = 4; - * @return the kCKLEMNIDNK + * optional bool HACOPLBOGPN = 8; + * @return the hACOPLBOGPN */ - public boolean getKCKLEMNIDNK() { - return kCKLEMNIDNK; + public boolean getHACOPLBOGPN() { + return hACOPLBOGPN; } /** - * optional bool KCKLEMNIDNK = 4; - * @param value the kCKLEMNIDNK to set + * optional bool HACOPLBOGPN = 8; + * @param value the hACOPLBOGPN to set * @return this */ - public SimpleInfo setKCKLEMNIDNK(final boolean value) { + public SimpleInfo setHACOPLBOGPN(final boolean value) { bitField0_ |= 0x00000080; - kCKLEMNIDNK = value; + hACOPLBOGPN = value; return this; } /** - * optional .FriendAvatarInfo friend_avatar_info = 12; + * optional .FriendAvatarInfo friend_avatar_info = 5; * @return whether the friendAvatarInfo field is set */ public boolean hasFriendAvatarInfo() { @@ -449,7 +449,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .FriendAvatarInfo friend_avatar_info = 12; + * optional .FriendAvatarInfo friend_avatar_info = 5; * @return this */ public SimpleInfo clearFriendAvatarInfo() { @@ -459,7 +459,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .FriendAvatarInfo friend_avatar_info = 12; + * optional .FriendAvatarInfo friend_avatar_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. @@ -473,7 +473,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .FriendAvatarInfo friend_avatar_info = 12; + * optional .FriendAvatarInfo friend_avatar_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 @@ -487,7 +487,7 @@ public final class SimpleInfoOuterClass { } /** - * optional .FriendAvatarInfo friend_avatar_info = 12; + * optional .FriendAvatarInfo friend_avatar_info = 5; * @param value the friendAvatarInfo to set * @return this */ @@ -498,137 +498,137 @@ public final class SimpleInfoOuterClass { } /** - * optional string CHFJJPIKGCA = 3; - * @return whether the cHFJJPIKGCA field is set + * optional string BEBEMMGFELC = 4; + * @return whether the bEBEMMGFELC field is set */ - public boolean hasCHFJJPIKGCA() { + public boolean hasBEBEMMGFELC() { return (bitField0_ & 0x00000200) != 0; } /** - * optional string CHFJJPIKGCA = 3; + * optional string BEBEMMGFELC = 4; * @return this */ - public SimpleInfo clearCHFJJPIKGCA() { + public SimpleInfo clearBEBEMMGFELC() { bitField0_ &= ~0x00000200; - cHFJJPIKGCA.clear(); + bEBEMMGFELC.clear(); return this; } /** - * optional string CHFJJPIKGCA = 3; - * @return the cHFJJPIKGCA + * optional string BEBEMMGFELC = 4; + * @return the bEBEMMGFELC */ - public String getCHFJJPIKGCA() { - return cHFJJPIKGCA.getString(); + public String getBEBEMMGFELC() { + return bEBEMMGFELC.getString(); } /** - * optional string CHFJJPIKGCA = 3; - * @return internal {@code Utf8String} representation of cHFJJPIKGCA for reading + * optional string BEBEMMGFELC = 4; + * @return internal {@code Utf8String} representation of bEBEMMGFELC for reading */ - public Utf8String getCHFJJPIKGCABytes() { - return this.cHFJJPIKGCA; + public Utf8String getBEBEMMGFELCBytes() { + return this.bEBEMMGFELC; } /** - * optional string CHFJJPIKGCA = 3; - * @return internal {@code Utf8String} representation of cHFJJPIKGCA for modifications + * optional string BEBEMMGFELC = 4; + * @return internal {@code Utf8String} representation of bEBEMMGFELC for modifications */ - public Utf8String getMutableCHFJJPIKGCABytes() { + public Utf8String getMutableBEBEMMGFELCBytes() { bitField0_ |= 0x00000200; - return this.cHFJJPIKGCA; + return this.bEBEMMGFELC; } /** - * optional string CHFJJPIKGCA = 3; - * @param value the cHFJJPIKGCA to set + * optional string BEBEMMGFELC = 4; + * @param value the bEBEMMGFELC to set * @return this */ - public SimpleInfo setCHFJJPIKGCA(final CharSequence value) { + public SimpleInfo setBEBEMMGFELC(final CharSequence value) { bitField0_ |= 0x00000200; - cHFJJPIKGCA.copyFrom(value); + bEBEMMGFELC.copyFrom(value); return this; } /** - * optional string CHFJJPIKGCA = 3; - * @param value the cHFJJPIKGCA to set + * optional string BEBEMMGFELC = 4; + * @param value the bEBEMMGFELC to set * @return this */ - public SimpleInfo setCHFJJPIKGCA(final Utf8String value) { + public SimpleInfo setBEBEMMGFELC(final Utf8String value) { bitField0_ |= 0x00000200; - cHFJJPIKGCA.copyFrom(value); + bEBEMMGFELC.copyFrom(value); return this; } /** - * optional string BMMMNJEPNKE = 5; - * @return whether the bMMMNJEPNKE field is set + * optional string FKNMNLICHIF = 9; + * @return whether the fKNMNLICHIF field is set */ - public boolean hasBMMMNJEPNKE() { + public boolean hasFKNMNLICHIF() { return (bitField0_ & 0x00000400) != 0; } /** - * optional string BMMMNJEPNKE = 5; + * optional string FKNMNLICHIF = 9; * @return this */ - public SimpleInfo clearBMMMNJEPNKE() { + public SimpleInfo clearFKNMNLICHIF() { bitField0_ &= ~0x00000400; - bMMMNJEPNKE.clear(); + fKNMNLICHIF.clear(); return this; } /** - * optional string BMMMNJEPNKE = 5; - * @return the bMMMNJEPNKE + * optional string FKNMNLICHIF = 9; + * @return the fKNMNLICHIF */ - public String getBMMMNJEPNKE() { - return bMMMNJEPNKE.getString(); + public String getFKNMNLICHIF() { + return fKNMNLICHIF.getString(); } /** - * optional string BMMMNJEPNKE = 5; - * @return internal {@code Utf8String} representation of bMMMNJEPNKE for reading + * optional string FKNMNLICHIF = 9; + * @return internal {@code Utf8String} representation of fKNMNLICHIF for reading */ - public Utf8String getBMMMNJEPNKEBytes() { - return this.bMMMNJEPNKE; + public Utf8String getFKNMNLICHIFBytes() { + return this.fKNMNLICHIF; } /** - * optional string BMMMNJEPNKE = 5; - * @return internal {@code Utf8String} representation of bMMMNJEPNKE for modifications + * optional string FKNMNLICHIF = 9; + * @return internal {@code Utf8String} representation of fKNMNLICHIF for modifications */ - public Utf8String getMutableBMMMNJEPNKEBytes() { + public Utf8String getMutableFKNMNLICHIFBytes() { bitField0_ |= 0x00000400; - return this.bMMMNJEPNKE; + return this.fKNMNLICHIF; } /** - * optional string BMMMNJEPNKE = 5; - * @param value the bMMMNJEPNKE to set + * optional string FKNMNLICHIF = 9; + * @param value the fKNMNLICHIF to set * @return this */ - public SimpleInfo setBMMMNJEPNKE(final CharSequence value) { + public SimpleInfo setFKNMNLICHIF(final CharSequence value) { bitField0_ |= 0x00000400; - bMMMNJEPNKE.copyFrom(value); + fKNMNLICHIF.copyFrom(value); return this; } /** - * optional string BMMMNJEPNKE = 5; - * @param value the bMMMNJEPNKE to set + * optional string FKNMNLICHIF = 9; + * @param value the fKNMNLICHIF to set * @return this */ - public SimpleInfo setBMMMNJEPNKE(final Utf8String value) { + public SimpleInfo setFKNMNLICHIF(final Utf8String value) { bitField0_ |= 0x00000400; - bMMMNJEPNKE.copyFrom(value); + fKNMNLICHIF.copyFrom(value); return this; } /** - * optional string nickname = 6; + * optional string nickname = 10; * @return whether the nickname field is set */ public boolean hasNickname() { @@ -636,7 +636,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 6; + * optional string nickname = 10; * @return this */ public SimpleInfo clearNickname() { @@ -646,7 +646,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 6; + * optional string nickname = 10; * @return the nickname */ public String getNickname() { @@ -654,7 +654,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 6; + * optional string nickname = 10; * @return internal {@code Utf8String} representation of nickname for reading */ public Utf8String getNicknameBytes() { @@ -662,7 +662,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 6; + * optional string nickname = 10; * @return internal {@code Utf8String} representation of nickname for modifications */ public Utf8String getMutableNicknameBytes() { @@ -671,7 +671,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 6; + * optional string nickname = 10; * @param value the nickname to set * @return this */ @@ -682,7 +682,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 6; + * optional string nickname = 10; * @param value the nickname to set * @return this */ @@ -693,67 +693,67 @@ public final class SimpleInfoOuterClass { } /** - * optional string signature = 10; - * @return whether the signature field is set + * optional string LAAPGMDLJHL = 12; + * @return whether the lAAPGMDLJHL field is set */ - public boolean hasSignature() { + public boolean hasLAAPGMDLJHL() { return (bitField0_ & 0x00001000) != 0; } /** - * optional string signature = 10; + * optional string LAAPGMDLJHL = 12; * @return this */ - public SimpleInfo clearSignature() { + public SimpleInfo clearLAAPGMDLJHL() { bitField0_ &= ~0x00001000; - signature.clear(); + lAAPGMDLJHL.clear(); return this; } /** - * optional string signature = 10; - * @return the signature + * optional string LAAPGMDLJHL = 12; + * @return the lAAPGMDLJHL */ - public String getSignature() { - return signature.getString(); + public String getLAAPGMDLJHL() { + return lAAPGMDLJHL.getString(); } /** - * optional string signature = 10; - * @return internal {@code Utf8String} representation of signature for reading + * optional string LAAPGMDLJHL = 12; + * @return internal {@code Utf8String} representation of lAAPGMDLJHL for reading */ - public Utf8String getSignatureBytes() { - return this.signature; + public Utf8String getLAAPGMDLJHLBytes() { + return this.lAAPGMDLJHL; } /** - * optional string signature = 10; - * @return internal {@code Utf8String} representation of signature for modifications + * optional string LAAPGMDLJHL = 12; + * @return internal {@code Utf8String} representation of lAAPGMDLJHL for modifications */ - public Utf8String getMutableSignatureBytes() { + public Utf8String getMutableLAAPGMDLJHLBytes() { bitField0_ |= 0x00001000; - return this.signature; + return this.lAAPGMDLJHL; } /** - * optional string signature = 10; - * @param value the signature to set + * optional string LAAPGMDLJHL = 12; + * @param value the lAAPGMDLJHL to set * @return this */ - public SimpleInfo setSignature(final CharSequence value) { + public SimpleInfo setLAAPGMDLJHL(final CharSequence value) { bitField0_ |= 0x00001000; - signature.copyFrom(value); + lAAPGMDLJHL.copyFrom(value); return this; } /** - * optional string signature = 10; - * @param value the signature to set + * optional string LAAPGMDLJHL = 12; + * @param value the lAAPGMDLJHL to set * @return this */ - public SimpleInfo setSignature(final Utf8String value) { + public SimpleInfo setLAAPGMDLJHL(final Utf8String value) { bitField0_ |= 0x00001000; - signature.copyFrom(value); + lAAPGMDLJHL.copyFrom(value); return this; } @@ -763,18 +763,18 @@ public final class SimpleInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; lastActiveTime = other.lastActiveTime; - level = other.level; - jCKIEMDALOB = other.jCKIEMDALOB; - uid = other.uid; profilePicture = other.profilePicture; + uid = other.uid; + level = other.level; + kBLFCBBJKOA = other.kBLFCBBJKOA; onlineStatus = other.onlineStatus; platformType = other.platformType; - kCKLEMNIDNK = other.kCKLEMNIDNK; + hACOPLBOGPN = other.hACOPLBOGPN; friendAvatarInfo.copyFrom(other.friendAvatarInfo); - cHFJJPIKGCA.copyFrom(other.cHFJJPIKGCA); - bMMMNJEPNKE.copyFrom(other.bMMMNJEPNKE); + bEBEMMGFELC.copyFrom(other.bEBEMMGFELC); + fKNMNLICHIF.copyFrom(other.fKNMNLICHIF); nickname.copyFrom(other.nickname); - signature.copyFrom(other.signature); + lAAPGMDLJHL.copyFrom(other.lAAPGMDLJHL); } return this; } @@ -788,17 +788,17 @@ public final class SimpleInfoOuterClass { if (other.hasLastActiveTime()) { setLastActiveTime(other.lastActiveTime); } - if (other.hasLevel()) { - setLevel(other.level); - } - if (other.hasJCKIEMDALOB()) { - setJCKIEMDALOB(other.jCKIEMDALOB); + if (other.hasProfilePicture()) { + setProfilePicture(other.profilePicture); } if (other.hasUid()) { setUid(other.uid); } - if (other.hasProfilePicture()) { - setProfilePicture(other.profilePicture); + if (other.hasLevel()) { + setLevel(other.level); + } + if (other.hasKBLFCBBJKOA()) { + setKBLFCBBJKOA(other.kBLFCBBJKOA); } if (other.hasOnlineStatus()) { setOnlineStatusValue(other.onlineStatus); @@ -806,23 +806,23 @@ public final class SimpleInfoOuterClass { if (other.hasPlatformType()) { setPlatformTypeValue(other.platformType); } - if (other.hasKCKLEMNIDNK()) { - setKCKLEMNIDNK(other.kCKLEMNIDNK); + if (other.hasHACOPLBOGPN()) { + setHACOPLBOGPN(other.hACOPLBOGPN); } if (other.hasFriendAvatarInfo()) { getMutableFriendAvatarInfo().mergeFrom(other.friendAvatarInfo); } - if (other.hasCHFJJPIKGCA()) { - getMutableCHFJJPIKGCABytes().copyFrom(other.cHFJJPIKGCA); + if (other.hasBEBEMMGFELC()) { + getMutableBEBEMMGFELCBytes().copyFrom(other.bEBEMMGFELC); } - if (other.hasBMMMNJEPNKE()) { - getMutableBMMMNJEPNKEBytes().copyFrom(other.bMMMNJEPNKE); + if (other.hasFKNMNLICHIF()) { + getMutableFKNMNLICHIFBytes().copyFrom(other.fKNMNLICHIF); } if (other.hasNickname()) { getMutableNicknameBytes().copyFrom(other.nickname); } - if (other.hasSignature()) { - getMutableSignatureBytes().copyFrom(other.signature); + if (other.hasLAAPGMDLJHL()) { + getMutableLAAPGMDLJHLBytes().copyFrom(other.lAAPGMDLJHL); } return this; } @@ -835,18 +835,18 @@ public final class SimpleInfoOuterClass { cachedSize = -1; bitField0_ = 0; lastActiveTime = 0L; - level = 0; - jCKIEMDALOB = 0; - uid = 0; profilePicture = 0; + uid = 0; + level = 0; + kBLFCBBJKOA = 0; onlineStatus = 0; platformType = 0; - kCKLEMNIDNK = false; + hACOPLBOGPN = false; friendAvatarInfo.clear(); - cHFJJPIKGCA.clear(); - bMMMNJEPNKE.clear(); + bEBEMMGFELC.clear(); + fKNMNLICHIF.clear(); nickname.clear(); - signature.clear(); + lAAPGMDLJHL.clear(); return this; } @@ -858,10 +858,10 @@ public final class SimpleInfoOuterClass { cachedSize = -1; bitField0_ = 0; friendAvatarInfo.clearQuick(); - cHFJJPIKGCA.clear(); - bMMMNJEPNKE.clear(); + bEBEMMGFELC.clear(); + fKNMNLICHIF.clear(); nickname.clear(); - signature.clear(); + lAAPGMDLJHL.clear(); return this; } @@ -876,73 +876,73 @@ public final class SimpleInfoOuterClass { SimpleInfo other = (SimpleInfo) o; return bitField0_ == other.bitField0_ && (!hasLastActiveTime() || lastActiveTime == other.lastActiveTime) - && (!hasLevel() || level == other.level) - && (!hasJCKIEMDALOB() || jCKIEMDALOB == other.jCKIEMDALOB) - && (!hasUid() || uid == other.uid) && (!hasProfilePicture() || profilePicture == other.profilePicture) + && (!hasUid() || uid == other.uid) + && (!hasLevel() || level == other.level) + && (!hasKBLFCBBJKOA() || kBLFCBBJKOA == other.kBLFCBBJKOA) && (!hasOnlineStatus() || onlineStatus == other.onlineStatus) && (!hasPlatformType() || platformType == other.platformType) - && (!hasKCKLEMNIDNK() || kCKLEMNIDNK == other.kCKLEMNIDNK) + && (!hasHACOPLBOGPN() || hACOPLBOGPN == other.hACOPLBOGPN) && (!hasFriendAvatarInfo() || friendAvatarInfo.equals(other.friendAvatarInfo)) - && (!hasCHFJJPIKGCA() || cHFJJPIKGCA.equals(other.cHFJJPIKGCA)) - && (!hasBMMMNJEPNKE() || bMMMNJEPNKE.equals(other.bMMMNJEPNKE)) + && (!hasBEBEMMGFELC() || bEBEMMGFELC.equals(other.bEBEMMGFELC)) + && (!hasFKNMNLICHIF() || fKNMNLICHIF.equals(other.fKNMNLICHIF)) && (!hasNickname() || nickname.equals(other.nickname)) - && (!hasSignature() || signature.equals(other.signature)); + && (!hasLAAPGMDLJHL() || lAAPGMDLJHL.equals(other.lAAPGMDLJHL)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 112); output.writeInt64NoTag(lastActiveTime); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(jCKIEMDALOB); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(uid); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); output.writeUInt32NoTag(profilePicture); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(uid); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(level); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(kBLFCBBJKOA); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 56); output.writeEnumNoTag(onlineStatus); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 88); output.writeEnumNoTag(platformType); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 32); - output.writeBoolNoTag(kCKLEMNIDNK); + output.writeRawByte((byte) 64); + output.writeBoolNoTag(hACOPLBOGPN); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 42); output.writeMessageNoTag(friendAvatarInfo); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 26); - output.writeStringNoTag(cHFJJPIKGCA); + output.writeRawByte((byte) 34); + output.writeStringNoTag(bEBEMMGFELC); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRawByte((byte) 42); - output.writeStringNoTag(bMMMNJEPNKE); + output.writeRawByte((byte) 74); + output.writeStringNoTag(fKNMNLICHIF); } if ((bitField0_ & 0x00000800) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 82); output.writeStringNoTag(nickname); } if ((bitField0_ & 0x00001000) != 0) { - output.writeRawByte((byte) 82); - output.writeStringNoTag(signature); + output.writeRawByte((byte) 98); + output.writeStringNoTag(lAAPGMDLJHL); } } @@ -953,16 +953,16 @@ public final class SimpleInfoOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(lastActiveTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(profilePicture); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(jCKIEMDALOB); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(profilePicture); + size += 1 + ProtoSink.computeUInt32SizeNoTag(kBLFCBBJKOA); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(onlineStatus); @@ -977,16 +977,16 @@ public final class SimpleInfoOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(friendAvatarInfo); } if ((bitField0_ & 0x00000200) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(cHFJJPIKGCA); + size += 1 + ProtoSink.computeStringSizeNoTag(bEBEMMGFELC); } if ((bitField0_ & 0x00000400) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(bMMMNJEPNKE); + size += 1 + ProtoSink.computeStringSizeNoTag(fKNMNLICHIF); } if ((bitField0_ & 0x00000800) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(nickname); } if ((bitField0_ & 0x00001000) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(signature); + size += 1 + ProtoSink.computeStringSizeNoTag(lAAPGMDLJHL); } return size; } @@ -998,7 +998,7 @@ public final class SimpleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 112: { // lastActiveTime lastActiveTime = input.readInt64(); bitField0_ |= 0x00000001; @@ -1008,42 +1008,42 @@ public final class SimpleInfoOuterClass { } } case 8: { + // profilePicture + profilePicture = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { + // uid + uid = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { // level level = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // kBLFCBBJKOA + kBLFCBBJKOA = input.readUInt32(); + bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 56) { break; } } case 56: { - // jCKIEMDALOB - jCKIEMDALOB = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // uid - uid = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // profilePicture - profilePicture = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { // onlineStatus final int value = input.readInt32(); if (FriendOnlineStatusOuterClass.FriendOnlineStatus.forNumber(value) != null) { @@ -1051,11 +1051,11 @@ public final class SimpleInfoOuterClass { bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { + case 88: { // platformType final int value = input.readInt32(); if (PlatformTypeOuterClass.PlatformType.forNumber(value) != null) { @@ -1063,58 +1063,58 @@ public final class SimpleInfoOuterClass { bitField0_ |= 0x00000040; } tag = input.readTag(); - if (tag != 32) { + if (tag != 64) { break; } } - case 32: { - // kCKLEMNIDNK - kCKLEMNIDNK = input.readBool(); + case 64: { + // hACOPLBOGPN + hACOPLBOGPN = input.readBool(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { - // friendAvatarInfo - input.readMessage(friendAvatarInfo); - bitField0_ |= 0x00000100; - tag = input.readTag(); - if (tag != 26) { - break; - } - } - case 26: { - // cHFJJPIKGCA - input.readString(cHFJJPIKGCA); - bitField0_ |= 0x00000200; - tag = input.readTag(); if (tag != 42) { break; } } case 42: { - // bMMMNJEPNKE - input.readString(bMMMNJEPNKE); - bitField0_ |= 0x00000400; + // friendAvatarInfo + input.readMessage(friendAvatarInfo); + bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 50) { + if (tag != 34) { break; } } - case 50: { - // nickname - input.readString(nickname); - bitField0_ |= 0x00000800; + case 34: { + // bEBEMMGFELC + input.readString(bEBEMMGFELC); + bitField0_ |= 0x00000200; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // fKNMNLICHIF + input.readString(fKNMNLICHIF); + bitField0_ |= 0x00000400; tag = input.readTag(); if (tag != 82) { break; } } case 82: { - // signature - input.readString(signature); + // nickname + input.readString(nickname); + bitField0_ |= 0x00000800; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // lAAPGMDLJHL + input.readString(lAAPGMDLJHL); bitField0_ |= 0x00001000; tag = input.readTag(); if (tag != 0) { @@ -1142,16 +1142,16 @@ public final class SimpleInfoOuterClass { output.writeInt64(FieldNames.lastActiveTime, lastActiveTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.profilePicture, profilePicture); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.jCKIEMDALOB, jCKIEMDALOB); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.uid, uid); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.level, level); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.profilePicture, profilePicture); + output.writeUInt32(FieldNames.kBLFCBBJKOA, kBLFCBBJKOA); } if ((bitField0_ & 0x00000020) != 0) { output.writeEnum(FieldNames.onlineStatus, onlineStatus, FriendOnlineStatusOuterClass.FriendOnlineStatus.converter()); @@ -1160,22 +1160,22 @@ public final class SimpleInfoOuterClass { output.writeEnum(FieldNames.platformType, platformType, PlatformTypeOuterClass.PlatformType.converter()); } if ((bitField0_ & 0x00000080) != 0) { - output.writeBool(FieldNames.kCKLEMNIDNK, kCKLEMNIDNK); + output.writeBool(FieldNames.hACOPLBOGPN, hACOPLBOGPN); } if ((bitField0_ & 0x00000100) != 0) { output.writeMessage(FieldNames.friendAvatarInfo, friendAvatarInfo); } if ((bitField0_ & 0x00000200) != 0) { - output.writeString(FieldNames.cHFJJPIKGCA, cHFJJPIKGCA); + output.writeString(FieldNames.bEBEMMGFELC, bEBEMMGFELC); } if ((bitField0_ & 0x00000400) != 0) { - output.writeString(FieldNames.bMMMNJEPNKE, bMMMNJEPNKE); + output.writeString(FieldNames.fKNMNLICHIF, fKNMNLICHIF); } if ((bitField0_ & 0x00000800) != 0) { output.writeString(FieldNames.nickname, nickname); } if ((bitField0_ & 0x00001000) != 0) { - output.writeString(FieldNames.signature, signature); + output.writeString(FieldNames.lAAPGMDLJHL, lAAPGMDLJHL); } output.endObject(); } @@ -1199,10 +1199,11 @@ public final class SimpleInfoOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case -1406866667: + case 1782764648: { + if (input.isAtField(FieldNames.profilePicture)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + profilePicture = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1210,21 +1211,21 @@ public final class SimpleInfoOuterClass { } break; } - case -773412445: { - if (input.isAtField(FieldNames.jCKIEMDALOB)) { - if (!input.trySkipNullValue()) { - jCKIEMDALOB = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 115792: { if (input.isAtField(FieldNames.uid)) { if (!input.trySkipNullValue()) { uid = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -1232,11 +1233,10 @@ public final class SimpleInfoOuterClass { } break; } - case -1406866667: - case 1782764648: { - if (input.isAtField(FieldNames.profilePicture)) { + case 1383658213: { + if (input.isAtField(FieldNames.kBLFCBBJKOA)) { if (!input.trySkipNullValue()) { - profilePicture = input.readUInt32(); + kBLFCBBJKOA = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1278,10 +1278,10 @@ public final class SimpleInfoOuterClass { } break; } - case -1627434267: { - if (input.isAtField(FieldNames.kCKLEMNIDNK)) { + case -792214057: { + if (input.isAtField(FieldNames.hACOPLBOGPN)) { if (!input.trySkipNullValue()) { - kCKLEMNIDNK = input.readBool(); + hACOPLBOGPN = input.readBool(); bitField0_ |= 0x00000080; } } else { @@ -1301,10 +1301,10 @@ public final class SimpleInfoOuterClass { } break; } - case 361274612: { - if (input.isAtField(FieldNames.cHFJJPIKGCA)) { + case -456808681: { + if (input.isAtField(FieldNames.bEBEMMGFELC)) { if (!input.trySkipNullValue()) { - input.readString(cHFJJPIKGCA); + input.readString(bEBEMMGFELC); bitField0_ |= 0x00000200; } } else { @@ -1312,10 +1312,10 @@ public final class SimpleInfoOuterClass { } break; } - case 1421577174: { - if (input.isAtField(FieldNames.bMMMNJEPNKE)) { + case 1469838153: { + if (input.isAtField(FieldNames.fKNMNLICHIF)) { if (!input.trySkipNullValue()) { - input.readString(bMMMNJEPNKE); + input.readString(fKNMNLICHIF); bitField0_ |= 0x00000400; } } else { @@ -1334,10 +1334,10 @@ public final class SimpleInfoOuterClass { } break; } - case 1073584312: { - if (input.isAtField(FieldNames.signature)) { + case -1989509316: { + if (input.isAtField(FieldNames.lAAPGMDLJHL)) { if (!input.trySkipNullValue()) { - input.readString(signature); + input.readString(lAAPGMDLJHL); bitField0_ |= 0x00001000; } } else { @@ -1399,29 +1399,29 @@ public final class SimpleInfoOuterClass { static class FieldNames { static final FieldName lastActiveTime = FieldName.forField("lastActiveTime", "last_active_time"); - static final FieldName level = FieldName.forField("level"); - - static final FieldName jCKIEMDALOB = FieldName.forField("JCKIEMDALOB"); + static final FieldName profilePicture = FieldName.forField("profilePicture", "profile_picture"); static final FieldName uid = FieldName.forField("uid"); - static final FieldName profilePicture = FieldName.forField("profilePicture", "profile_picture"); + static final FieldName level = FieldName.forField("level"); + + static final FieldName kBLFCBBJKOA = FieldName.forField("KBLFCBBJKOA"); static final FieldName onlineStatus = FieldName.forField("onlineStatus", "online_status"); static final FieldName platformType = FieldName.forField("platformType", "platform_type"); - static final FieldName kCKLEMNIDNK = FieldName.forField("KCKLEMNIDNK"); + static final FieldName hACOPLBOGPN = FieldName.forField("HACOPLBOGPN"); static final FieldName friendAvatarInfo = FieldName.forField("friendAvatarInfo", "friend_avatar_info"); - static final FieldName cHFJJPIKGCA = FieldName.forField("CHFJJPIKGCA"); + static final FieldName bEBEMMGFELC = FieldName.forField("BEBEMMGFELC"); - static final FieldName bMMMNJEPNKE = FieldName.forField("BMMMNJEPNKE"); + static final FieldName fKNMNLICHIF = FieldName.forField("FKNMNLICHIF"); static final FieldName nickname = FieldName.forField("nickname"); - static final FieldName signature = FieldName.forField("signature"); + static final FieldName lAAPGMDLJHL = FieldName.forField("LAAPGMDLJHL"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SpringTransferCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SpringTransferCsReqOuterClass.java index 0a900f1..03b32e2 100644 --- a/src/generated/main/emu/lunarcore/proto/SpringTransferCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SpringTransferCsReqOuterClass.java @@ -19,17 +19,17 @@ public final class SpringTransferCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 floor_id = 4; - */ - private int floorId; - - /** - * optional uint32 prop_entity_id = 8; + * optional uint32 prop_entity_id = 4; */ private int propEntityId; /** - * optional uint32 plane_id = 13; + * optional uint32 floor_id = 5; + */ + private int floorId; + + /** + * optional uint32 plane_id = 12; */ private int planeId; @@ -44,62 +44,25 @@ public final class SpringTransferCsReqOuterClass { } /** - * optional uint32 floor_id = 4; - * @return whether the floorId field is set + * optional uint32 prop_entity_id = 4; + * @return whether the propEntityId field is set */ - public boolean hasFloorId() { + public boolean hasPropEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 floor_id = 4; - * @return this - */ - public SpringTransferCsReq 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 SpringTransferCsReq setFloorId(final int value) { - bitField0_ |= 0x00000001; - floorId = value; - return this; - } - - /** - * optional uint32 prop_entity_id = 8; - * @return whether the propEntityId field is set - */ - public boolean hasPropEntityId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 prop_entity_id = 8; + * optional uint32 prop_entity_id = 4; * @return this */ public SpringTransferCsReq clearPropEntityId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; propEntityId = 0; return this; } /** - * optional uint32 prop_entity_id = 8; + * optional uint32 prop_entity_id = 4; * @return the propEntityId */ public int getPropEntityId() { @@ -107,18 +70,55 @@ public final class SpringTransferCsReqOuterClass { } /** - * optional uint32 prop_entity_id = 8; + * optional uint32 prop_entity_id = 4; * @param value the propEntityId to set * @return this */ public SpringTransferCsReq setPropEntityId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; propEntityId = value; return this; } /** - * optional uint32 plane_id = 13; + * optional uint32 floor_id = 5; + * @return whether the floorId field is set + */ + public boolean hasFloorId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 floor_id = 5; + * @return this + */ + public SpringTransferCsReq clearFloorId() { + bitField0_ &= ~0x00000002; + floorId = 0; + return this; + } + + /** + * optional uint32 floor_id = 5; + * @return the floorId + */ + public int getFloorId() { + return floorId; + } + + /** + * optional uint32 floor_id = 5; + * @param value the floorId to set + * @return this + */ + public SpringTransferCsReq setFloorId(final int value) { + bitField0_ |= 0x00000002; + floorId = value; + return this; + } + + /** + * optional uint32 plane_id = 12; * @return whether the planeId field is set */ public boolean hasPlaneId() { @@ -126,7 +126,7 @@ public final class SpringTransferCsReqOuterClass { } /** - * optional uint32 plane_id = 13; + * optional uint32 plane_id = 12; * @return this */ public SpringTransferCsReq clearPlaneId() { @@ -136,7 +136,7 @@ public final class SpringTransferCsReqOuterClass { } /** - * optional uint32 plane_id = 13; + * optional uint32 plane_id = 12; * @return the planeId */ public int getPlaneId() { @@ -144,7 +144,7 @@ public final class SpringTransferCsReqOuterClass { } /** - * optional uint32 plane_id = 13; + * optional uint32 plane_id = 12; * @param value the planeId to set * @return this */ @@ -159,8 +159,8 @@ public final class SpringTransferCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - floorId = other.floorId; propEntityId = other.propEntityId; + floorId = other.floorId; planeId = other.planeId; } return this; @@ -172,12 +172,12 @@ public final class SpringTransferCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasFloorId()) { - setFloorId(other.floorId); - } if (other.hasPropEntityId()) { setPropEntityId(other.propEntityId); } + if (other.hasFloorId()) { + setFloorId(other.floorId); + } if (other.hasPlaneId()) { setPlaneId(other.planeId); } @@ -191,8 +191,8 @@ public final class SpringTransferCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - floorId = 0; propEntityId = 0; + floorId = 0; planeId = 0; return this; } @@ -217,8 +217,8 @@ public final class SpringTransferCsReqOuterClass { } SpringTransferCsReq other = (SpringTransferCsReq) o; return bitField0_ == other.bitField0_ - && (!hasFloorId() || floorId == other.floorId) && (!hasPropEntityId() || propEntityId == other.propEntityId) + && (!hasFloorId() || floorId == other.floorId) && (!hasPlaneId() || planeId == other.planeId); } @@ -226,14 +226,14 @@ public final class SpringTransferCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(floorId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); output.writeUInt32NoTag(propEntityId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(floorId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(planeId); } } @@ -242,10 +242,10 @@ public final class SpringTransferCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); @@ -261,24 +261,24 @@ public final class SpringTransferCsReqOuterClass { while (true) { switch (tag) { case 32: { - // floorId - floorId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { // propEntityId propEntityId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 40) { break; } } - case 104: { + case 40: { + // floorId + floorId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { // planeId planeId = input.readUInt32(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class SpringTransferCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.floorId, floorId); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.floorId, floorId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.planeId, planeId); @@ -323,11 +323,11 @@ public final class SpringTransferCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -766027193: - case 2022982190: { - if (input.isAtField(FieldNames.floorId)) { + case -68717343: + case -57484005: { + if (input.isAtField(FieldNames.propEntityId)) { if (!input.trySkipNullValue()) { - floorId = input.readUInt32(); + propEntityId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +335,11 @@ public final class SpringTransferCsReqOuterClass { } break; } - case -68717343: - case -57484005: { - if (input.isAtField(FieldNames.propEntityId)) { + case -766027193: + case 2022982190: { + if (input.isAtField(FieldNames.floorId)) { if (!input.trySkipNullValue()) { - propEntityId = input.readUInt32(); + floorId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -412,10 +412,10 @@ public final class SpringTransferCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName floorId = FieldName.forField("floorId", "floor_id"); - static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); + static final FieldName floorId = FieldName.forField("floorId", "floor_id"); + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); } } diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java index 760f0ee..ac97dd3 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java @@ -19,12 +19,7 @@ public final class StartChallengeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 OGAEOEHBKKJ = 6; - */ - private int oGAEOEHBKKJ; - - /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 7; */ private int challengeId; @@ -39,62 +34,25 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 OGAEOEHBKKJ = 6; - * @return whether the oGAEOEHBKKJ field is set + * optional uint32 challenge_id = 7; + * @return whether the challengeId field is set */ - public boolean hasOGAEOEHBKKJ() { + public boolean hasChallengeId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 OGAEOEHBKKJ = 6; - * @return this - */ - public StartChallengeCsReq clearOGAEOEHBKKJ() { - bitField0_ &= ~0x00000001; - oGAEOEHBKKJ = 0; - return this; - } - - /** - * optional uint32 OGAEOEHBKKJ = 6; - * @return the oGAEOEHBKKJ - */ - public int getOGAEOEHBKKJ() { - return oGAEOEHBKKJ; - } - - /** - * optional uint32 OGAEOEHBKKJ = 6; - * @param value the oGAEOEHBKKJ to set - * @return this - */ - public StartChallengeCsReq setOGAEOEHBKKJ(final int value) { - bitField0_ |= 0x00000001; - oGAEOEHBKKJ = value; - return this; - } - - /** - * optional uint32 challenge_id = 13; - * @return whether the challengeId field is set - */ - public boolean hasChallengeId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 7; * @return this */ public StartChallengeCsReq clearChallengeId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; challengeId = 0; return this; } /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 7; * @return the challengeId */ public int getChallengeId() { @@ -102,12 +60,12 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 7; * @param value the challengeId to set * @return this */ public StartChallengeCsReq setChallengeId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; challengeId = value; return this; } @@ -117,7 +75,6 @@ public final class StartChallengeCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - oGAEOEHBKKJ = other.oGAEOEHBKKJ; challengeId = other.challengeId; } return this; @@ -129,9 +86,6 @@ public final class StartChallengeCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasOGAEOEHBKKJ()) { - setOGAEOEHBKKJ(other.oGAEOEHBKKJ); - } if (other.hasChallengeId()) { setChallengeId(other.challengeId); } @@ -145,7 +99,6 @@ public final class StartChallengeCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - oGAEOEHBKKJ = 0; challengeId = 0; return this; } @@ -170,18 +123,13 @@ public final class StartChallengeCsReqOuterClass { } StartChallengeCsReq other = (StartChallengeCsReq) o; return bitField0_ == other.bitField0_ - && (!hasOGAEOEHBKKJ() || oGAEOEHBKKJ == other.oGAEOEHBKKJ) && (!hasChallengeId() || challengeId == other.challengeId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(oGAEOEHBKKJ); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(challengeId); } } @@ -190,9 +138,6 @@ public final class StartChallengeCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(oGAEOEHBKKJ); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } return size; @@ -205,19 +150,10 @@ public final class StartChallengeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // oGAEOEHBKKJ - oGAEOEHBKKJ = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 56: { // challengeId challengeId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { break; @@ -241,9 +177,6 @@ public final class StartChallengeCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.oGAEOEHBKKJ, oGAEOEHBKKJ); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.challengeId, challengeId); } output.endObject(); @@ -256,23 +189,12 @@ public final class StartChallengeCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 618871838: { - if (input.isAtField(FieldNames.oGAEOEHBKKJ)) { - if (!input.trySkipNullValue()) { - oGAEOEHBKKJ = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -689112866: case 112359031: { if (input.isAtField(FieldNames.challengeId)) { if (!input.trySkipNullValue()) { challengeId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -332,8 +254,6 @@ public final class StartChallengeCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName oGAEOEHBKKJ = FieldName.forField("OGAEOEHBKKJ"); - static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); } } diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java index e479e86..1d88c70 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java @@ -19,22 +19,22 @@ public final class StartChallengeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; */ private int retcode; /** - * optional .SceneInfo scene = 4; + * optional .SceneInfo scene = 1; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 5; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * optional .ChallengeInfo challenge_info = 13; + * optional .ChallengeInfo challenge_info = 15; */ private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); @@ -49,7 +49,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -57,7 +57,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @return this */ public StartChallengeScRsp clearRetcode() { @@ -67,7 +67,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -75,7 +75,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -86,7 +86,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 4; + * optional .SceneInfo scene = 1; * @return whether the scene field is set */ public boolean hasScene() { @@ -94,7 +94,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 4; + * optional .SceneInfo scene = 1; * @return this */ public StartChallengeScRsp clearScene() { @@ -104,7 +104,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 4; + * optional .SceneInfo scene = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -118,7 +118,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 4; + * optional .SceneInfo scene = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -132,7 +132,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 4; + * optional .SceneInfo scene = 1; * @param value the scene to set * @return this */ @@ -143,7 +143,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 5; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -151,7 +151,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 5; * @return this */ public StartChallengeScRsp clearLineup() { @@ -161,7 +161,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -175,7 +175,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .LineupInfo lineup = 12; + * 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 @@ -189,7 +189,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .LineupInfo lineup = 12; + * optional .LineupInfo lineup = 5; * @param value the lineup to set * @return this */ @@ -200,7 +200,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 13; + * optional .ChallengeInfo challenge_info = 15; * @return whether the challengeInfo field is set */ public boolean hasChallengeInfo() { @@ -208,7 +208,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 13; + * optional .ChallengeInfo challenge_info = 15; * @return this */ public StartChallengeScRsp clearChallengeInfo() { @@ -218,7 +218,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 13; + * optional .ChallengeInfo challenge_info = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -232,7 +232,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 13; + * optional .ChallengeInfo challenge_info = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -246,7 +246,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 13; + * optional .ChallengeInfo challenge_info = 15; * @param value the challengeInfo to set * @return this */ @@ -336,19 +336,19 @@ public final class StartChallengeScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 10); output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 42); output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 122); output.writeMessageNoTag(challengeInfo); } } @@ -378,34 +378,34 @@ public final class StartChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 10) { break; } } - case 34: { + case 10: { // scene input.readMessage(scene); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 98) { + if (tag != 42) { break; } } - case 98: { + case 42: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 106) { + if (tag != 122) { break; } } - case 106: { + case 122: { // challengeInfo input.readMessage(challengeInfo); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java index 76251a6..1852c7d 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 world_level = 3; + * optional uint32 prop_entity_id = 2; + */ + private int propEntityId; + + /** + * optional uint32 world_level = 5; */ private int worldLevel; /** - * optional uint32 wave = 7; + * optional uint32 wave = 8; */ private int wave; /** - * optional uint32 cocoon_id = 11; + * optional uint32 cocoon_id = 15; */ private int cocoonId; - /** - * optional uint32 prop_entity_id = 13; - */ - private int propEntityId; - private StartCocoonStageCsReq() { } @@ -49,136 +49,25 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 world_level = 3; - * @return whether the worldLevel field is set + * optional uint32 prop_entity_id = 2; + * @return whether the propEntityId field is set */ - public boolean hasWorldLevel() { + public boolean hasPropEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 world_level = 3; - * @return this - */ - public StartCocoonStageCsReq clearWorldLevel() { - bitField0_ &= ~0x00000001; - worldLevel = 0; - return this; - } - - /** - * optional uint32 world_level = 3; - * @return the worldLevel - */ - public int getWorldLevel() { - return worldLevel; - } - - /** - * optional uint32 world_level = 3; - * @param value the worldLevel to set - * @return this - */ - public StartCocoonStageCsReq setWorldLevel(final int value) { - bitField0_ |= 0x00000001; - worldLevel = value; - return this; - } - - /** - * optional uint32 wave = 7; - * @return whether the wave field is set - */ - public boolean hasWave() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 wave = 7; - * @return this - */ - public StartCocoonStageCsReq clearWave() { - bitField0_ &= ~0x00000002; - wave = 0; - return this; - } - - /** - * optional uint32 wave = 7; - * @return the wave - */ - public int getWave() { - return wave; - } - - /** - * optional uint32 wave = 7; - * @param value the wave to set - * @return this - */ - public StartCocoonStageCsReq setWave(final int value) { - bitField0_ |= 0x00000002; - wave = value; - return this; - } - - /** - * optional uint32 cocoon_id = 11; - * @return whether the cocoonId field is set - */ - public boolean hasCocoonId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 cocoon_id = 11; - * @return this - */ - public StartCocoonStageCsReq clearCocoonId() { - bitField0_ &= ~0x00000004; - cocoonId = 0; - return this; - } - - /** - * optional uint32 cocoon_id = 11; - * @return the cocoonId - */ - public int getCocoonId() { - return cocoonId; - } - - /** - * optional uint32 cocoon_id = 11; - * @param value the cocoonId to set - * @return this - */ - public StartCocoonStageCsReq setCocoonId(final int value) { - bitField0_ |= 0x00000004; - cocoonId = value; - return this; - } - - /** - * optional uint32 prop_entity_id = 13; - * @return whether the propEntityId field is set - */ - public boolean hasPropEntityId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 prop_entity_id = 13; + * optional uint32 prop_entity_id = 2; * @return this */ public StartCocoonStageCsReq clearPropEntityId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; propEntityId = 0; return this; } /** - * optional uint32 prop_entity_id = 13; + * optional uint32 prop_entity_id = 2; * @return the propEntityId */ public int getPropEntityId() { @@ -186,25 +75,136 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 prop_entity_id = 13; + * optional uint32 prop_entity_id = 2; * @param value the propEntityId to set * @return this */ public StartCocoonStageCsReq setPropEntityId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; propEntityId = value; return this; } + /** + * optional uint32 world_level = 5; + * @return whether the worldLevel field is set + */ + public boolean hasWorldLevel() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 world_level = 5; + * @return this + */ + public StartCocoonStageCsReq clearWorldLevel() { + bitField0_ &= ~0x00000002; + worldLevel = 0; + return this; + } + + /** + * optional uint32 world_level = 5; + * @return the worldLevel + */ + public int getWorldLevel() { + return worldLevel; + } + + /** + * optional uint32 world_level = 5; + * @param value the worldLevel to set + * @return this + */ + public StartCocoonStageCsReq setWorldLevel(final int value) { + bitField0_ |= 0x00000002; + worldLevel = value; + return this; + } + + /** + * optional uint32 wave = 8; + * @return whether the wave field is set + */ + public boolean hasWave() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 wave = 8; + * @return this + */ + public StartCocoonStageCsReq clearWave() { + bitField0_ &= ~0x00000004; + wave = 0; + return this; + } + + /** + * optional uint32 wave = 8; + * @return the wave + */ + public int getWave() { + return wave; + } + + /** + * optional uint32 wave = 8; + * @param value the wave to set + * @return this + */ + public StartCocoonStageCsReq setWave(final int value) { + bitField0_ |= 0x00000004; + wave = value; + return this; + } + + /** + * optional uint32 cocoon_id = 15; + * @return whether the cocoonId field is set + */ + public boolean hasCocoonId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 cocoon_id = 15; + * @return this + */ + public StartCocoonStageCsReq clearCocoonId() { + bitField0_ &= ~0x00000008; + cocoonId = 0; + return this; + } + + /** + * optional uint32 cocoon_id = 15; + * @return the cocoonId + */ + public int getCocoonId() { + return cocoonId; + } + + /** + * optional uint32 cocoon_id = 15; + * @param value the cocoonId to set + * @return this + */ + public StartCocoonStageCsReq setCocoonId(final int value) { + bitField0_ |= 0x00000008; + cocoonId = value; + return this; + } + @Override public StartCocoonStageCsReq copyFrom(final StartCocoonStageCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + propEntityId = other.propEntityId; worldLevel = other.worldLevel; wave = other.wave; cocoonId = other.cocoonId; - propEntityId = other.propEntityId; } return this; } @@ -215,6 +215,9 @@ public final class StartCocoonStageCsReqOuterClass { return this; } cachedSize = -1; + if (other.hasPropEntityId()) { + setPropEntityId(other.propEntityId); + } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } @@ -224,9 +227,6 @@ public final class StartCocoonStageCsReqOuterClass { if (other.hasCocoonId()) { setCocoonId(other.cocoonId); } - if (other.hasPropEntityId()) { - setPropEntityId(other.propEntityId); - } return this; } @@ -237,10 +237,10 @@ public final class StartCocoonStageCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; + propEntityId = 0; worldLevel = 0; wave = 0; cocoonId = 0; - propEntityId = 0; return this; } @@ -264,29 +264,29 @@ public final class StartCocoonStageCsReqOuterClass { } StartCocoonStageCsReq other = (StartCocoonStageCsReq) o; return bitField0_ == other.bitField0_ + && (!hasPropEntityId() || propEntityId == other.propEntityId) && (!hasWorldLevel() || worldLevel == other.worldLevel) && (!hasWave() || wave == other.wave) - && (!hasCocoonId() || cocoonId == other.cocoonId) - && (!hasPropEntityId() || propEntityId == other.propEntityId); + && (!hasCocoonId() || cocoonId == other.cocoonId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(worldLevel); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(wave); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(cocoonId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(wave); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(propEntityId); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(cocoonId); } } @@ -294,16 +294,16 @@ public final class StartCocoonStageCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); } return size; } @@ -315,36 +315,36 @@ public final class StartCocoonStageCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // worldLevel - worldLevel = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // wave - wave = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // cocoonId - cocoonId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 16: { // propEntityId propEntityId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // worldLevel + worldLevel = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // wave + wave = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // cocoonId + cocoonId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public final class StartCocoonStageCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.wave, wave); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.cocoonId, cocoonId); + output.writeUInt32(FieldNames.wave, wave); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.cocoonId, cocoonId); } output.endObject(); } @@ -390,12 +390,24 @@ public final class StartCocoonStageCsReqOuterClass { } 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 440007442: case 1305257111: { if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { worldLevel = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -406,7 +418,7 @@ public final class StartCocoonStageCsReqOuterClass { if (input.isAtField(FieldNames.wave)) { if (!input.trySkipNullValue()) { wave = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -418,18 +430,6 @@ public final class StartCocoonStageCsReqOuterClass { if (input.isAtField(FieldNames.cocoonId)) { if (!input.trySkipNullValue()) { cocoonId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -68717343: - case -57484005: { - if (input.isAtField(FieldNames.propEntityId)) { - if (!input.trySkipNullValue()) { - propEntityId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -490,13 +490,13 @@ public final class StartCocoonStageCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName 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 cocoonId = FieldName.forField("cocoonId", "cocoon_id"); - - static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java index 23c4043..7aff7c4 100644 --- a/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java @@ -19,27 +19,27 @@ public final class StartCocoonStageScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; - */ - private int retcode; - - /** - * optional uint32 wave = 2; - */ - private int wave; - - /** - * optional uint32 prop_entity_id = 14; + * optional uint32 prop_entity_id = 5; */ private int propEntityId; /** - * optional uint32 cocoon_id = 15; + * optional uint32 retcode = 6; + */ + private int retcode; + + /** + * optional uint32 wave = 7; + */ + private int wave; + + /** + * optional uint32 cocoon_id = 9; */ private int cocoonId; /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_info = 14; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -54,99 +54,25 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 retcode = 1; - * @return whether the retcode field is set + * optional uint32 prop_entity_id = 5; + * @return whether the propEntityId field is set */ - public boolean hasRetcode() { + public boolean hasPropEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 1; - * @return this - */ - public StartCocoonStageScRsp 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 StartCocoonStageScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 wave = 2; - * @return whether the wave field is set - */ - public boolean hasWave() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 wave = 2; - * @return this - */ - public StartCocoonStageScRsp clearWave() { - bitField0_ &= ~0x00000002; - wave = 0; - return this; - } - - /** - * optional uint32 wave = 2; - * @return the wave - */ - public int getWave() { - return wave; - } - - /** - * optional uint32 wave = 2; - * @param value the wave to set - * @return this - */ - public StartCocoonStageScRsp setWave(final int value) { - bitField0_ |= 0x00000002; - wave = value; - return this; - } - - /** - * optional uint32 prop_entity_id = 14; - * @return whether the propEntityId field is set - */ - public boolean hasPropEntityId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 prop_entity_id = 14; + * optional uint32 prop_entity_id = 5; * @return this */ public StartCocoonStageScRsp clearPropEntityId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; propEntityId = 0; return this; } /** - * optional uint32 prop_entity_id = 14; + * optional uint32 prop_entity_id = 5; * @return the propEntityId */ public int getPropEntityId() { @@ -154,18 +80,92 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 prop_entity_id = 14; + * optional uint32 prop_entity_id = 5; * @param value the propEntityId to set * @return this */ public StartCocoonStageScRsp setPropEntityId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; propEntityId = value; return this; } /** - * optional uint32 cocoon_id = 15; + * 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 StartCocoonStageScRsp 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 StartCocoonStageScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional uint32 wave = 7; + * @return whether the wave field is set + */ + public boolean hasWave() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 wave = 7; + * @return this + */ + public StartCocoonStageScRsp clearWave() { + bitField0_ &= ~0x00000004; + wave = 0; + return this; + } + + /** + * optional uint32 wave = 7; + * @return the wave + */ + public int getWave() { + return wave; + } + + /** + * optional uint32 wave = 7; + * @param value the wave to set + * @return this + */ + public StartCocoonStageScRsp setWave(final int value) { + bitField0_ |= 0x00000004; + wave = value; + return this; + } + + /** + * optional uint32 cocoon_id = 9; * @return whether the cocoonId field is set */ public boolean hasCocoonId() { @@ -173,7 +173,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 cocoon_id = 15; + * optional uint32 cocoon_id = 9; * @return this */ public StartCocoonStageScRsp clearCocoonId() { @@ -183,7 +183,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 cocoon_id = 15; + * optional uint32 cocoon_id = 9; * @return the cocoonId */ public int getCocoonId() { @@ -191,7 +191,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 cocoon_id = 15; + * optional uint32 cocoon_id = 9; * @param value the cocoonId to set * @return this */ @@ -202,7 +202,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_info = 14; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -210,7 +210,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_info = 14; * @return this */ public StartCocoonStageScRsp clearBattleInfo() { @@ -220,7 +220,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_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. @@ -234,7 +234,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_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 @@ -248,7 +248,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 11; + * optional .SceneBattleInfo battle_info = 14; * @param value the battleInfo to set * @return this */ @@ -264,9 +264,9 @@ public final class StartCocoonStageScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + propEntityId = other.propEntityId; retcode = other.retcode; wave = other.wave; - propEntityId = other.propEntityId; cocoonId = other.cocoonId; battleInfo.copyFrom(other.battleInfo); } @@ -279,15 +279,15 @@ public final class StartCocoonStageScRspOuterClass { return this; } cachedSize = -1; + if (other.hasPropEntityId()) { + setPropEntityId(other.propEntityId); + } if (other.hasRetcode()) { setRetcode(other.retcode); } if (other.hasWave()) { setWave(other.wave); } - if (other.hasPropEntityId()) { - setPropEntityId(other.propEntityId); - } if (other.hasCocoonId()) { setCocoonId(other.cocoonId); } @@ -304,9 +304,9 @@ public final class StartCocoonStageScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + propEntityId = 0; retcode = 0; wave = 0; - propEntityId = 0; cocoonId = 0; battleInfo.clear(); return this; @@ -333,9 +333,9 @@ public final class StartCocoonStageScRspOuterClass { } StartCocoonStageScRsp other = (StartCocoonStageScRsp) o; return bitField0_ == other.bitField0_ + && (!hasPropEntityId() || propEntityId == other.propEntityId) && (!hasRetcode() || retcode == other.retcode) && (!hasWave() || wave == other.wave) - && (!hasPropEntityId() || propEntityId == other.propEntityId) && (!hasCocoonId() || cocoonId == other.cocoonId) && (!hasBattleInfo() || battleInfo.equals(other.battleInfo)); } @@ -343,23 +343,23 @@ public final class StartCocoonStageScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(wave); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(propEntityId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(wave); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(cocoonId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 114); output.writeMessageNoTag(battleInfo); } } @@ -368,13 +368,13 @@ public final class StartCocoonStageScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); @@ -392,43 +392,43 @@ public final class StartCocoonStageScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { - // wave - wave = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 40: { // propEntityId propEntityId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 48) { break; } } - case 120: { + case 48: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // wave + wave = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { // cocoonId cocoonId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 90) { + if (tag != 114) { break; } } - case 90: { + case 114: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000010; @@ -455,13 +455,13 @@ public final class StartCocoonStageScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.wave, wave); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.wave, wave); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.cocoonId, cocoonId); @@ -479,11 +479,23 @@ public final class StartCocoonStageScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -68717343: + case -57484005: { + if (input.isAtField(FieldNames.propEntityId)) { + if (!input.trySkipNullValue()) { + propEntityId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 1097936398: { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -494,18 +506,6 @@ public final class StartCocoonStageScRspOuterClass { 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; } } else { @@ -590,12 +590,12 @@ public final class StartCocoonStageScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName wave = FieldName.forField("wave"); - static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); - static final FieldName cocoonId = FieldName.forField("cocoonId", "cocoon_id"); static final FieldName battleInfo = FieldName.forField("battleInfo", "battle_info"); diff --git a/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java index 6123b7b..8b3fb3e 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 = 3; + * optional uint32 src_slot = 9; */ private int srcSlot; /** - * optional uint32 plane_id = 8; - */ - private int planeId; - - /** - * optional uint32 dst_slot = 11; - */ - private int dstSlot; - - /** - * optional uint32 index = 13; + * optional uint32 index = 12; */ private int index; /** - * optional .ExtraLineupType extra_lineup_type = 5; + * optional uint32 dst_slot = 13; + */ + private int dstSlot; + + /** + * optional uint32 plane_id = 14; + */ + private int planeId; + + /** + * optional .ExtraLineupType extra_lineup_type = 4; */ private int extraLineupType; /** - * optional bool is_virtual = 4; + * optional bool is_virtual = 1; */ private boolean isVirtual; @@ -59,7 +59,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 src_slot = 3; + * optional uint32 src_slot = 9; * @return whether the srcSlot field is set */ public boolean hasSrcSlot() { @@ -67,7 +67,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 src_slot = 3; + * optional uint32 src_slot = 9; * @return this */ public SwapLineupCsReq clearSrcSlot() { @@ -77,7 +77,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 src_slot = 3; + * optional uint32 src_slot = 9; * @return the srcSlot */ public int getSrcSlot() { @@ -85,7 +85,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 src_slot = 3; + * optional uint32 src_slot = 9; * @param value the srcSlot to set * @return this */ @@ -96,44 +96,44 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 8; - * @return whether the planeId field is set + * optional uint32 index = 12; + * @return whether the index field is set */ - public boolean hasPlaneId() { + public boolean hasIndex() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 plane_id = 8; + * optional uint32 index = 12; * @return this */ - public SwapLineupCsReq clearPlaneId() { + public SwapLineupCsReq clearIndex() { bitField0_ &= ~0x00000002; - planeId = 0; + index = 0; return this; } /** - * optional uint32 plane_id = 8; - * @return the planeId + * optional uint32 index = 12; + * @return the index */ - public int getPlaneId() { - return planeId; + public int getIndex() { + return index; } /** - * optional uint32 plane_id = 8; - * @param value the planeId to set + * optional uint32 index = 12; + * @param value the index to set * @return this */ - public SwapLineupCsReq setPlaneId(final int value) { + public SwapLineupCsReq setIndex(final int value) { bitField0_ |= 0x00000002; - planeId = value; + index = value; return this; } /** - * optional uint32 dst_slot = 11; + * optional uint32 dst_slot = 13; * @return whether the dstSlot field is set */ public boolean hasDstSlot() { @@ -141,7 +141,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 dst_slot = 11; + * optional uint32 dst_slot = 13; * @return this */ public SwapLineupCsReq clearDstSlot() { @@ -151,7 +151,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 dst_slot = 11; + * optional uint32 dst_slot = 13; * @return the dstSlot */ public int getDstSlot() { @@ -159,7 +159,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 dst_slot = 11; + * optional uint32 dst_slot = 13; * @param value the dstSlot to set * @return this */ @@ -170,44 +170,44 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 index = 13; - * @return whether the index field is set + * optional uint32 plane_id = 14; + * @return whether the planeId field is set */ - public boolean hasIndex() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 index = 13; + * optional uint32 plane_id = 14; * @return this */ - public SwapLineupCsReq clearIndex() { + public SwapLineupCsReq clearPlaneId() { bitField0_ &= ~0x00000008; - index = 0; + planeId = 0; return this; } /** - * optional uint32 index = 13; - * @return the index + * optional uint32 plane_id = 14; + * @return the planeId */ - public int getIndex() { - return index; + public int getPlaneId() { + return planeId; } /** - * optional uint32 index = 13; - * @param value the index to set + * optional uint32 plane_id = 14; + * @param value the planeId to set * @return this */ - public SwapLineupCsReq setIndex(final int value) { + public SwapLineupCsReq setPlaneId(final int value) { bitField0_ |= 0x00000008; - index = value; + planeId = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 5; + * optional .ExtraLineupType extra_lineup_type = 4; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -215,7 +215,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 5; + * optional .ExtraLineupType extra_lineup_type = 4; * @return this */ public SwapLineupCsReq clearExtraLineupType() { @@ -225,7 +225,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 5; + * optional .ExtraLineupType extra_lineup_type = 4; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -258,7 +258,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 5; + * optional .ExtraLineupType extra_lineup_type = 4; * @param value the extraLineupType to set * @return this */ @@ -270,7 +270,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 4; + * optional bool is_virtual = 1; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -278,7 +278,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 4; + * optional bool is_virtual = 1; * @return this */ public SwapLineupCsReq clearIsVirtual() { @@ -288,7 +288,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 4; + * optional bool is_virtual = 1; * @return the isVirtual */ public boolean getIsVirtual() { @@ -296,7 +296,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 4; + * optional bool is_virtual = 1; * @param value the isVirtual to set * @return this */ @@ -312,9 +312,9 @@ public final class SwapLineupCsReqOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; srcSlot = other.srcSlot; - planeId = other.planeId; - dstSlot = other.dstSlot; index = other.index; + dstSlot = other.dstSlot; + planeId = other.planeId; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; } @@ -330,14 +330,14 @@ public final class SwapLineupCsReqOuterClass { if (other.hasSrcSlot()) { setSrcSlot(other.srcSlot); } - if (other.hasPlaneId()) { - setPlaneId(other.planeId); + if (other.hasIndex()) { + setIndex(other.index); } if (other.hasDstSlot()) { setDstSlot(other.dstSlot); } - if (other.hasIndex()) { - setIndex(other.index); + if (other.hasPlaneId()) { + setPlaneId(other.planeId); } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); @@ -356,9 +356,9 @@ public final class SwapLineupCsReqOuterClass { cachedSize = -1; bitField0_ = 0; srcSlot = 0; - planeId = 0; - dstSlot = 0; index = 0; + dstSlot = 0; + planeId = 0; extraLineupType = 0; isVirtual = false; return this; @@ -385,9 +385,9 @@ public final class SwapLineupCsReqOuterClass { SwapLineupCsReq other = (SwapLineupCsReq) o; return bitField0_ == other.bitField0_ && (!hasSrcSlot() || srcSlot == other.srcSlot) - && (!hasPlaneId() || planeId == other.planeId) - && (!hasDstSlot() || dstSlot == other.dstSlot) && (!hasIndex() || index == other.index) + && (!hasDstSlot() || dstSlot == other.dstSlot) + && (!hasPlaneId() || planeId == other.planeId) && (!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) 24); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(srcSlot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(planeId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(dstSlot); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(index); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 32); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeBoolNoTag(isVirtual); } } @@ -427,13 +427,13 @@ public final class SwapLineupCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(srcSlot); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(dstSlot); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } 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 24: { + case 72: { // srcSlot srcSlot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 96) { break; } } - case 64: { - // planeId - planeId = input.readUInt32(); + case 96: { + // index + index = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // dstSlot - dstSlot = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // index - index = input.readUInt32(); - bitField0_ |= 0x00000008; + // dstSlot + dstSlot = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 40) { + if (tag != 112) { break; } } - case 40: { + case 112: { + // planeId + planeId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { // 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 != 32) { + if (tag != 8) { break; } } - case 32: { + case 8: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000020; @@ -529,13 +529,13 @@ public final class SwapLineupCsReqOuterClass { output.writeUInt32(FieldNames.srcSlot, srcSlot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.dstSlot, dstSlot); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); @@ -565,11 +565,10 @@ public final class SwapLineupCsReqOuterClass { } break; } - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -589,10 +588,11 @@ public final class SwapLineupCsReqOuterClass { } 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_ |= 0x00000008; } } else { @@ -684,11 +684,11 @@ public final class SwapLineupCsReqOuterClass { static class FieldNames { static final FieldName srcSlot = FieldName.forField("srcSlot", "src_slot"); - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); + static final FieldName index = FieldName.forField("index"); static final FieldName dstSlot = FieldName.forField("dstSlot", "dst_slot"); - static final FieldName index = FieldName.forField("index"); + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); 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..7e1654c 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 = 11; */ private int index; @@ -34,7 +34,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 13; + * optional uint32 index = 11; * @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 = 11; * @return this */ public SwitchLineupIndexCsReq clearIndex() { @@ -52,7 +52,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 13; + * optional uint32 index = 11; * @return the index */ public int getIndex() { @@ -60,7 +60,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 13; + * optional uint32 index = 11; * @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) 88); output.writeUInt32NoTag(index); } } @@ -150,7 +150,7 @@ public final class SwitchLineupIndexCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 88: { // 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 f473942..5cba46a 100644 --- a/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java @@ -18,20 +18,16 @@ public final class SwitchLineupIndexScRspOuterClass { public static final class SwitchLineupIndexScRsp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 retcode = 3; + */ + private int retcode; + /** * optional uint32 index = 4; */ private int index; - /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; - */ - private int retcode; - private SwitchLineupIndexScRsp() { } @@ -42,12 +38,49 @@ public final class SwitchLineupIndexScRspOuterClass { return new SwitchLineupIndexScRsp(); } + /** + * optional uint32 retcode = 3; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 retcode = 3; + * @return this + */ + public SwitchLineupIndexScRsp 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 SwitchLineupIndexScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + /** * optional uint32 index = 4; * @return whether the index field is set */ public boolean hasIndex() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -55,7 +88,7 @@ public final class SwitchLineupIndexScRspOuterClass { * @return this */ public SwitchLineupIndexScRsp clearIndex() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; index = 0; return this; } @@ -74,61 +107,8 @@ public final class SwitchLineupIndexScRspOuterClass { * @return this */ public SwitchLineupIndexScRsp setIndex(final int value) { - bitField0_ |= 0x00000001; - index = value; - return this; - } - - /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; - * @return this - */ - public SwitchLineupIndexScRsp clearRetcode() { - bitField0_ &= ~0x00000002; - retcode = 0; - return this; - } - - /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; - * @param value the retcode to set - * @return this - */ - public SwitchLineupIndexScRsp setRetcode(final int value) { bitField0_ |= 0x00000002; - retcode = value; + index = value; return this; } @@ -137,8 +117,8 @@ public final class SwitchLineupIndexScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - index = other.index; retcode = other.retcode; + index = other.index; } return this; } @@ -149,12 +129,12 @@ public final class SwitchLineupIndexScRspOuterClass { return this; } cachedSize = -1; - if (other.hasIndex()) { - setIndex(other.index); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasIndex()) { + setIndex(other.index); + } return this; } @@ -165,8 +145,8 @@ public final class SwitchLineupIndexScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - index = 0; retcode = 0; + index = 0; return this; } @@ -190,19 +170,19 @@ public final class SwitchLineupIndexScRspOuterClass { } SwitchLineupIndexScRsp other = (SwitchLineupIndexScRsp) o; return bitField0_ == other.bitField0_ - && (!hasIndex() || index == other.index) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasIndex() || index == other.index); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(index); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(index); } } @@ -210,10 +190,10 @@ public final class SwitchLineupIndexScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } return size; } @@ -225,18 +205,18 @@ public final class SwitchLineupIndexScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // index - index = input.readUInt32(); + case 24: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 32) { break; } } - case 64: { - // retcode - retcode = input.readUInt32(); + case 32: { + // index + index = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -261,10 +241,10 @@ public final class SwitchLineupIndexScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.index, index); } output.endObject(); } @@ -276,10 +256,10 @@ public final class SwitchLineupIndexScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -287,10 +267,10 @@ public final class SwitchLineupIndexScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -351,9 +331,9 @@ public final class SwitchLineupIndexScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName index = FieldName.forField("index"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName index = FieldName.forField("index"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SyncClientResVersionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncClientResVersionCsReqOuterClass.java index a0bf647..bd0161f 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 = 13; + * optional uint32 client_res_version = 9; */ private int clientResVersion; @@ -34,7 +34,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 13; + * optional uint32 client_res_version = 9; * @return whether the clientResVersion field is set */ public boolean hasClientResVersion() { @@ -42,7 +42,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 13; + * optional uint32 client_res_version = 9; * @return this */ public SyncClientResVersionCsReq clearClientResVersion() { @@ -52,7 +52,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 13; + * optional uint32 client_res_version = 9; * @return the clientResVersion */ public int getClientResVersion() { @@ -60,7 +60,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 13; + * optional uint32 client_res_version = 9; * @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) 104); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(clientResVersion); } } @@ -150,7 +150,7 @@ public final class SyncClientResVersionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 72: { // 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 557db25..1d73e89 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java @@ -19,12 +19,12 @@ public final class SyncClientResVersionScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 client_res_version = 1; + * optional uint32 client_res_version = 6; */ private int clientResVersion; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; */ private int retcode; @@ -39,7 +39,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 client_res_version = 1; + * optional uint32 client_res_version = 6; * @return whether the clientResVersion field is set */ public boolean hasClientResVersion() { @@ -47,7 +47,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 client_res_version = 1; + * optional uint32 client_res_version = 6; * @return this */ public SyncClientResVersionScRsp clearClientResVersion() { @@ -57,7 +57,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 client_res_version = 1; + * optional uint32 client_res_version = 6; * @return the clientResVersion */ public int getClientResVersion() { @@ -65,7 +65,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 client_res_version = 1; + * optional uint32 client_res_version = 6; * @param value the clientResVersion to set * @return this */ @@ -76,7 +76,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -84,7 +84,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @return this */ public SyncClientResVersionScRsp clearRetcode() { @@ -94,7 +94,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -102,7 +102,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -177,11 +177,11 @@ public final class SyncClientResVersionScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } } @@ -205,16 +205,16 @@ public final class SyncClientResVersionScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 48: { // clientResVersion clientResVersion = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 88) { break; } } - case 96: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SyncLineupNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncLineupNotifyOuterClass.java index c62f297..86a05ca 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 = 3; + * optional .LineupInfo lineup = 10; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * repeated .SyncReason reason_list = 6; + * repeated .SyncReason reason_list = 13; */ private final RepeatedEnum reasonList = RepeatedEnum.newEmptyInstance(SyncReasonOuterClass.SyncReason.converter()); @@ -40,7 +40,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 10; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -48,7 +48,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 10; * @return this */ public SyncLineupNotify clearLineup() { @@ -58,7 +58,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -72,7 +72,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -86,7 +86,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 10; * @param value the lineup to set * @return this */ @@ -97,7 +97,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 6; + * repeated .SyncReason reason_list = 13; * @return whether the reasonList field is set */ public boolean hasReasonList() { @@ -105,7 +105,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 6; + * repeated .SyncReason reason_list = 13; * @return this */ public SyncLineupNotify clearReasonList() { @@ -115,7 +115,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 6; + * repeated .SyncReason reason_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. @@ -129,7 +129,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 6; + * repeated .SyncReason reason_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 @@ -143,7 +143,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 6; + * repeated .SyncReason reason_list = 13; * @param value the reasonList to add * @return this */ @@ -154,7 +154,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 6; + * repeated .SyncReason reason_list = 13; * @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) 26); + output.writeRawByte((byte) 82); output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < reasonList.length(); i++) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 104); output.writeEnumNoTag(reasonList.array()[i]); } } @@ -261,16 +261,16 @@ public final class SyncLineupNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { + case 82: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 106) { break; } } - case 50: { + case 106: { // reasonList [packed=true] input.readPackedEnum(reasonList, tag); bitField0_ |= 0x00000002; @@ -289,7 +289,7 @@ public final class SyncLineupNotifyOuterClass { tag = input.readTag(); break; } - case 48: { + case 104: { // reasonList [packed=false] tag = input.readRepeatedEnum(reasonList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/TakeOffEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeOffEquipmentCsReqOuterClass.java index 945639e..53ca551 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 = 2; + * optional uint32 base_avatar_id = 10; */ private int baseAvatarId; @@ -34,7 +34,7 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 2; + * optional uint32 base_avatar_id = 10; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -42,7 +42,7 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 2; + * optional uint32 base_avatar_id = 10; * @return this */ public TakeOffEquipmentCsReq clearBaseAvatarId() { @@ -52,7 +52,7 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 2; + * optional uint32 base_avatar_id = 10; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -60,7 +60,7 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 2; + * optional uint32 base_avatar_id = 10; * @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) 16); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(baseAvatarId); } } @@ -150,7 +150,7 @@ public final class TakeOffEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 80: { // 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 fb1cbc0..094d35b 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 = 15; + * optional uint32 base_avatar_id = 5; */ private int baseAvatarId; /** - * repeated uint32 slot_list = 11; + * repeated uint32 slot_list = 6; */ private final RepeatedInt slotList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 5; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -48,7 +48,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 5; * @return this */ public TakeOffRelicCsReq clearBaseAvatarId() { @@ -58,7 +58,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 5; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -66,7 +66,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 5; * @param value the baseAvatarId to set * @return this */ @@ -77,7 +77,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 11; + * repeated uint32 slot_list = 6; * @return whether the slotList field is set */ public boolean hasSlotList() { @@ -85,7 +85,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 11; + * repeated uint32 slot_list = 6; * @return this */ public TakeOffRelicCsReq clearSlotList() { @@ -95,7 +95,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 11; + * repeated uint32 slot_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 TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 11; + * repeated uint32 slot_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 TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 11; + * repeated uint32 slot_list = 6; * @param value the slotList to add * @return this */ @@ -134,7 +134,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 11; + * repeated uint32 slot_list = 6; * @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) 120); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < slotList.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(slotList.array()[i]); } } @@ -240,16 +240,16 @@ public final class TakeOffRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 40: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 50) { break; } } - case 90: { + case 50: { // slotList [packed=true] input.readPackedUInt32(slotList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class TakeOffRelicCsReqOuterClass { tag = input.readTag(); break; } - case 88: { + case 48: { // 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 0c78f12..253c0ff 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 promotion = 1; + * optional uint32 promotion = 11; */ private int promotion; /** - * optional uint32 base_avatar_id = 13; + * optional uint32 base_avatar_id = 12; */ private int baseAvatarId; @@ -39,7 +39,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 promotion = 1; + * optional uint32 promotion = 11; * @return whether the promotion field is set */ public boolean hasPromotion() { @@ -47,7 +47,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 promotion = 1; + * optional uint32 promotion = 11; * @return this */ public TakePromotionRewardCsReq clearPromotion() { @@ -57,7 +57,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 promotion = 1; + * optional uint32 promotion = 11; * @return the promotion */ public int getPromotion() { @@ -65,7 +65,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 promotion = 1; + * optional uint32 promotion = 11; * @param value the promotion to set * @return this */ @@ -76,7 +76,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 13; + * optional uint32 base_avatar_id = 12; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -84,7 +84,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 13; + * optional uint32 base_avatar_id = 12; * @return this */ public TakePromotionRewardCsReq clearBaseAvatarId() { @@ -94,7 +94,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 13; + * optional uint32 base_avatar_id = 12; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -102,7 +102,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 13; + * optional uint32 base_avatar_id = 12; * @param value the baseAvatarId to set * @return this */ @@ -177,11 +177,11 @@ public final class TakePromotionRewardCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(baseAvatarId); } } @@ -205,16 +205,16 @@ public final class TakePromotionRewardCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 88: { // promotion promotion = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 96) { break; } } - case 104: { + case 96: { // baseAvatarId baseAvatarId = 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 6b416f8..17fc93b 100644 --- a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java @@ -19,16 +19,12 @@ public final class TakePromotionRewardScRspOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 15; */ private int retcode; /** - * optional .ItemList reward_list = 11; + * optional .ItemList reward_list = 7; */ private final ItemListOuterClass.ItemList rewardList = ItemListOuterClass.ItemList.newInstance(); @@ -43,11 +39,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -55,11 +47,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 15; * @return this */ public TakePromotionRewardScRsp clearRetcode() { @@ -69,11 +57,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -81,11 +65,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * 
-     * repeated DFINCAGAMOF BKACCCFJMBI = 5;
-     *
- * - * optional uint32 retcode = 8; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -96,7 +76,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 11; + * optional .ItemList reward_list = 7; * @return whether the rewardList field is set */ public boolean hasRewardList() { @@ -104,7 +84,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 11; + * optional .ItemList reward_list = 7; * @return this */ public TakePromotionRewardScRsp clearRewardList() { @@ -114,7 +94,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 11; + * optional .ItemList 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. @@ -128,7 +108,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 11; + * optional .ItemList 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 @@ -142,7 +122,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 11; + * optional .ItemList reward_list = 7; * @param value the rewardList to set * @return this */ @@ -218,11 +198,11 @@ public final class TakePromotionRewardScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 58); output.writeMessageNoTag(rewardList); } } @@ -246,16 +226,16 @@ public final class TakePromotionRewardScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 58) { break; } } - case 90: { + case 58: { // rewardList input.readMessage(rewardList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeCsReqOuterClass.java index 52ab986..c1ba0e7 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 = 1; - */ - private int level; - - /** - * optional uint32 point_id = 11; + * optional uint32 point_id = 6; */ private int pointId; /** - * repeated .ItemCost item_list = 3; + * optional uint32 level = 13; + */ + private int level; + + /** + * repeated .ItemCost item_list = 11; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory()); @@ -45,62 +45,25 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 1; - * @return whether the level field is set + * optional uint32 point_id = 6; + * @return whether the pointId field is set */ - public boolean hasLevel() { + public boolean hasPointId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 level = 1; - * @return this - */ - public UnlockSkilltreeCsReq clearLevel() { - bitField0_ &= ~0x00000001; - level = 0; - return this; - } - - /** - * optional uint32 level = 1; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 1; - * @param value the level to set - * @return this - */ - public UnlockSkilltreeCsReq setLevel(final int value) { - bitField0_ |= 0x00000001; - level = value; - return this; - } - - /** - * optional uint32 point_id = 11; - * @return whether the pointId field is set - */ - public boolean hasPointId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 point_id = 11; + * optional uint32 point_id = 6; * @return this */ public UnlockSkilltreeCsReq clearPointId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; pointId = 0; return this; } /** - * optional uint32 point_id = 11; + * optional uint32 point_id = 6; * @return the pointId */ public int getPointId() { @@ -108,18 +71,55 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 11; + * optional uint32 point_id = 6; * @param value the pointId to set * @return this */ public UnlockSkilltreeCsReq setPointId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; pointId = value; return this; } /** - * repeated .ItemCost item_list = 3; + * optional uint32 level = 13; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 level = 13; + * @return this + */ + public UnlockSkilltreeCsReq clearLevel() { + bitField0_ &= ~0x00000002; + 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 UnlockSkilltreeCsReq setLevel(final int value) { + bitField0_ |= 0x00000002; + level = value; + return this; + } + + /** + * repeated .ItemCost item_list = 11; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -127,7 +127,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 3; + * repeated .ItemCost item_list = 11; * @return this */ public UnlockSkilltreeCsReq clearItemList() { @@ -137,7 +137,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 3; + * repeated .ItemCost item_list = 11; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 3; + * repeated .ItemCost item_list = 11; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 3; + * repeated .ItemCost item_list = 11; * @param value the itemList to add * @return this */ @@ -176,7 +176,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 3; + * repeated .ItemCost item_list = 11; * @param values the itemList to add * @return this */ @@ -191,8 +191,8 @@ public final class UnlockSkilltreeCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - level = other.level; pointId = other.pointId; + level = other.level; itemList.copyFrom(other.itemList); } return this; @@ -204,12 +204,12 @@ public final class UnlockSkilltreeCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasLevel()) { - setLevel(other.level); - } if (other.hasPointId()) { setPointId(other.pointId); } + if (other.hasLevel()) { + setLevel(other.level); + } if (other.hasItemList()) { getMutableItemList().addAll(other.itemList); } @@ -223,8 +223,8 @@ public final class UnlockSkilltreeCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - level = 0; pointId = 0; + level = 0; itemList.clear(); return this; } @@ -250,24 +250,24 @@ public final class UnlockSkilltreeCsReqOuterClass { } UnlockSkilltreeCsReq other = (UnlockSkilltreeCsReq) o; return bitField0_ == other.bitField0_ - && (!hasLevel() || level == other.level) && (!hasPointId() || pointId == other.pointId) + && (!hasLevel() || level == other.level) && (!hasItemList() || itemList.equals(other.itemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(pointId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(pointId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 90); output.writeMessageNoTag(itemList.get(i)); } } @@ -277,10 +277,10 @@ public final class UnlockSkilltreeCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(pointId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pointId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * itemList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(itemList); @@ -295,25 +295,25 @@ public final class UnlockSkilltreeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 48: { // pointId pointId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 104) { break; } } - case 26: { + case 104: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { // itemList tag = input.readRepeatedMessage(itemList, tag); bitField0_ |= 0x00000004; @@ -339,10 +339,10 @@ public final class UnlockSkilltreeCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.pointId, pointId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.pointId, pointId); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.itemList, itemList); @@ -357,10 +357,11 @@ public final class UnlockSkilltreeCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case -400606517: + case 466121258: { + if (input.isAtField(FieldNames.pointId)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + pointId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -368,11 +369,10 @@ public final class UnlockSkilltreeCsReqOuterClass { } break; } - case -400606517: - case 466121258: { - if (input.isAtField(FieldNames.pointId)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - pointId = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -445,10 +445,10 @@ public final class UnlockSkilltreeCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName level = FieldName.forField("level"); - static final FieldName pointId = FieldName.forField("pointId", "point_id"); + static final FieldName level = FieldName.forField("level"); + static final FieldName itemList = FieldName.forField("itemList", "item_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java index 3c3453e..6b5356f 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java @@ -19,25 +19,25 @@ public final class UnlockSkilltreeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 point_id = 2; - */ - private int pointId; - - /** - * optional uint32 level = 8; - */ - private int level; - - /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 3; */ private int baseAvatarId; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; */ private int retcode; + /** + * optional uint32 level = 10; + */ + private int level; + + /** + * optional uint32 point_id = 11; + */ + private int pointId; + private UnlockSkilltreeScRsp() { } @@ -49,99 +49,25 @@ public final class UnlockSkilltreeScRspOuterClass { } /** - * optional uint32 point_id = 2; - * @return whether the pointId field is set + * optional uint32 base_avatar_id = 3; + * @return whether the baseAvatarId field is set */ - public boolean hasPointId() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 point_id = 2; - * @return this - */ - public UnlockSkilltreeScRsp clearPointId() { - bitField0_ &= ~0x00000001; - pointId = 0; - return this; - } - - /** - * optional uint32 point_id = 2; - * @return the pointId - */ - public int getPointId() { - return pointId; - } - - /** - * optional uint32 point_id = 2; - * @param value the pointId to set - * @return this - */ - public UnlockSkilltreeScRsp setPointId(final int value) { - bitField0_ |= 0x00000001; - pointId = 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 UnlockSkilltreeScRsp 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 UnlockSkilltreeScRsp setLevel(final int value) { - bitField0_ |= 0x00000002; - level = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 10; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 3; * @return this */ public UnlockSkilltreeScRsp clearBaseAvatarId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; baseAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 3; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -149,36 +75,36 @@ public final class UnlockSkilltreeScRspOuterClass { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 3; * @param value the baseAvatarId to set * @return this */ public UnlockSkilltreeScRsp setBaseAvatarId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; baseAvatarId = 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 UnlockSkilltreeScRsp clearRetcode() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; retcode = 0; return this; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -186,25 +112,99 @@ public final class UnlockSkilltreeScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ public UnlockSkilltreeScRsp setRetcode(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; retcode = 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 UnlockSkilltreeScRsp 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 UnlockSkilltreeScRsp setLevel(final int value) { + bitField0_ |= 0x00000004; + level = value; + return this; + } + + /** + * optional uint32 point_id = 11; + * @return whether the pointId field is set + */ + public boolean hasPointId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 point_id = 11; + * @return this + */ + public UnlockSkilltreeScRsp clearPointId() { + bitField0_ &= ~0x00000008; + pointId = 0; + return this; + } + + /** + * optional uint32 point_id = 11; + * @return the pointId + */ + public int getPointId() { + return pointId; + } + + /** + * optional uint32 point_id = 11; + * @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; + level = other.level; + pointId = other.pointId; } return this; } @@ -215,18 +215,18 @@ public final class UnlockSkilltreeScRspOuterClass { return this; } cachedSize = -1; - if (other.hasPointId()) { - setPointId(other.pointId); - } - if (other.hasLevel()) { - setLevel(other.level); - } 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; + 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) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasRetcode() || retcode == other.retcode); + && (!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) 16); - output.writeUInt32NoTag(pointId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 80); - output.writeUInt32NoTag(baseAvatarId); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(pointId); } } @@ -294,17 +294,17 @@ public final class UnlockSkilltreeScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pointId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(pointId); + } return size; } @@ -315,18 +315,18 @@ public final class UnlockSkilltreeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // pointId - pointId = input.readUInt32(); + case 24: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 48) { break; } } - case 64: { - // level - level = input.readUInt32(); + case 48: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 80) { @@ -334,17 +334,17 @@ public final class UnlockSkilltreeScRspOuterClass { } } case 80: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + // level + level = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 120) { + if (tag != 88) { break; } } - case 120: { - // retcode - retcode = input.readUInt32(); + case 88: { + // pointId + pointId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,17 +369,17 @@ public final class UnlockSkilltreeScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.pointId, pointId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.level, level); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.pointId, pointId); + } output.endObject(); } @@ -390,35 +390,12 @@ public final class UnlockSkilltreeScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -400606517: - case 466121258: { - if (input.isAtField(FieldNames.pointId)) { - if (!input.trySkipNullValue()) { - pointId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 118022725: case -1756826157: { if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -429,6 +406,29 @@ public final class UnlockSkilltreeScRspOuterClass { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = 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 -400606517: + case 466121258: { + if (input.isAtField(FieldNames.pointId)) { + if (!input.trySkipNullValue()) { + 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 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/VectorOuterClass.java b/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java index 22771c2..884533d 100644 --- a/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java @@ -19,19 +19,19 @@ public final class VectorOuterClass { private static final long serialVersionUID = 0L; /** - * optional sint32 y = 6; + * optional sint32 x = 3; */ - private int y; + private int x; /** - * optional sint32 z = 9; + * optional sint32 z = 4; */ private int z; /** - * optional sint32 x = 10; + * optional sint32 y = 13; */ - private int x; + private int y; private Vector() { } @@ -44,44 +44,44 @@ public final class VectorOuterClass { } /** - * optional sint32 y = 6; - * @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 = 6; + * optional sint32 x = 3; * @return this */ - public Vector clearY() { + public Vector clearX() { bitField0_ &= ~0x00000001; - y = 0; + x = 0; return this; } /** - * optional sint32 y = 6; - * @return the y + * optional sint32 x = 3; + * @return the x */ - public int getY() { - return y; + public int getX() { + return x; } /** - * optional sint32 y = 6; - * @param value the y to set + * optional sint32 x = 3; + * @param value the x to set * @return this */ - public Vector setY(final int value) { + public Vector setX(final int value) { bitField0_ |= 0x00000001; - y = value; + x = value; return this; } /** - * optional sint32 z = 9; + * optional sint32 z = 4; * @return whether the z field is set */ public boolean hasZ() { @@ -89,7 +89,7 @@ public final class VectorOuterClass { } /** - * optional sint32 z = 9; + * optional sint32 z = 4; * @return this */ public Vector clearZ() { @@ -99,7 +99,7 @@ public final class VectorOuterClass { } /** - * optional sint32 z = 9; + * optional sint32 z = 4; * @return the z */ public int getZ() { @@ -107,7 +107,7 @@ public final class VectorOuterClass { } /** - * optional sint32 z = 9; + * optional sint32 z = 4; * @param value the z to set * @return this */ @@ -118,39 +118,39 @@ public final class VectorOuterClass { } /** - * optional sint32 x = 10; - * @return whether the x field is set + * optional sint32 y = 13; + * @return whether the y field is set */ - public boolean hasX() { + public boolean hasY() { return (bitField0_ & 0x00000004) != 0; } /** - * optional sint32 x = 10; + * optional sint32 y = 13; * @return this */ - public Vector clearX() { + public Vector clearY() { bitField0_ &= ~0x00000004; - x = 0; + y = 0; return this; } /** - * optional sint32 x = 10; - * @return the x + * optional sint32 y = 13; + * @return the y */ - public int getX() { - return x; + public int getY() { + return y; } /** - * optional sint32 x = 10; - * @param value the x to set + * optional sint32 y = 13; + * @param value the y to set * @return this */ - public Vector setX(final int value) { + public Vector setY(final int value) { bitField0_ |= 0x00000004; - x = value; + y = value; return this; } @@ -159,9 +159,9 @@ public final class VectorOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - y = other.y; - z = other.z; x = other.x; + z = other.z; + y = other.y; } return this; } @@ -172,14 +172,14 @@ public final class VectorOuterClass { return this; } cachedSize = -1; - if (other.hasY()) { - setY(other.y); + if (other.hasX()) { + setX(other.x); } if (other.hasZ()) { setZ(other.z); } - if (other.hasX()) { - setX(other.x); + if (other.hasY()) { + setY(other.y); } return this; } @@ -191,9 +191,9 @@ public final class VectorOuterClass { } cachedSize = -1; bitField0_ = 0; - y = 0; - z = 0; x = 0; + z = 0; + y = 0; return this; } @@ -217,24 +217,24 @@ public final class VectorOuterClass { } Vector other = (Vector) o; return bitField0_ == other.bitField0_ - && (!hasY() || y == other.y) + && (!hasX() || x == other.x) && (!hasZ() || z == other.z) - && (!hasX() || x == other.x); + && (!hasY() || y == other.y); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeSInt32NoTag(y); + output.writeRawByte((byte) 24); + output.writeSInt32NoTag(x); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 32); output.writeSInt32NoTag(z); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeSInt32NoTag(x); + output.writeRawByte((byte) 104); + output.writeSInt32NoTag(y); } } @@ -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); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeSInt32SizeNoTag(x); + size += 1 + ProtoSink.computeSInt32SizeNoTag(y); } return size; } @@ -260,27 +260,27 @@ public final class VectorOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // y - y = input.readSInt32(); + case 24: { + // x + x = input.readSInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 32) { break; } } - case 72: { + case 32: { // z z = input.readSInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 104) { break; } } - case 80: { - // x - x = input.readSInt32(); + case 104: { + // y + y = 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); } if ((bitField0_ & 0x00000004) != 0) { - output.writeSInt32(FieldNames.x, x); + output.writeSInt32(FieldNames.y, y); } output.endObject(); } @@ -323,10 +323,10 @@ public final class VectorOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 121: { - if (input.isAtField(FieldNames.y)) { + case 120: { + if (input.isAtField(FieldNames.x)) { if (!input.trySkipNullValue()) { - y = input.readSInt32(); + x = input.readSInt32(); bitField0_ |= 0x00000001; } } else { @@ -345,10 +345,10 @@ public final class VectorOuterClass { } break; } - case 120: { - if (input.isAtField(FieldNames.x)) { + case 121: { + if (input.isAtField(FieldNames.y)) { if (!input.trySkipNullValue()) { - x = input.readSInt32(); + y = 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 y = FieldName.forField("y"); + static final FieldName x = FieldName.forField("x"); static final FieldName z = FieldName.forField("z"); - static final FieldName x = FieldName.forField("x"); + static final FieldName y = FieldName.forField("y"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/WaitDelResourceOuterClass.java b/src/generated/main/emu/lunarcore/proto/WaitDelResourceOuterClass.java index ad7b970..e87d7aa 100644 --- a/src/generated/main/emu/lunarcore/proto/WaitDelResourceOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/WaitDelResourceOuterClass.java @@ -19,15 +19,15 @@ public final class WaitDelResourceOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 tid = 9; - */ - private int tid; - - /** - * optional uint32 num = 12; + * optional uint32 num = 6; */ private int num; + /** + * optional uint32 tid = 11; + */ + private int tid; + private WaitDelResource() { } @@ -39,62 +39,25 @@ public final class WaitDelResourceOuterClass { } /** - * optional uint32 tid = 9; - * @return whether the tid field is set + * optional uint32 num = 6; + * @return whether the num field is set */ - public boolean hasTid() { + public boolean hasNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 tid = 9; - * @return this - */ - public WaitDelResource clearTid() { - bitField0_ &= ~0x00000001; - tid = 0; - return this; - } - - /** - * optional uint32 tid = 9; - * @return the tid - */ - public int getTid() { - return tid; - } - - /** - * optional uint32 tid = 9; - * @param value the tid to set - * @return this - */ - public WaitDelResource setTid(final int value) { - bitField0_ |= 0x00000001; - tid = value; - return this; - } - - /** - * optional uint32 num = 12; - * @return whether the num field is set - */ - public boolean hasNum() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 num = 12; + * optional uint32 num = 6; * @return this */ public WaitDelResource clearNum() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; num = 0; return this; } /** - * optional uint32 num = 12; + * optional uint32 num = 6; * @return the num */ public int getNum() { @@ -102,23 +65,60 @@ public final class WaitDelResourceOuterClass { } /** - * optional uint32 num = 12; + * optional uint32 num = 6; * @param value the num to set * @return this */ public WaitDelResource setNum(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; num = value; return this; } + /** + * optional uint32 tid = 11; + * @return whether the tid field is set + */ + public boolean hasTid() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 tid = 11; + * @return this + */ + public WaitDelResource clearTid() { + bitField0_ &= ~0x00000002; + tid = 0; + return this; + } + + /** + * optional uint32 tid = 11; + * @return the tid + */ + public int getTid() { + return tid; + } + + /** + * optional uint32 tid = 11; + * @param value the tid to set + * @return this + */ + public WaitDelResource setTid(final int value) { + bitField0_ |= 0x00000002; + tid = value; + return this; + } + @Override public WaitDelResource copyFrom(final WaitDelResource other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - tid = other.tid; num = other.num; + tid = other.tid; } return this; } @@ -129,12 +129,12 @@ public final class WaitDelResourceOuterClass { return this; } cachedSize = -1; - if (other.hasTid()) { - setTid(other.tid); - } if (other.hasNum()) { setNum(other.num); } + if (other.hasTid()) { + setTid(other.tid); + } return this; } @@ -145,8 +145,8 @@ public final class WaitDelResourceOuterClass { } cachedSize = -1; bitField0_ = 0; - tid = 0; num = 0; + tid = 0; return this; } @@ -170,19 +170,19 @@ public final class WaitDelResourceOuterClass { } WaitDelResource other = (WaitDelResource) o; return bitField0_ == other.bitField0_ - && (!hasTid() || tid == other.tid) - && (!hasNum() || num == other.num); + && (!hasNum() || num == other.num) + && (!hasTid() || tid == other.tid); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(tid); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(num); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(num); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(tid); } } @@ -190,10 +190,10 @@ public final class WaitDelResourceOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(num); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(num); + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } return size; } @@ -205,18 +205,18 @@ public final class WaitDelResourceOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // tid - tid = input.readUInt32(); + case 48: { + // num + num = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 88) { break; } } - case 96: { - // num - num = input.readUInt32(); + case 88: { + // tid + tid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class WaitDelResourceOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.tid, tid); + output.writeUInt32(FieldNames.num, num); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.num, num); + output.writeUInt32(FieldNames.tid, tid); } output.endObject(); } @@ -256,10 +256,10 @@ public final class WaitDelResourceOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 114831: { - if (input.isAtField(FieldNames.tid)) { + case 109446: { + if (input.isAtField(FieldNames.num)) { if (!input.trySkipNullValue()) { - tid = input.readUInt32(); + num = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,10 +267,10 @@ public final class WaitDelResourceOuterClass { } break; } - case 109446: { - if (input.isAtField(FieldNames.num)) { + case 114831: { + if (input.isAtField(FieldNames.tid)) { if (!input.trySkipNullValue()) { - num = input.readUInt32(); + tid = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public final class WaitDelResourceOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName tid = FieldName.forField("tid"); - static final FieldName num = FieldName.forField("num"); + + static final FieldName tid = FieldName.forField("tid"); } } } diff --git a/src/main/java/emu/lunarcore/GameConstants.java b/src/main/java/emu/lunarcore/GameConstants.java index 4509f79..91b2372 100644 --- a/src/main/java/emu/lunarcore/GameConstants.java +++ b/src/main/java/emu/lunarcore/GameConstants.java @@ -4,8 +4,8 @@ import java.time.Instant; import java.time.ZoneOffset; public class GameConstants { - public static String VERSION = "1.3.0"; - public static String MDK_VERSION = "5377911"; + public static String VERSION = "1.4.0"; + public static String MDK_VERSION = ""; public static final ZoneOffset CURRENT_OFFSET = ZoneOffset.systemDefault().getRules().getOffset(Instant.now()); diff --git a/src/main/java/emu/lunarcore/game/battle/BattleService.java b/src/main/java/emu/lunarcore/game/battle/BattleService.java index 2f1f1ab..9737bad 100644 --- a/src/main/java/emu/lunarcore/game/battle/BattleService.java +++ b/src/main/java/emu/lunarcore/game/battle/BattleService.java @@ -30,7 +30,7 @@ public class BattleService extends BaseGameService { super(server); } - public void startBattle(Player player, int attackerId, int attackedGroupId, boolean castedSkill, RepeatedInt attackedList) { + public void startBattle(Player player, int casterId, int attackedGroupId, boolean castedSkill, RepeatedInt attackedList) { // Sanity check to make sure player isnt in a battle if (player.isInBattle()) { player.sendPacket(new PacketSceneCastSkillScRsp()); @@ -44,7 +44,7 @@ public class BattleService extends BaseGameService { boolean isPlayerCaster = false; // Set true if the player is the one casting // Check if attacker is the player or not - if (player.getScene().getAvatarEntityIds().contains(attackerId)) { + if (player.getScene().getAvatarEntityIds().contains(casterId)) { // Attacker is the player for (int entityId : attackedList) { GameEntity entity = player.getScene().getEntities().get(entityId); @@ -57,7 +57,7 @@ public class BattleService extends BaseGameService { isPlayerCaster = true; } else { // Player is ambushed - GameEntity entity = player.getScene().getEntities().get(attackerId); + GameEntity entity = player.getScene().getEntities().get(casterId); if (entity != null) { entities.add(entity); diff --git a/src/main/java/emu/lunarcore/server/packet/CmdId.java b/src/main/java/emu/lunarcore/server/packet/CmdId.java index c9645f4..0f611e7 100644 --- a/src/main/java/emu/lunarcore/server/packet/CmdId.java +++ b/src/main/java/emu/lunarcore/server/packet/CmdId.java @@ -5,957 +5,1020 @@ public class CmdId { public static final int NONE = 0; // Opcodes - public static final int BuyBpLevelScRsp = 3014; - public static final int TakeBpRewardCsReq = 3029; - public static final int BuyBpLevelCsReq = 3047; - public static final int BattlePassInfoNotify = 3007; - public static final int TakeAllRewardCsReq = 3092; - public static final int TakeAllRewardScRsp = 3087; - public static final int TakeBpRewardScRsp = 3083; - public static final int ReplaceLineupCsReq = 716; - public static final int QuitLineupCsReq = 714; - public static final int GetCurLineupDataScRsp = 729; - public static final int JoinLineupCsReq = 783; - public static final int SwapLineupScRsp = 790; - public static final int GetAllLineupDataCsReq = 793; - public static final int GetStageLineupCsReq = 707; - public static final int QuitLineupScRsp = 792; - public static final int SwapLineupCsReq = 787; - public static final int SyncLineupNotify = 732; - public static final int SetLineupNameCsReq = 756; - public static final int GetAllLineupDataScRsp = 702; - public static final int SetLineupNameScRsp = 740; - public static final int GetLineupAvatarDataCsReq = 706; - public static final int GetStageLineupScRsp = 725; - public static final int VirtualLineupDestroyNotify = 796; - public static final int SwitchLineupIndexCsReq = 705; - public static final int ReplaceLineupScRsp = 718; - public static final int ChangeLineupLeaderCsReq = 736; - public static final int GetLineupAvatarDataScRsp = 708; - public static final int JoinLineupScRsp = 747; - public static final int SwitchLineupIndexScRsp = 780; - public static final int ChangeLineupLeaderScRsp = 742; - public static final int GetCurLineupDataCsReq = 774; - public static final int EnterTrialActivityStageScRsp = 2668; - public static final int GetLoginActivityCsReq = 2607; - public static final int TakeTrialActivityRewardScRsp = 2663; - public static final int TakeMonsterResearchActivityRewardScRsp = 2696; - public static final int TakeLoginActivityRewardScRsp = 2629; - public static final int RogueChallengeActivityBuffChooseScRsp = 2670; - public static final int CurTrialActivityScNotify = 2609; - public static final int RogueChallengeRefreshAssistListScRsp = 2662; - public static final int GetMonsterResearchActivityDataScRsp = 2656; - public static final int EnterActivityBattleStageCsReq = 2684; - public static final int GetActivityScheduleConfigScRsp = 2647; - public static final int RogueChallengeBattleResultScNotify = 2698; - public static final int EnterTrialActivityStageCsReq = 2617; - public static final int RogueChallengeActivityDataScRsp = 2618; - public static final int StartTrialActivityScRsp = 2694; - public static final int GetMonsterResearchActivityDataCsReq = 2680; - public static final int LeaveTrialActivityScRsp = 2697; - public static final int RogueChallengeActivityBuffChooseScNotify = 2634; - public static final int GetTrialActivityDataScRsp = 2615; - public static final int RogueChallengeRefreshAssistListCsReq = 2678; - public static final int GetLoginActivityScRsp = 2625; - public static final int SubmitMonsterResearchActivityMaterialCsReq = 2640; - public static final int RogueChallengeActivityBuffChooseCsReq = 2685; - public static final int EnterActivityBattleStageScRsp = 2612; - public static final int TakeLoginActivityRewardCsReq = 2674; - public static final int RogueChallengeActivityDataCsReq = 2616; - public static final int GetActivityScheduleConfigCsReq = 2683; - public static final int LeaveTrialActivityCsReq = 2667; - public static final int GetTrialActivityDataCsReq = 2650; - public static final int TrialActivityDataChangeScNotify = 2645; - public static final int TakeTrialActivityRewardCsReq = 2630; - public static final int TakeMonsterResearchActivityRewardCsReq = 2602; - public static final int StartTrialActivityCsReq = 2665; - public static final int SubmitMonsterResearchActivityMaterialScRsp = 2693; - public static final int GetQuestDataCsReq = 907; - public static final int TakeQuestRewardCsReq = 974; - public static final int QuestRecordScNotify = 987; - public static final int TakeQuestRewardScRsp = 929; - public static final int GetQuestDataScRsp = 925; - public static final int GetQuestRecordCsReq = 914; - public static final int GetQuestRecordScRsp = 992; - public static final int FinishQuestCsReq = 990; - public static final int FinishQuestScRsp = 932; - public static final int GetRndOptionCsReq = 3407; - public static final int GetRndOptionScRsp = 3425; - public static final int DailyFirstMeetPamCsReq = 3474; - public static final int DailyFirstMeetPamScRsp = 3429; - public static final int TrainVisitorBehaviorFinishCsReq = 3707; - public static final int TrainVisitorBehaviorFinishScRsp = 3725; - public static final int GetTrainVisitorBehaviorScRsp = 3729; - public static final int TrainRefreshTimeNotify = 3783; - public static final int GetTrainVisitorBehaviorCsReq = 3774; - public static final int BattleLogReportScRsp = 132; - public static final int PVEBattleResultScRsp = 125; - public static final int QuitBattleCsReq = 174; - public static final int QuitBattleScNotify = 187; - public static final int GetCurBattleInfoCsReq = 183; - public static final int BattleLogReportCsReq = 190; - public static final int SyncClientResVersionCsReq = 114; - public static final int QuitBattleScRsp = 129; - public static final int PVEBattleResultCsReq = 107; - public static final int GetCurBattleInfoScRsp = 147; - public static final int SyncClientResVersionScRsp = 192; - public static final int UnlockChatBubbleScNotify = 5183; - public static final int SelectChatBubbleCsReq = 5174; - public static final int UnlockPhoneThemeScNotify = 5192; - public static final int GetPhoneDataCsReq = 5107; - public static final int SelectPhoneThemeCsReq = 5147; - public static final int SelectChatBubbleScRsp = 5129; - public static final int SelectPhoneThemeScRsp = 5114; - public static final int GetPhoneDataScRsp = 5125; - public static final int PlayerReturnForceFinishScNotify = 4532; - public static final int PlayerReturnStartScNotify = 4507; - public static final int PlayerReturnSignCsReq = 4525; - public static final int PlayerReturnTakePointRewardCsReq = 4583; - public static final int PlayerReturnTakePointRewardScRsp = 4547; - public static final int PlayerReturnInfoQueryScRsp = 4590; - public static final int PlayerReturnPointChangeScNotify = 4529; - public static final int PlayerReturnInfoQueryCsReq = 4587; - public static final int PlayerReturnTakeRewardCsReq = 4514; - public static final int PlayerReturnTakeRewardScRsp = 4592; - public static final int PlayerReturnSignScRsp = 4574; - public static final int TakeBattleCollegeGroupRewardCsReq = 5747; - public static final int TakeBattleCollegeGroupRewardScRsp = 5714; - public static final int BattleCollegeDataChangeScNotify = 5774; - public static final int GetBattleCollegeDataCsReq = 5707; - public static final int StartBattleCollegeCsReq = 5729; - public static final int StartBattleCollegeScRsp = 5783; - public static final int GetBattleCollegeDataScRsp = 5725; - public static final int GetFirstTalkNpcCsReq = 2183; - public static final int GetFirstTalkNpcScRsp = 2147; - public static final int FinishFirstTalkNpcScRsp = 2192; - public static final int FinishFirstTalkNpcCsReq = 2114; - public static final int GetNpcTakenRewardScRsp = 2125; - public static final int GetFirstTalkByPerformanceNpcCsReq = 2132; - public static final int FinishFirstTalkByPerformanceNpcCsReq = 2108; - public static final int TakeTalkRewardScRsp = 2129; - public static final int GetNpcTakenRewardCsReq = 2107; - public static final int SelectInclinationTextCsReq = 2187; - public static final int GetFirstTalkByPerformanceNpcScRsp = 2106; - public static final int TakeTalkRewardCsReq = 2174; - public static final int FinishFirstTalkByPerformanceNpcScRsp = 2136; - public static final int SelectInclinationTextScRsp = 2190; - public static final int SetHeadIconScRsp = 2829; - public static final int GetPlayerBoardDataCsReq = 2807; - public static final int SetHeadIconCsReq = 2874; - public static final int UnlockHeadIconScNotify = 2887; - public static final int SetSignatureScRsp = 2832; - public static final int SetIsDisplayAvatarInfoScRsp = 2892; - public static final int SetSignatureCsReq = 2890; - public static final int SetAssistAvatarCsReq = 2806; - public static final int SetDisplayAvatarCsReq = 2883; - public static final int SetIsDisplayAvatarInfoCsReq = 2814; - public static final int SetDisplayAvatarScRsp = 2847; - public static final int GetPlayerBoardDataScRsp = 2825; - public static final int SetAssistAvatarScRsp = 2808; - public static final int StartAlleyEventCsReq = 4714; - public static final int GetAlleyInfoCsReq = 4707; - public static final int LogisticsGameScRsp = 4729; - public static final int AlleyGuaranteedFundsScRsp = 4727; - public static final int AlleyPlacingGameCsReq = 4708; - public static final int SaveLogisticsScRsp = 4735; - public static final int AlleyEventEffectNotify = 4790; - public static final int AlleyShipUnlockScNotify = 4785; - public static final int GetSaveLogisticsMapCsReq = 4719; - public static final int AlleyShipUsedCountScNotify = 4777; - public static final int AlleyPlacingGameScRsp = 4736; - public static final int LogisticsScoreRewardSyncInfoScNotify = 4712; - public static final int RefreshAlleyOrderScRsp = 4756; - public static final int GetAlleyInfoScRsp = 4725; - public static final int GetSaveLogisticsMapScRsp = 4799; - public static final int AlleyTakeEventRewardCsReq = 4776; - public static final int AlleyGuaranteedFundsCsReq = 4722; - public static final int RefreshAlleyOrderCsReq = 4780; - public static final int SaveLogisticsCsReq = 4770; - public static final int LogisticsDetonateStarSkiffCsReq = 4734; - public static final int PrestigeLevelUpCsReq = 4702; - public static final int LogisticsInfoScNotify = 4713; - public static final int AlleyTakeEventRewardScRsp = 4733; - public static final int LogisticsDetonateStarSkiffScRsp = 4784; - public static final int AlleyFundsScNotify = 4716; - public static final int AlleyShipmentEventEffectsScNotify = 4771; - public static final int StartAlleyEventScRsp = 4792; - public static final int AlleyShopLevelScNotify = 4718; - public static final int AlleyOrderChangedScNotify = 4740; - public static final int LogisticsGameCsReq = 4774; - public static final int TakePrestigeRewardCsReq = 4732; - public static final int PrestigeLevelUpScRsp = 4796; - public static final int TakePrestigeRewardScRsp = 4706; - public static final int AlleyEventChangeNotify = 4787; - public static final int GetDailyActiveInfoCsReq = 3374; - public static final int TakeAllApRewardCsReq = 3347; - public static final int TakeAllApRewardScRsp = 3314; - public static final int TakeApRewardCsReq = 3307; - public static final int DailyActiveInfoNotify = 3383; - public static final int GetDailyActiveInfoScRsp = 3329; - public static final int TakeApRewardScRsp = 3325; - public static final int GetFantasticStoryActivityDataScRsp = 4925; - public static final int EnterFantasticStoryActivityStageScRsp = 4983; - public static final int EnterFantasticStoryActivityStageCsReq = 4929; - public static final int FinishChapterScNotify = 4974; - public static final int FantasticStoryActivityBattleEndScNotify = 4947; - public static final int GetFantasticStoryActivityDataCsReq = 4907; - public static final int TrialBackGroundMusicScRsp = 3192; - public static final int UnlockBackGroundMusicScRsp = 3147; - public static final int UnlockBackGroundMusicCsReq = 3183; - public static final int PlayBackGroundMusicScRsp = 3129; - public static final int GetJukeboxDataScRsp = 3125; - public static final int TrialBackGroundMusicCsReq = 3114; - public static final int PlayBackGroundMusicCsReq = 3174; - public static final int GetJukeboxDataCsReq = 3107; - public static final int FinishSectionIdCsReq = 2714; - public static final int GetNpcStatusCsReq = 2774; - public static final int FinishSectionIdScRsp = 2792; - public static final int GetNpcMessageGroupScRsp = 2725; - public static final int GetNpcMessageGroupCsReq = 2707; - public static final int FinishPerformSectionIdCsReq = 2787; - public static final int FinishPerformSectionIdScRsp = 2790; - public static final int GetNpcStatusScRsp = 2729; - public static final int FinishItemIdCsReq = 2783; - public static final int FinishItemIdScRsp = 2747; - public static final int GetGachaInfoCsReq = 1907; - public static final int DoGachaCsReq = 1974; - public static final int GetGachaCeilingCsReq = 1983; - public static final int DoGachaScRsp = 1929; - public static final int ExchangeGachaCeilingCsReq = 1914; - public static final int GetGachaInfoScRsp = 1925; - public static final int ExchangeGachaCeilingScRsp = 1992; - public static final int GetGachaCeilingScRsp = 1947; - public static final int AcceptActivityExpeditionScRsp = 2532; - public static final int AcceptActivityExpeditionCsReq = 2590; - public static final int TakeExpeditionRewardScRsp = 2592; - public static final int AcceptExpeditionScRsp = 2529; - public static final int TakeExpeditionRewardCsReq = 2514; - public static final int GetExpeditionDataCsReq = 2507; - public static final int ExpeditionDataChangeScNotify = 2587; - public static final int CancelActivityExpeditionScRsp = 2508; - public static final int CancelActivityExpeditionCsReq = 2506; - public static final int GetExpeditionDataScRsp = 2525; - public static final int CancelExpeditionScRsp = 2547; - public static final int CancelExpeditionCsReq = 2583; - public static final int TakeActivityExpeditionRewardScRsp = 2542; - public static final int AcceptExpeditionCsReq = 2574; - public static final int TakeActivityExpeditionRewardCsReq = 2536; - public static final int SyncAcceptedPamMissionNotify = 4074; - public static final int AcceptedPamMissionExpireCsReq = 4007; - public static final int AcceptedPamMissionExpireScRsp = 4025; - public static final int FinishPlotScRsp = 1125; - public static final int FinishPlotCsReq = 1107; - public static final int SpringTransferCsReq = 1436; - public static final int LastSpringRefreshTimeNotify = 1493; - public static final int EnterSectionScRsp = 1413; - public static final int GetCurSceneInfoCsReq = 1414; - public static final int InteractPropCsReq = 1474; - public static final int ActivateFarmElementCsReq = 1464; - public static final int GetSceneMapInfoCsReq = 1439; - public static final int EnterSectionCsReq = 1435; - public static final int StartCocoonStageCsReq = 1433; - public static final int SpringTransferScRsp = 1442; - public static final int SetClientPausedCsReq = 1478; - public static final int GetCurSceneInfoScRsp = 1492; - public static final int ReturnLastTownScRsp = 1496; - public static final int GetSpringRecoverDataScRsp = 1472; - public static final int GetEnteredSceneCsReq = 1431; - public static final int SavePointsInfoNotify = 1476; - public static final int HealPoolInfoNotify = 1417; - public static final int GameplayCounterRecoverScRsp = 1444; - public static final int GameplayCounterCountDownCsReq = 1454; - public static final int SceneEntityDisappearScNotify = 1490; - public static final int SyncServerSceneChangeNotify = 1443; - public static final int GetSceneMapInfoScRsp = 1424; - public static final int SceneEnterStageCsReq = 1416; - public static final int SetCurInteractEntityCsReq = 1499; - public static final int SpringRefreshCsReq = 1456; - public static final int ActivateFarmElementScRsp = 1453; - public static final int SpringRecoverCsReq = 1415; - public static final int SceneCastSkillMpUpdateScNotify = 1405; - public static final int SetGroupCustomSaveDataScRsp = 1494; - public static final int SpringRefreshScRsp = 1440; - public static final int SetSpringRecoverConfigScRsp = 1450; - public static final int SceneEntityTeleportCsReq = 1482; - public static final int GetUnlockTeleportCsReq = 1455; - public static final int SceneUpdatePositionVersionNotify = 1406; - public static final int UpdateFloorSavedValueNotify = 1457; - public static final int ReturnLastTownCsReq = 1402; - public static final int SceneEntityDieScNotify = 1498; - public static final int GetSpringRecoverDataCsReq = 1500; - public static final int GameplayCounterUpdateScNotify = 1469; - public static final int InteractPropScRsp = 1429; - public static final int ScenePlaneEventScNotify = 1460; - public static final int EnterSceneCsReq = 1410; - public static final int SyncEntityBuffChangeListScNotify = 1408; - public static final int RefreshTriggerPropScNotify = 1423; - public static final int GameplayCounterCountDownScRsp = 1449; - public static final int RefreshTriggerPropCsReq = 1451; - public static final int EnterSceneByServerScNotify = 1421; - public static final int SpringRecoverSingleAvatarCsReq = 1468; - public static final int EntityBindPropScRsp = 1412; - public static final int StartCocoonStageScRsp = 1434; - public static final int SetClientPausedScRsp = 1462; - public static final int GroupStateChangeScRsp = 1452; - public static final int SetGroupCustomSaveDataCsReq = 1465; - public static final int SceneCastSkillCsReq = 1483; - public static final int SceneEntityMoveCsReq = 1407; - public static final int GroupStateChangeCsReq = 1420; - public static final int SceneCastSkillScRsp = 1447; - public static final int EntityBindPropCsReq = 1484; - public static final int EnterSceneScRsp = 1401; - public static final int SceneEntityMoveScRsp = 1425; - public static final int EnteredSceneChangeScNotify = 1404; - public static final int ReEnterLastElementStageCsReq = 1409; - public static final int SetCurInteractEntityScRsp = 1477; - public static final int UpdateMechanismBarScNotify = 1463; - public static final int SceneEntityUpdateScNotify = 1487; - public static final int SetSpringRecoverConfigCsReq = 1475; - public static final int GroupStateChangeScNotify = 1437; - public static final int RecoverAllLineupScRsp = 1427; - public static final int GetEnteredSceneScRsp = 1426; - public static final int GameplayCounterRecoverCsReq = 1486; - public static final int SceneEntityMoveScNotify = 1432; - public static final int SpringRecoverScRsp = 1445; - public static final int GetUnlockTeleportScRsp = 1446; - public static final int SpringRecoverSingleAvatarScRsp = 1430; - public static final int ReEnterLastElementStageScRsp = 1441; - public static final int RecoverAllLineupCsReq = 1422; - public static final int RefreshTriggerPropScRsp = 1491; - public static final int SceneEnterStageScRsp = 1418; - public static final int SceneEntityTeleportScRsp = 1481; - public static final int SceneGroupRefreshScNotify = 1438; - public static final int GetChallengeRaidInfoCsReq = 2247; - public static final int StartRaidCsReq = 2207; - public static final int ChallengeRaidNotify = 2290; - public static final int GetRaidInfoCsReq = 2232; - public static final int GetAllSaveRaidScRsp = 2256; - public static final int TakeChallengeRaidRewardScRsp = 2287; - public static final int RaidKickByServerScNotify = 2293; - public static final int GetSaveRaidScRsp = 2205; - public static final int SetClientRaidTargetCountScRsp = 2236; - public static final int SetClientRaidTargetCountCsReq = 2208; - public static final int GetSaveRaidCsReq = 2242; - public static final int GetRaidInfoScRsp = 2206; - public static final int RaidInfoNotify = 2283; - public static final int GetAllSaveRaidCsReq = 2280; - public static final int LeaveRaidCsReq = 2274; - public static final int TakeChallengeRaidRewardCsReq = 2292; - public static final int StartRaidScRsp = 2225; - public static final int LeaveRaidScRsp = 2229; - public static final int GetChallengeRaidInfoScRsp = 2214; - public static final int DelSaveRaidScNotify = 2240; - public static final int PrepareRogueAdventureRoomCsReq = 5625; - public static final int GetRogueShopBuffInfoScRsp = 5614; - public static final int BuyRogueShopMiracleCsReq = 5692; - public static final int GetRogueAdventureRoomInfoCsReq = 5636; - public static final int BuyRogueShopBuffCsReq = 5690; - public static final int GetRogueAdventureRoomInfoScRsp = 5642; - public static final int SyncRogueCommonBuffDisplayScNotify = 5605; - public static final int PrepareRogueAdventureRoomScRsp = 5674; - public static final int GetRogueShopMiracleInfoScRsp = 5683; - public static final int RogueNpcDisappearCsReq = 5606; - public static final int SyncRogueAdventureRoomInfoScNotify = 5607; - public static final int SyncRogueCommonMiracleDisplayScNotify = 5680; - public static final int BuyRogueShopMiracleScRsp = 5687; - public static final int BuyRogueShopBuffScRsp = 5632; - public static final int GetRogueShopBuffInfoCsReq = 5647; - public static final int GetRogueShopMiracleInfoCsReq = 5629; - public static final int RogueNpcDisappearScRsp = 5608; - public static final int SyncRogueCommonItemDisplayScNotify = 5656; - public static final int MuseumDispatchFinishedScNotify = 4318; - public static final int BuyNpcStuffScRsp = 4329; - public static final int MuseumTargetMissionFinishNotify = 4370; - public static final int MuseumRandomEventSelectCsReq = 4396; - public static final int MuseumRandomEventStartScNotify = 4340; - public static final int GetExhibitScNotify = 4390; - public static final int FinishCurTurnCsReq = 4332; - public static final int GetMuseumInfoCsReq = 4307; - public static final int MuseumTargetRewardNotify = 4335; - public static final int MuseumRandomEventSelectScRsp = 4316; - public static final int MuseumTakeCollectRewardScRsp = 4371; - public static final int MuseumTakeCollectRewardCsReq = 4313; - public static final int FinishCurTurnScRsp = 4306; - public static final int SetStuffToAreaScRsp = 4347; - public static final int UpgradeAreaScRsp = 4336; - public static final int BuyNpcStuffCsReq = 4374; - public static final int UpgradeAreaCsReq = 4308; - public static final int UpgradeAreaStatScRsp = 4305; - public static final int MuseumFundsChangedScNotify = 4356; - public static final int MuseumRandomEventQueryCsReq = 4393; - public static final int MuseumRandomEventQueryScRsp = 4302; - public static final int RemoveStuffFromAreaScRsp = 4392; - public static final int SetStuffToAreaCsReq = 4383; - public static final int GetMuseumInfoScRsp = 4325; - public static final int MuseumTargetStartNotify = 4385; - public static final int MuseumInfoChangedScNotify = 4380; - public static final int UpgradeAreaStatCsReq = 4342; - public static final int RemoveStuffFromAreaCsReq = 4314; - public static final int GetStuffScNotify = 4387; - public static final int GetShareDataCsReq = 4174; - public static final int CancelCacheNotifyScRsp = 4190; - public static final int ShareCsReq = 4107; - public static final int TriggerHealVoiceScRsp = 4192; - public static final int ShareScRsp = 4125; - public static final int CancelCacheNotifyCsReq = 4187; - public static final int TriggerHealVoiceCsReq = 4114; - public static final int TakePictureScRsp = 4147; - public static final int TakePictureCsReq = 4183; - public static final int GetShareDataScRsp = 4129; - public static final int TakeMailAttachmentCsReq = 814; - public static final int GetMailCsReq = 807; - public static final int NewMailScNotify = 887; - public static final int DelMailScRsp = 847; - public static final int GetMailScRsp = 825; - public static final int MarkReadMailScRsp = 829; - public static final int DelMailCsReq = 883; - public static final int MarkReadMailCsReq = 874; - public static final int TakeMailAttachmentScRsp = 892; - public static final int GetBasicInfoScRsp = 72; - public static final int ExchangeStaminaCsReq = 36; - public static final int SetGenderCsReq = 84; - public static final int ExchangeStaminaScRsp = 42; - public static final int SetPlayerInfoScRsp = 62; - public static final int PlayerLoginFinishScRsp = 10; - public static final int GetVideoVersionKeyScRsp = 21; - public static final int PlayerLoginScRsp = 25; - public static final int GateServerScNotify = 94; - public static final int GmTalkScRsp = 32; - public static final int ServerAnnounceNotify = 19; - public static final int GetHeroBasicTypeInfoScRsp = 27; - public static final int GetLevelRewardScRsp = 85; - public static final int SetHeroBasicTypeScRsp = 77; - public static final int GetSecretKeyInfoScRsp = 82; - public static final int SetPlayerInfoCsReq = 78; - public static final int FeatureSwitchClosedScNotify = 67; - public static final int PlayerHeartBeatScRsp = 65; - public static final int ReserveStaminaExchangeCsReq = 43; - public static final int GetVideoVersionKeyCsReq = 1; - public static final int GmTalkScNotify = 92; - public static final int SetGenderScRsp = 12; - public static final int AceAntiCheaterScRsp = 17; - public static final int RegionStopScNotify = 56; - public static final int QueryProductInfoScRsp = 79; - public static final int RetcodeNotify = 30; - public static final int SetLanguageCsReq = 13; - public static final int PlayerGetTokenCsReq = 83; - public static final int PlayerLoginFinishCsReq = 81; - public static final int SetGameplayBirthdayScRsp = 15; - public static final int GetLevelRewardTakenListScRsp = 16; - public static final int GetLevelRewardTakenListCsReq = 96; - public static final int UpdatePlayerSettingScRsp = 57; - public static final int UpdatePlayerSettingCsReq = 59; - public static final int SetNicknameScRsp = 2; - public static final int GetAuthkeyCsReq = 5; - public static final int ReserveStaminaExchangeScRsp = 55; - public static final int SetHeroBasicTypeCsReq = 99; - public static final int SetLanguageScRsp = 71; - public static final int AceAntiCheaterCsReq = 45; - public static final int UpdateFeatureSwitchScNotify = 53; - public static final int DailyRefreshNotify = 75; - public static final int PlayerGetTokenScRsp = 47; - public static final int PlayerLoginCsReq = 7; - public static final int MonthCardRewardNotify = 68; - public static final int SetGameplayBirthdayCsReq = 50; - public static final int SetRedPointStatusScNotify = 60; - public static final int GetAuthkeyScRsp = 80; - public static final int HeroBasicTypeChangedNotify = 98; - public static final int GetSecretKeyInfoCsReq = 41; - public static final int StaminaInfoScNotify = 46; - public static final int PlayerHeartBeatCsReq = 63; - public static final int GetBasicInfoCsReq = 100; - public static final int AntiAddictScNotify = 40; - public static final int GetLevelRewardCsReq = 18; - public static final int PlayerLogoutCsReq = 74; - public static final int ClientDownloadDataScNotify = 64; - public static final int PlayerKickOutScNotify = 87; - public static final int PlayerLogoutScRsp = 29; - public static final int GetHeroBasicTypeInfoCsReq = 22; - public static final int GmTalkCsReq = 90; - public static final int QueryProductInfoCsReq = 73; - public static final int SetNicknameCsReq = 93; - public static final int GetSingleRedDotParamGroupScRsp = 5947; - public static final int UpdateRedDotDataScRsp = 5929; - public static final int UpdateRedDotDataCsReq = 5974; - public static final int GetAllRedDotDataScRsp = 5925; - public static final int GetSingleRedDotParamGroupCsReq = 5983; - public static final int GetAllRedDotDataCsReq = 5907; - public static final int EnterAdventureScRsp = 1325; - public static final int EnterAdventureCsReq = 1307; - public static final int GetCurChallengeCsReq = 1790; - public static final int GetChallengeCsReq = 1707; - public static final int TakeChallengeRewardCsReq = 1742; - public static final int LeaveChallengeCsReq = 1783; - public static final int TakeChallengeRewardScRsp = 1705; - public static final int StartChallengeScRsp = 1729; - public static final int LeaveChallengeScRsp = 1747; - public static final int TakeChallengeTargetRewardCsReq = 1708; - public static final int GetCurChallengeScRsp = 1732; - public static final int GetChallengeScRsp = 1725; - public static final int FinishChallengeScRsp = 1787; - public static final int StartChallengeCsReq = 1774; - public static final int FinishChallengeCsReq = 1792; - public static final int ChallengeSettleNotify = 1714; - public static final int ChallengeLineupNotify = 1706; - public static final int TakeChallengeTargetRewardScRsp = 1736; - public static final int GetAvatarDataCsReq = 307; - public static final int DressRelicAvatarScRsp = 380; - public static final int TakeOffEquipmentCsReq = 332; - public static final int DressAvatarScRsp = 390; - public static final int DressRelicAvatarCsReq = 305; - public static final int GetAvatarDataScRsp = 325; - public static final int RankUpAvatarCsReq = 336; - public static final int UnlockSkilltreeScRsp = 347; - public static final int TakeOffRelicScRsp = 340; - public static final int DressAvatarCsReq = 387; - public static final int TakeOffRelicCsReq = 356; - public static final int AvatarExpUpScRsp = 329; - public static final int TakePromotionRewardCsReq = 393; - public static final int PromoteAvatarCsReq = 314; - public static final int TakePromotionRewardScRsp = 302; - public static final int AvatarExpUpCsReq = 374; - public static final int UnlockSkilltreeCsReq = 383; - public static final int PromoteAvatarScRsp = 392; - public static final int AddAvatarScNotify = 308; - public static final int RankUpAvatarScRsp = 342; - public static final int TakeOffEquipmentScRsp = 306; - public static final int GetChatFriendHistoryScRsp = 3992; - public static final int MarkChatEmojiCsReq = 3932; - public static final int GetChatFriendHistoryCsReq = 3914; - public static final int GetPrivateChatHistoryCsReq = 3983; - public static final int SendMsgScRsp = 3925; - public static final int GetChatEmojiListScRsp = 3990; - public static final int PrivateMsgOfflineUsersScNotify = 3929; - public static final int GetPrivateChatHistoryScRsp = 3947; - public static final int BatchMarkChatEmojiScRsp = 3936; - public static final int BatchMarkChatEmojiCsReq = 3908; - public static final int RevcMsgScNotify = 3974; - public static final int SendMsgCsReq = 3907; - public static final int GetChatEmojiListCsReq = 3987; - public static final int MarkChatEmojiScRsp = 3906; - public static final int UnlockTutorialScRsp = 1647; - public static final int UnlockTutorialGuideScRsp = 1692; - public static final int UnlockTutorialGuideCsReq = 1614; - public static final int FinishTutorialGuideCsReq = 1632; - public static final int FinishTutorialGuideScRsp = 1606; - public static final int GetTutorialCsReq = 1607; - public static final int GetTutorialScRsp = 1625; - public static final int GetTutorialGuideCsReq = 1674; - public static final int FinishTutorialScRsp = 1690; - public static final int FinishTutorialCsReq = 1687; - public static final int UnlockTutorialCsReq = 1683; - public static final int GetTutorialGuideScRsp = 1629; - public static final int TakeCityShopRewardScRsp = 1547; - public static final int CityShopInfoScNotify = 1514; - public static final int BuyGoodsCsReq = 1574; - public static final int BuyGoodsScRsp = 1529; - public static final int GetShopListScRsp = 1525; - public static final int GetShopListCsReq = 1507; - public static final int TakeCityShopRewardCsReq = 1583; - public static final int EnterFightActivityStageCsReq = 3629; - public static final int FightActivityDataChangeScNotify = 3674; - public static final int TakeFightActivityRewardCsReq = 3647; - public static final int GetFightActivityDataScRsp = 3625; - public static final int GetFightActivityDataCsReq = 3607; - public static final int TakeFightActivityRewardScRsp = 3614; - public static final int EnterFightActivityStageScRsp = 3683; - public static final int SharePunkLordMonsterScRsp = 3247; - public static final int TakePunkLordPointRewardScRsp = 3236; - public static final int PunkLordMonsterInfoScNotify = 3242; - public static final int PunkLordDataChangeNotify = 3299; - public static final int GetPunkLordBattleRecordScRsp = 3222; - public static final int SummonPunkLordMonsterCsReq = 3214; - public static final int GetKilledPunkLordMonsterDataScRsp = 3285; - public static final int PunkLordRaidTimeOutScNotify = 3240; - public static final int GetKilledPunkLordMonsterDataCsReq = 3218; - public static final int GetPunkLordMonsterDataScRsp = 3225; - public static final int SharePunkLordMonsterCsReq = 3283; - public static final int StartPunkLordRaidCsReq = 3274; - public static final int TakeKilledPunkLordMonsterScoreScRsp = 3219; - public static final int TakePunkLordPointRewardCsReq = 3208; - public static final int TakeKilledPunkLordMonsterScoreCsReq = 3271; - public static final int GetPunkLordDataScRsp = 3280; - public static final int PunkLordMonsterKilledNotify = 3213; - public static final int StartPunkLordRaidScRsp = 3229; - public static final int GetPunkLordBattleRecordCsReq = 3277; - public static final int SummonPunkLordMonsterScRsp = 3292; - public static final int GetPunkLordDataCsReq = 3205; - public static final int PunkLordBattleResultScNotify = 3216; - public static final int GetPunkLordMonsterDataCsReq = 3207; - public static final int AcceptMissionEventScRsp = 1240; - public static final int GetMissionDataScRsp = 1225; - public static final int StartFinishSubMissionScNotify = 1271; - public static final int InterruptMissionEventScRsp = 1216; - public static final int GetMissionEventDataScRsp = 1205; - public static final int FinishTalkMissionCsReq = 1274; - public static final int GetMissionEventDataCsReq = 1242; - public static final int FinishCosumeItemMissionScRsp = 1236; - public static final int GetMainMissionCustomValueCsReq = 1222; - public static final int AcceptMainMissionCsReq = 1299; - public static final int DailyTaskDataScNotify = 1292; - public static final int StartFinishMainMissionScNotify = 1219; - public static final int GetMissionStatusCsReq = 1293; - public static final int GetMissionDataCsReq = 1207; - public static final int MissionEventRewardScNotify = 1280; - public static final int GetMissionStatusScRsp = 1202; - public static final int TeleportToMissionResetPointCsReq = 1235; - public static final int AcceptMissionEventCsReq = 1256; - public static final int TeleportToMissionResetPointScRsp = 1213; - public static final int SetMissionEventProgressScRsp = 1285; - public static final int SubMissionRewardScNotify = 1270; - public static final int FinishTalkMissionScRsp = 1229; - public static final int GetMainMissionCustomValueScRsp = 1227; - public static final int MissionAcceptScNotify = 1276; - public static final int MissionRewardScNotify = 1283; - public static final int SetMissionEventProgressCsReq = 1218; - public static final int MissionGroupWarnScNotify = 1206; - public static final int SyncTaskScRsp = 1214; - public static final int AcceptMainMissionScRsp = 1277; - public static final int InterruptMissionEventCsReq = 1296; - public static final int FinishCosumeItemMissionCsReq = 1208; - public static final int SyncTaskCsReq = 1247; - public static final int PlayerSyncScNotify = 607; - public static final int ExpUpRelicCsReq = 542; - public static final int SellItemScRsp = 593; - public static final int ExpUpEquipmentCsReq = 532; - public static final int AutoUseTurnFoodNotify = 598; - public static final int GetRecyleTimeScRsp = 513; - public static final int ComposeItemScRsp = 536; - public static final int CancelTurnFoodCsReq = 578; - public static final int AddEquipmentScNotify = 570; - public static final int ExpUpEquipmentScRsp = 506; - public static final int GetMarkItemListScRsp = 527; - public static final int SetTurnFoodScRsp = 512; - public static final int ComposeItemCsReq = 508; - public static final int LockRelicCsReq = 580; - public static final int RechargeSuccNotify = 502; - public static final int ExpUpRelicScRsp = 505; - public static final int MarkItemScRsp = 533; - public static final int RankUpEquipmentCsReq = 587; - public static final int GetRecyleTimeCsReq = 535; - public static final int DestroyItemScRsp = 577; - public static final int GetBagScRsp = 525; - public static final int ComposeLimitNumUpdateNotify = 519; - public static final int LockEquipmentCsReq = 583; - public static final int PromoteEquipmentScRsp = 529; - public static final int ComposeSelectedRelicScRsp = 585; - public static final int SetTurnFoodCsReq = 584; - public static final int RankUpEquipmentScRsp = 590; - public static final int LockRelicScRsp = 556; - public static final int UseItemScRsp = 592; - public static final int ExchangeHcoinScRsp = 516; - public static final int PromoteEquipmentCsReq = 574; - public static final int DestroyItemCsReq = 599; - public static final int SellItemCsReq = 540; - public static final int ExchangeHcoinCsReq = 596; - public static final int GetBagCsReq = 507; - public static final int GetMarkItemListCsReq = 522; - public static final int ComposeLimitNumCompleteNotify = 571; - public static final int ComposeSelectedRelicCsReq = 518; - public static final int CancelMarkItemNotify = 534; - public static final int MarkItemCsReq = 576; - public static final int LockEquipmentScRsp = 547; - public static final int CancelTurnFoodScRsp = 562; - public static final int UseItemCsReq = 514; - public static final int TextJoinQueryCsReq = 3874; - public static final int TextJoinSaveScRsp = 3825; - public static final int TextJoinQueryScRsp = 3829; - public static final int TextJoinBatchSaveScRsp = 3847; - public static final int TextJoinBatchSaveCsReq = 3883; - public static final int TextJoinSaveCsReq = 3807; - public static final int UseTreasureDungeonItemScRsp = 4496; - public static final int FightTreasureDungeonMonsterCsReq = 4480; - public static final int InteractTreasureDungeonGridScRsp = 4493; - public static final int OpenTreasureDungeonGridCsReq = 4442; - public static final int QuitTreasureDungeonCsReq = 4416; - public static final int EnterTreasureDungeonScRsp = 4436; - public static final int UseTreasureDungeonItemCsReq = 4402; - public static final int OpenTreasureDungeonGridScRsp = 4405; - public static final int GetTreasureDungeonActivityDataScRsp = 4406; - public static final int QuitTreasureDungeonScRsp = 4418; - public static final int GetTreasureDungeonActivityDataCsReq = 4432; - public static final int EnterTreasureDungeonCsReq = 4408; - public static final int FightTreasureDungeonMonsterScRsp = 4456; - public static final int InteractTreasureDungeonGridCsReq = 4440; - public static final int TreasureDungeonDataScNotify = 4407; - public static final int TreasureDungeonFinishScNotify = 4425; - public static final int GetAssistListScRsp = 2919; - public static final int SetFriendRemarkNameScRsp = 2996; - public static final int GetPlatformPlayerInfoCsReq = 2962; - public static final int DeleteFriendCsReq = 2908; - public static final int SetAssistScRsp = 2977; - public static final int GetFriendLoginInfoScRsp = 2979; - public static final int GetFriendApplyListInfoCsReq = 2983; - public static final int SyncAddBlacklistScNotify = 2956; - public static final int DeleteFriendScRsp = 2936; - public static final int DeleteBlacklistScRsp = 2970; - public static final int AddBlacklistScRsp = 2980; - public static final int SearchPlayerScRsp = 2913; - public static final int GetFriendRecommendListInfoCsReq = 2940; - public static final int GetAssistHistoryCsReq = 2976; - public static final int ReportPlayerScRsp = 2918; - public static final int SyncApplyFriendScNotify = 2987; - public static final int TakeAssistRewardScRsp = 2912; - public static final int GetAssistListCsReq = 2971; - public static final int ReportPlayerCsReq = 2916; - public static final int CurAssistChangedNotify = 2978; - public static final int NewAssistHistoryNotify = 2934; - public static final int GetFriendListInfoScRsp = 2925; - public static final int GetAssistHistoryScRsp = 2933; - public static final int GetPlayerDetailInfoScRsp = 2929; - public static final int HandleFriendScRsp = 2932; - public static final int GetPlayerDetailInfoCsReq = 2974; - public static final int SearchPlayerCsReq = 2935; - public static final int GetFriendLoginInfoCsReq = 2973; - public static final int ApplyFriendScRsp = 2992; - public static final int AddBlacklistCsReq = 2905; - public static final int GetPlatformPlayerInfoScRsp = 2998; - public static final int SetForbidOtherApplyFriendCsReq = 2964; - public static final int SetAssistCsReq = 2999; - public static final int SyncHandleFriendScNotify = 2906; - public static final int GetFriendRecommendListInfoScRsp = 2993; - public static final int ApplyFriendCsReq = 2914; - public static final int SyncDeleteFriendScNotify = 2942; - public static final int SetForbidOtherApplyFriendScRsp = 2953; - public static final int GetCurAssistCsReq = 2922; - public static final int HandleFriendCsReq = 2990; - public static final int GetFriendListInfoCsReq = 2907; - public static final int SetFriendRemarkNameCsReq = 2902; - public static final int TakeAssistRewardCsReq = 2984; - public static final int GetCurAssistScRsp = 2927; - public static final int GetFriendApplyListInfoScRsp = 2947; - public static final int DeleteBlacklistCsReq = 2985; - public static final int GetBoxingClubInfoCsReq = 4207; - public static final int GetBoxingClubInfoScRsp = 4225; - public static final int GiveUpBoxingClubChallengeScRsp = 4292; - public static final int BoxingClubRewardScNotify = 4287; - public static final int MatchBoxingClubOpponentCsReq = 4274; - public static final int MatchBoxingClubOpponentScRsp = 4229; - public static final int BoxingClubChallengeUpdateScNotify = 4290; - public static final int GiveUpBoxingClubChallengeCsReq = 4214; - public static final int StartBoxingClubBattleCsReq = 4283; - public static final int StartBoxingClubBattleScRsp = 4247; - public static final int GetPlayerReturnMultiDropInfoCsReq = 4629; - public static final int GetMultipleDropInfoCsReq = 4607; - public static final int MultipleDropInfoScNotify = 4674; - public static final int GetMultipleDropInfoScRsp = 4625; - public static final int GetPlayerReturnMultiDropInfoScRsp = 4683; - public static final int MultipleDropInfoNotify = 4647; - public static final int GetReplayTokenCsReq = 3507; - public static final int GetPlayerReplayInfoScRsp = 3529; - public static final int GetPlayerReplayInfoCsReq = 3574; - public static final int GetReplayTokenScRsp = 3525; - public static final int RollRogueBuffScRsp = 1808; - public static final int FinishAeonDialogueGroupCsReq = 1826; - public static final int EnterRogueMapRoomScRsp = 1878; - public static final int SelectRogueMiracleCsReq = 1834; - public static final int SyncRogueBuffSwapInfoScNotify = 1813; - public static final int SelectRogueBuffCsReq = 1890; - public static final int StartRogueScRsp = 1829; - public static final int GetRogueInfoCsReq = 1807; - public static final int GetRogueBuffEnhanceInfoScRsp = 1818; - public static final int GetRogueScoreRewardInfoScRsp = 1849; - public static final int SelectRogueBonusCsReq = 1864; - public static final int EnterRogueCsReq = 1883; - public static final int RemoveRogueMiracleScNotify = 1841; - public static final int SyncRogueAreaUnlockScNotify = 1860; - public static final int FinishRogueDialogueGroupScRsp = 1817; - public static final int TakeRogueEventHandbookRewardCsReq = 1886; - public static final int GetRogueBuffEnhanceInfoCsReq = 1816; - public static final int SyncRoguePickAvatarInfoScNotify = 1803; - public static final int TakeRogueScoreRewardCsReq = 1802; - public static final int ReplaceRogueMiracleDisplayScNotify = 1852; - public static final int SyncRogueGetItemScNotify = 1839; - public static final int UpdateRogueMiracleScNotify = 1882; - public static final int SyncRogueEventHandbookScNotify = 1820; - public static final int FinishRogueDialogueGroupCsReq = 1845; - public static final int SelectRogueMiracleScRsp = 1884; - public static final int SyncRogueMiracleScNotify = 1888; - public static final int SyncRogueAeonScNotify = 1821; - public static final int SyncRogueFinishScNotify = 1842; - public static final int RollRogueBuffCsReq = 1806; - public static final int SyncRogueBonusSelectInfoScNotify = 1879; - public static final int EnterRogueScRsp = 1847; - public static final int PickRogueAvatarCsReq = 1805; - public static final int GetRogueScoreRewardInfoCsReq = 1854; - public static final int ExchangeRogueRewardKeyCsReq = 1863; - public static final int GetRogueInitialScoreScRsp = 1898; - public static final int LeaveRogueScRsp = 1892; - public static final int TakeRogueMiracleHandbookRewardCsReq = 1869; - public static final int EnhanceRogueBuffCsReq = 1885; - public static final int GetRogueInitialScoreCsReq = 1862; - public static final int SelectRogueDialogueEventCsReq = 1881; - public static final int SyncRogueMiracleHandbookScNotify = 1858; - public static final int GetRogueAeonInfoCsReq = 1837; - public static final int EnhanceRogueBuffScRsp = 1870; - public static final int AddRogueBuffScNotify = 1856; - public static final int SyncRogueStatusScNotify = 1848; - public static final int GetRogueInfoScRsp = 1825; - public static final int ReforgeRogueBuffScRsp = 1875; - public static final int AddRogueMiracleScNotify = 1809; - public static final int GetRogueAeonInfoScRsp = 1831; - public static final int SwapRogueBuffScRsp = 1819; - public static final int ExchangeRogueRewardKeyScRsp = 1865; - public static final int TradeRogueMiracleScRsp = 1897; - public static final int SyncRogueAeonLevelUpRewardScNotify = 1857; - public static final int GetRogueDialogueEventDataScRsp = 1815; - public static final int QuitRogueCsReq = 1877; - public static final int SyncRogueBuffSelectInfoScNotify = 1887; - public static final int SelectRogueDialogueEventScRsp = 1810; - public static final int TakeRogueAeonLevelRewardScRsp = 1843; - public static final int GetRogueDialogueEventDataCsReq = 1850; - public static final int ReviveRogueAvatarCsReq = 1840; - public static final int ReforgeRogueBuffCsReq = 1872; - public static final int ReviveRogueAvatarScRsp = 1893; - public static final int TakeRogueEventHandbookRewardScRsp = 1844; - public static final int GetRogueTalentInfoScRsp = 1891; - public static final int SyncRogueVirtualItemInfoScNotify = 1866; - public static final int SyncRogueMapRoomScNotify = 1873; - public static final int StartRogueCsReq = 1874; - public static final int SyncRogueMiracleTradeInfoScNotify = 1894; - public static final int OpenRogueChestCsReq = 1868; - public static final int FinishAeonDialogueGroupScRsp = 1804; - public static final int EnableRogueTalentCsReq = 1823; - public static final int SyncRogueMiracleInfoScNotify = 1855; - public static final int SyncRogueDialogueEventDataScNotify = 1801; - public static final int SyncRogueBuffReforgeInfoScNotify = 1900; - public static final int SelectRogueBonusScRsp = 1853; - public static final int EnableRogueTalentScRsp = 1895; - public static final int OpenRogueChestScRsp = 1830; - public static final int TradeRogueMiracleCsReq = 1867; - public static final int RemoveRogueBuffScNotify = 1835; - public static final int SelectRogueBuffScRsp = 1832; - public static final int TakeRogueMiracleHandbookRewardScRsp = 1838; - public static final int GetRogueTalentInfoCsReq = 1851; - public static final int SyncRogueSeasonFinishScNotify = 1833; - public static final int LeaveRogueCsReq = 1814; - public static final int GetRogueHandbookDataCsReq = 1846; - public static final int QuitRogueScRsp = 1822; - public static final int SyncRogueRewardInfoScNotify = 1861; - public static final int PickRogueAvatarScRsp = 1880; - public static final int GetRogueHandbookDataScRsp = 1859; - public static final int EnterRogueMapRoomCsReq = 1812; - public static final int SyncRogueMiracleSelectInfoScNotify = 1836; - public static final int TakeRogueAeonLevelRewardCsReq = 1824; - public static final int SwapRogueBuffCsReq = 1871; - public static final int TakeRogueScoreRewardScRsp = 1896; - public static final int SyncRogueReviveInfoScNotify = 1899; - public static final int ChessRogueConfirmRollCsReq = 5514; - public static final int ChessRogueSelectBpCsReq = 5454; - public static final int ChessRogueUpdateLevelBaseInfoScNotify = 5563; - public static final int ChessRogueCellUpdateNotify = 5582; - public static final int ChessRogueUpdateActionPointScNotify = 5553; - public static final int SyncChessRogueMainStoryFinishScNotify = 5535; - public static final int ReforgeChessRogueBuffScRsp = 5461; - public static final int ReforgeChessRogueBuffCsReq = 5523; - public static final int EnhanceChessRogueBuffScRsp = 5539; - public static final int ChessRogueQueryAeonDimensionsCsReq = 5434; - public static final int EnhanceChessRogueBuffCsReq = 5572; - public static final int ChessRogueQueryScRsp = 5524; - public static final int ChessRogueStartScRsp = 5599; - public static final int ChessRogueUpdateAeonModifierValueScNotify = 5499; - public static final int ReplaceChessRogueMiracleDisplayScNotify = 5585; - public static final int GetChessRogueStoryAeonTalkInfoScRsp = 5531; - public static final int AddChessRogueBuffScNotify = 5546; - public static final int TradeChessRogueMiracleCsReq = 5573; - public static final int RepairChessRogueMiracleScRsp = 5438; - public static final int ChessRogueSelectBpScRsp = 5417; - public static final int ChessRogueEnterScRsp = 5594; - public static final int ChessRogueQuitScRsp = 5449; - public static final int ChessRogueChangeyAeonDimensionNotify = 5480; - public static final int AddChessRogueMiracleScNotify = 5476; - public static final int SyncChessRogueBuffSelectInfoScNotify = 5418; - public static final int SelectChessRogueMiracleCsReq = 5404; - public static final int SyncChessRogueMiracleRepairInfoScNotify = 5544; - public static final int ChessRogueUpdateAllowedSelectCellScNotify = 5568; - public static final int ChessRogueQuitCsReq = 5580; - public static final int ChessRogueGoAheadScRsp = 5567; - public static final int ChessRogueReRollDiceCsReq = 5528; - public static final int DropChessRogueBuffScRsp = 5508; - public static final int SelectChessRogueBuffScRsp = 5547; - public static final int SyncChessRogueMiracleInfoScNotify = 5463; - public static final int FinishChessRogueSubStoryCsReq = 5405; - public static final int ChessRogueGiveUpRollScRsp = 5490; - public static final int ChessRogueLayerAccountInfoNotify = 5478; - public static final int ChessRogueEnterCsReq = 5525; - public static final int ChessRogueEnterCellScRsp = 5526; - public static final int SelectChessRogueMiracleScRsp = 5460; - public static final int ChessRogueUpdateDiceInfoScNotify = 5552; - public static final int ChessRogueReRollDiceScRsp = 5527; - public static final int RemoveChessRogueBuffScNotify = 5458; - public static final int ChessRogueStartCsReq = 5550; - public static final int ChessRoguePickAvatarCsReq = 5481; - public static final int ChessRogueUpdateReviveInfoScNotify = 5414; - public static final int SyncChessRogueMiracleTradeInfoScNotify = 5428; - public static final int SelectChessRogueSubStoryScRsp = 5409; - public static final int ChessRogueGiveUpCsReq = 5432; - public static final int ChessRogueRollDiceScRsp = 5447; - public static final int DropChessRogueBuffCsReq = 5541; - public static final int FinishChessRogueSubStoryScRsp = 5598; - public static final int SelectChessRogueBonusCsReq = 5538; - public static final int ChessRogueQueryBpScRsp = 5484; - public static final int ChessRogueUpdateBoardScNotify = 5453; - public static final int GetChessRogueStoryInfoCsReq = 5593; - public static final int SelectChessRogueSubStoryCsReq = 5543; - public static final int ChessRogueGiveUpScRsp = 5542; - public static final int SyncChessRogueBuffDropInfoScNotify = 5486; - public static final int ChessRogueUpdateUnlockLevelScNotify = 5574; - public static final int ChessRogueQuestFinishNotify = 5492; - public static final int TradeChessRogueMiracleScRsp = 5557; - public static final int ChessRogueReviveAvatarScRsp = 5401; - public static final int ChessRogueEnterNextLayerScRsp = 5427; - public static final int ChessRogueEnterNextLayerCsReq = 5596; - public static final int ChessRogueQueryCsReq = 5416; - public static final int ChessRogueMoveCellNotify = 5590; - public static final int ChessRogueUpdateMoneyInfoScNotify = 5556; - public static final int RollChessRogueBuffCsReq = 5587; - public static final int ChessRogueQueryBpCsReq = 5471; - public static final int ChessRogueSelectCellScRsp = 5530; - public static final int EnterChessRogueAeonRoomScRsp = 5500; - public static final int SyncChessRogueBuffReforgeInfoScNotify = 5560; - public static final int ChessRogueFinishCurRoomNotify = 5511; - public static final int ChessRogueRollDiceCsReq = 5591; - public static final int SyncChessRogueBonusSelectInfoScNotify = 5467; - public static final int ChessRogueCheatRollScRsp = 5600; - public static final int GetChessRogueStoryAeonTalkInfoCsReq = 5518; - public static final int ChessRogueGiveUpRollCsReq = 5408; - public static final int GetChessRogueBuffEnhanceInfoCsReq = 5512; - public static final int RemoveChessRogueMiracleScNotify = 5555; - public static final int ChessRogueLeaveScRsp = 5450; - public static final int ChessRogueCheatRollCsReq = 5569; - public static final int SelectChessRogueBonusScRsp = 5588; - public static final int RollChessRogueBuffScRsp = 5436; - public static final int ChessRogueLeaveCsReq = 5554; - public static final int ChessRogueReviveAvatarCsReq = 5558; - public static final int ChessRogueConfirmRollScRsp = 5495; - public static final int EnterChessRogueAeonRoomCsReq = 5422; - public static final int GetChessRogueBuffEnhanceInfoScRsp = 5425; - public static final int ChessRoguePickAvatarScRsp = 5482; - public static final int RepairChessRogueMiracleCsReq = 5420; - public static final int UpdateChessRogueMiracleScNotify = 5444; - public static final int GetChessRogueStoryInfoScRsp = 5597; - public static final int ChessRogueGoAheadCsReq = 5505; - public static final int SelectChessRogueBuffCsReq = 5464; - public static final int SyncChessRogueMiracleSelectInfoScNotify = 5472; - public static final int ChessRogueQueryAeonDimensionsScRsp = 5494; - public static final int ChessRogueEnterCellCsReq = 5426; - public static final int ChessRogueSelectCellCsReq = 5579; - public static final int RogueModifierDelNotify = 5387; - public static final int RogueModifierUpdateNotify = 5392; - public static final int RogueModifierSelectCellScRsp = 5383; - public static final int RogueModifierAddNotify = 5374; - public static final int RogueModifierSelectCellCsReq = 5329; - public static final int GetUpdatedArchiveDataCsReq = 2374; - public static final int GetUpdatedArchiveDataScRsp = 2329; - public static final int GetArchiveDataScRsp = 2325; - public static final int GetArchiveDataCsReq = 2307; - public static final int GetChapterScRsp = 447; - public static final int WaypointShowNewCsNotify = 414; - public static final int TakeChapterRewardCsReq = 492; - public static final int GetWaypointScRsp = 425; - public static final int TakeChapterRewardScRsp = 487; - public static final int SetCurWaypointCsReq = 474; - public static final int GetWaypointCsReq = 407; - public static final int SetCurWaypointScRsp = 429; - public static final int GetChapterCsReq = 483; + public static final int LeaveChallengeCsReq = 1732; + public static final int PlayerReturnSignScRsp = 4571; + public static final int MultipleDropInfoNotify = 4648; + public static final int SyncRogueMiracleScNotify = 1896; + public static final int ChessRogueFinishCurRoomNotify = 5560; + public static final int ReplaceRogueMiracleDisplayScNotify = 1866; + public static final int GetRogueAeonInfoCsReq = 1829; + public static final int RollChessRogueBuffScRsp = 5568; + public static final int ChessRogueReviveAvatarCsReq = 5548; + public static final int DailyFirstMeetPamCsReq = 3471; + public static final int FinishQuestScRsp = 980; + public static final int RogueChallengeActivityBuffChooseScNotify = 2618; + public static final int GetWaypointScRsp = 455; + public static final int EnhanceChessRogueBuffCsReq = 5484; + public static final int CancelCacheNotifyScRsp = 4193; + public static final int EnterSceneCsReq = 1403; + public static final int TakeQuestRewardCsReq = 971; + public static final int GetTrialActivityDataCsReq = 2605; + public static final int RepairChessRogueMiracleCsReq = 5573; + public static final int ChessRogueEnterNextLayerCsReq = 5432; + public static final int StartTrialActivityCsReq = 2695; + public static final int FinishTalkMissionScRsp = 1270; + public static final int SwapRogueBuffCsReq = 1825; + public static final int GetLoginActivityScRsp = 2655; + public static final int UpdateMechanismBarScNotify = 1437; + public static final int TakeBpRewardScRsp = 3032; + public static final int TextJoinSaveScRsp = 3855; + public static final int SelectInclinationTextCsReq = 2128; + public static final int GameplayCounterCountDownCsReq = 1444; + public static final int StartCocoonStageScRsp = 1418; + public static final int GetRogueInfoCsReq = 1889; + public static final int UnlockTutorialGuideScRsp = 1697; + public static final int UnlockTutorialGuideCsReq = 1688; + public static final int GetVideoVersionKeyCsReq = 16; + public static final int GmTalkScRsp = 80; + public static final int GetAssistListCsReq = 2925; + public static final int GetChapterScRsp = 448; + public static final int GetNpcMessageGroupScRsp = 2755; + public static final int ReplaceLineupScRsp = 733; + public static final int GetStuffScNotify = 4328; + public static final int BattleCollegeDataChangeScNotify = 5771; + public static final int SyncAcceptedPamMissionNotify = 4071; + public static final int DressAvatarCsReq = 328; + public static final int TakeAllApRewardScRsp = 3388; + public static final int GetAetherDivideChallengeInfoScRsp = 4830; + public static final int GetArchiveDataScRsp = 2355; + public static final int MatchBoxingClubOpponentScRsp = 4270; + public static final int SyncRogueMiracleInfoScNotify = 1824; + public static final int GetMissionDataScRsp = 1255; + public static final int GetSingleRedDotParamGroupScRsp = 5948; + public static final int UpgradeAreaScRsp = 4368; + public static final int DestroyItemCsReq = 536; + public static final int LockEquipmentCsReq = 532; + public static final int ExchangeStaminaScRsp = 56; + public static final int SetAssistAvatarCsReq = 2863; + public static final int BuyGoodsScRsp = 1570; + public static final int SyncChessRogueBuffDropInfoScNotify = 5496; + public static final int EnhanceCommonRogueBuffCsReq = 5643; + public static final int EnterSceneScRsp = 1416; + public static final int RemoveStuffFromAreaCsReq = 4388; + public static final int SelectRogueBonusScRsp = 1820; + public static final int ChessRogueQueryBpCsReq = 5477; + public static final int SellItemCsReq = 550; + public static final int GameplayCounterRecoverScRsp = 1458; + public static final int SceneEntityMoveScRsp = 1455; + public static final int PlayerReturnInfoQueryCsReq = 4528; + public static final int TriggerHealVoiceScRsp = 4197; + public static final int GetRogueShopBuffInfoCsReq = 5648; + public static final int GetRogueDialogueEventDataScRsp = 1812; + public static final int PlayerLoginScRsp = 55; + public static final int TakePromotionRewardCsReq = 304; + public static final int ReEnterLastElementStageScRsp = 1464; + public static final int FinishAeonDialogueGroupCsReq = 1874; + public static final int PlayerGetTokenCsReq = 32; + public static final int SaveLogisticsCsReq = 4792; + public static final int PunkLordMonsterKilledNotify = 3209; + public static final int InteractPropScRsp = 1470; + public static final int ComposeLimitNumUpdateNotify = 549; + public static final int GetPlayerReturnMultiDropInfoScRsp = 4632; + public static final int SceneEnterStageCsReq = 1443; + public static final int GetChessRogueBuffEnhanceInfoScRsp = 5526; + public static final int SetSignatureCsReq = 2893; + public static final int SetHeadIconScRsp = 2870; + public static final int GetPrivateChatHistoryScRsp = 3948; + public static final int FinishPerformSectionIdScRsp = 2793; + public static final int LeaveChallengeScRsp = 1748; + public static final int AlleyShipUnlockScNotify = 4740; + public static final int StartChallengeCsReq = 1771; + public static final int TrialBackGroundMusicCsReq = 3188; + public static final int LeaveTrialActivityScRsp = 2613; + public static final int EnterChessRogueAeonRoomScRsp = 5469; + public static final int SelectRogueMiracleCsReq = 1818; + public static final int TakeQuestOptionalRewardCsReq = 963; + public static final int GetTreasureDungeonActivityDataCsReq = 4480; + public static final int TakeLoginActivityRewardCsReq = 2671; + public static final int GroupStateChangeCsReq = 1454; + public static final int DelMailCsReq = 832; + public static final int SetHeadIconCsReq = 2871; + public static final int GetMultipleDropInfoCsReq = 4689; + public static final int QuitBattleScRsp = 170; + public static final int SwitchLineupIndexScRsp = 746; + public static final int SetClientPausedScRsp = 1472; + public static final int LeaveRaidCsReq = 2271; + public static final int ReserveStaminaExchangeCsReq = 100; + public static final int DeleteFriendScRsp = 2968; + public static final int GetJukeboxDataScRsp = 3155; + public static final int UpgradeAreaStatCsReq = 4356; + public static final int UnlockTutorialCsReq = 1632; + public static final int FinishFirstTalkNpcCsReq = 2188; + public static final int FightTreasureDungeonMonsterScRsp = 4438; + public static final int GetSpringRecoverDataScRsp = 1491; + public static final int GetTrainVisitorBehaviorScRsp = 3770; + public static final int EnterTreasureDungeonCsReq = 4459; + public static final int BuyRogueShopMiracleCsReq = 5697; + public static final int AetherDivideSpiritExpUpScRsp = 4833; + public static final int TreasureDungeonDataScNotify = 4489; + public static final int GetPunkLordMonsterDataCsReq = 3289; + public static final int RogueChallengeActivityDataScRsp = 2633; + public static final int GetFightActivityDataScRsp = 3655; + public static final int GetGachaCeilingScRsp = 1948; + public static final int PlayerReturnInfoQueryScRsp = 4593; + public static final int SyncServerSceneChangeNotify = 1500; + public static final int TakePromotionRewardScRsp = 384; + public static final int UpdateFloorSavedValueNotify = 1423; + public static final int UseItemScRsp = 597; + public static final int SetSpringRecoverConfigScRsp = 1405; + public static final int NewAssistHistoryNotify = 2918; + public static final int FinishTutorialGuideCsReq = 1680; + public static final int TrainRefreshTimeNotify = 3732; + public static final int MuseumTargetMissionFinishNotify = 4392; + public static final int GetLineupAvatarDataCsReq = 763; + public static final int SetDisplayAvatarScRsp = 2848; + public static final int SetMissionEventProgressScRsp = 1240; + public static final int ChessRogueMoveCellNotify = 5422; + public static final int UpdateFeatureSwitchScNotify = 20; + public static final int SyncRogueAeonLevelUpRewardScNotify = 1823; + public static final int TakeRogueScoreRewardScRsp = 1845; + public static final int HealPoolInfoNotify = 1414; + public static final int BuyBpLevelCsReq = 3048; + public static final int GetChallengeScRsp = 1755; + public static final int StartRogueCsReq = 1871; + public static final int ExchangeHcoinScRsp = 543; + public static final int MuseumRandomEventSelectScRsp = 4343; + public static final int TakeChapterRewardScRsp = 428; + public static final int UpdatePlayerSettingCsReq = 41; + public static final int GetStageLineupScRsp = 755; + public static final int GetMainMissionCustomValueScRsp = 1283; + public static final int RogueModifierSelectCellScRsp = 5332; + public static final int ReportPlayerCsReq = 2943; + public static final int BatchMarkChatEmojiCsReq = 3959; + public static final int TakeTrialActivityRewardCsReq = 2699; + public static final int LogisticsInfoScNotify = 4709; + public static final int SyncAddBlacklistScNotify = 2938; + public static final int SceneEntityMoveCsReq = 1489; + public static final int AddBlacklistCsReq = 2965; + public static final int SceneEntityDieScNotify = 1435; + public static final int TakePunkLordPointRewardCsReq = 3259; + public static final int RollChessRogueBuffCsReq = 5556; + public static final int AddAvatarScNotify = 359; + public static final int SelectChatBubbleCsReq = 5171; + public static final int EnableRogueTalentCsReq = 1822; + public static final int TakeMonsterResearchActivityRewardScRsp = 2645; + public static final int TakeRogueEventHandbookRewardCsReq = 1831; + public static final int AetherDivideTainerInfoScNotify = 4825; + public static final int TakePunkLordPointRewardScRsp = 3268; + public static final int GetLineupAvatarDataScRsp = 759; + public static final int TakeApRewardScRsp = 3355; + public static final int ReforgeChessRogueBuffScRsp = 5587; + public static final int SavePointsInfoNotify = 1415; + public static final int StartBoxingClubBattleScRsp = 4248; + public static final int GetMonsterResearchActivityDataCsReq = 2646; + public static final int SpringRecoverSingleAvatarScRsp = 1499; + public static final int BuyGoodsCsReq = 1571; + public static final int MonthCardRewardNotify = 73; + public static final int GetFirstTalkNpcCsReq = 2132; + public static final int FinishPlotScRsp = 1155; + public static final int AddRogueMiracleScNotify = 1821; + public static final int RecoverAllLineupScRsp = 1483; + public static final int SyncRogueCommonItemDisplayScNotify = 5638; + public static final int SetGenderScRsp = 90; + public static final int GetFriendLoginInfoScRsp = 2976; + public static final int RogueNpcDisappearScRsp = 5659; + public static final int EnterActivityBattleStageCsReq = 2639; + public static final int PunkLordMonsterInfoScNotify = 3256; + public static final int StartRogueScRsp = 1870; + public static final int TakePictureScRsp = 4148; + public static final int SaveLogisticsScRsp = 4730; + public static final int GetChessRogueStoryInfoCsReq = 5455; + public static final int TakeRogueMiracleHandbookRewardCsReq = 1861; + public static final int GetSaveRaidScRsp = 2265; + public static final int SetSpringRecoverConfigCsReq = 1477; + public static final int GetUnlockTeleportCsReq = 1424; + public static final int MuseumTargetRewardNotify = 4330; + public static final int NewMailScNotify = 828; + public static final int SceneEnterStageScRsp = 1433; + public static final int CityShopInfoScNotify = 1588; + public static final int ChessRogueSelectCellCsReq = 5552; + public static final int ReforgeRogueBuffCsReq = 1891; + public static final int ChessRogueGiveUpCsReq = 5468; + public static final int GetRaidInfoCsReq = 2280; + public static final int GetMissionStatusCsReq = 1204; + public static final int QuitLineupCsReq = 788; + public static final int BuyRogueShopBuffCsReq = 5693; + public static final int MatchBoxingClubOpponentCsReq = 4271; + public static final int TeleportToMissionResetPointScRsp = 1209; + public static final int LogisticsDetonateStarSkiffScRsp = 4739; + public static final int AcceptedPamMissionExpireScRsp = 4055; + public static final int FinishCurTurnCsReq = 4380; + public static final int SetClientRaidTargetCountScRsp = 2268; + public static final int SyncRogueSeasonFinishScNotify = 1842; + public static final int ChessRoguePickAvatarScRsp = 5580; + public static final int StopRogueAdventureRoomCsReq = 5640; + public static final int StartAetherDivideSceneBattleCsReq = 4832; + public static final int TakeRogueScoreRewardCsReq = 1884; + public static final int JoinLineupScRsp = 748; + public static final int CancelTurnFoodCsReq = 579; + public static final int ClientDownloadDataScNotify = 85; + public static final int AetherDivideSpiritInfoScNotify = 4840; + public static final int QuitTreasureDungeonScRsp = 4433; + public static final int SceneCastSkillMpUpdateScNotify = 1465; + public static final int SyncRogueReviveInfoScNotify = 1836; + public static final int SendMsgScRsp = 3955; + public static final int PlayerKickOutScNotify = 28; + public static final int AetherDivideTakeChallengeRewardCsReq = 4842; + public static final int GetNpcTakenRewardScRsp = 2155; + public static final int SyncRogueGetItemScNotify = 1894; + public static final int SwitchLineupIndexCsReq = 765; + public static final int StopRogueAdventureRoomScRsp = 5692; + public static final int GiveUpBoxingClubChallengeCsReq = 4288; + public static final int SelectRogueBonusCsReq = 1885; + public static final int RechargeSuccNotify = 584; + public static final int SyncRogueCommonBuffDisplayScNotify = 5665; + public static final int StaminaInfoScNotify = 47; + public static final int DropChessRogueBuffCsReq = 5539; + public static final int ComposeItemCsReq = 559; + public static final int TakeTrialActivityRewardScRsp = 2637; + public static final int GetRogueDialogueEventDataCsReq = 1805; + public static final int AddRogueBuffScNotify = 1838; + public static final int AutoUseTurnFoodNotify = 535; + public static final int PromoteEquipmentScRsp = 570; + public static final int GetRecyleTimeCsReq = 530; + public static final int TakeRogueAeonLevelRewardCsReq = 1878; + public static final int SetCurWaypointCsReq = 471; + public static final int SelectChessRogueBonusCsReq = 5513; + public static final int AddBlacklistScRsp = 2946; + public static final int ChessRogueUpdateBoardScNotify = 5516; + public static final int GetPunkLordMonsterDataScRsp = 3255; + public static final int OpenTreasureDungeonGridCsReq = 4456; + public static final int TakeMailAttachmentScRsp = 897; + public static final int GetGachaInfoCsReq = 1989; + public static final int GetRogueShopBuffInfoScRsp = 5688; + public static final int GetAllSaveRaidScRsp = 2238; + public static final int SelectPhoneThemeScRsp = 5188; + public static final int ExchangeHcoinCsReq = 545; + public static final int AcceptedPamMissionExpireCsReq = 4089; + public static final int GetSaveLogisticsMapScRsp = 4736; + public static final int SetLineupNameScRsp = 750; + public static final int GetUnlockTeleportScRsp = 1447; + public static final int TakeOffAvatarSkinCsReq = 333; + public static final int GetMissionDataCsReq = 1289; + public static final int GetLevelRewardTakenListCsReq = 45; + public static final int ChessRogueUpdateActionPointScNotify = 5423; + public static final int ReEnterLastElementStageCsReq = 1421; + public static final int ChessRogueEnterCsReq = 5593; + public static final int TakeRogueEndlessActivityPointRewardCsReq = 6048; + public static final int BuyNpcStuffCsReq = 4371; + public static final int FinishCosumeItemMissionScRsp = 1268; + public static final int MuseumTargetStartNotify = 4340; + public static final int SyncClientResVersionCsReq = 188; + public static final int QuitBattleScNotify = 128; + public static final int TrialActivityDataChangeScNotify = 2611; + public static final int AcceptMainMissionScRsp = 1202; + public static final int AceAntiCheaterScRsp = 14; + public static final int ReportPlayerScRsp = 2933; + public static final int SubMissionRewardScNotify = 1292; + public static final int MuseumRandomEventQueryScRsp = 4384; + public static final int SpringRecoverScRsp = 1411; + public static final int GetMuseumInfoCsReq = 4389; + public static final int ChessRoguePickAvatarCsReq = 5523; + public static final int GameplayCounterRecoverCsReq = 1431; + public static final int GetActivityScheduleConfigCsReq = 2632; + public static final int SelectInclinationTextScRsp = 2193; + public static final int GetActivityScheduleConfigScRsp = 2648; + public static final int EnterChessRogueAeonRoomCsReq = 5583; + public static final int ExchangeGachaCeilingScRsp = 1997; + public static final int GetFriendListInfoCsReq = 2989; + public static final int BoxingClubRewardScNotify = 4228; + public static final int SyncRogueMiracleSelectInfoScNotify = 1868; + public static final int SetSignatureScRsp = 2880; + public static final int GetBoxingClubInfoCsReq = 4289; + public static final int GetReplayTokenScRsp = 3555; + public static final int StartRaidCsReq = 2289; + public static final int GetTreasureDungeonActivityDataScRsp = 4463; + public static final int LeaveAetherDivideSceneScRsp = 4870; + public static final int SyncRogueAeonScNotify = 1852; + public static final int TakeActivityExpeditionRewardCsReq = 2568; + public static final int ActivateFarmElementCsReq = 1485; + public static final int RogueChallengeRefreshAssistListCsReq = 2679; + public static final int GroupStateChangeScNotify = 1429; + public static final int GetFriendLoginInfoCsReq = 2934; + public static final int ChessRogueReviveAvatarScRsp = 5582; + public static final int GetRogueBuffEnhanceInfoScRsp = 1833; + public static final int SpringRecoverSingleAvatarCsReq = 1473; + public static final int TakeAllRewardCsReq = 3097; + public static final int TakeExpeditionRewardCsReq = 2588; + public static final int AlleyGuaranteedFundsCsReq = 4781; + public static final int SyncRogueBuffSwapInfoScNotify = 1809; + public static final int GetRaidInfoScRsp = 2263; + public static final int SceneGroupRefreshScNotify = 1407; + public static final int SetGroupCustomSaveDataCsReq = 1495; + public static final int MissionAcceptScNotify = 1215; + public static final int ExpeditionDataChangeScNotify = 2528; + public static final int GetCurAssistCsReq = 2981; + public static final int SetNicknameCsReq = 4; + public static final int SyncDeleteFriendScNotify = 2956; + public static final int GiveUpBoxingClubChallengeScRsp = 4297; + public static final int PlayerGetTokenScRsp = 48; + public static final int GetMailScRsp = 855; + public static final int AceAntiCheaterCsReq = 11; + public static final int SetPlayerInfoCsReq = 79; + public static final int MuseumTakeCollectRewardCsReq = 4309; + public static final int GetRogueInitialScoreCsReq = 1872; + public static final int FinishChallengeCsReq = 1797; + public static final int EnterTrialActivityStageCsReq = 2614; + public static final int GetAuthkeyCsReq = 65; + public static final int SceneEntityDisappearScNotify = 1493; + public static final int QuitLineupScRsp = 797; + public static final int TrainVisitorBehaviorFinishCsReq = 3789; + public static final int QuestRecordScNotify = 928; + public static final int GetChatFriendHistoryScRsp = 3997; + public static final int GetAllRedDotDataScRsp = 5955; + public static final int SceneEntityTeleportScRsp = 1460; + public static final int FinishCosumeItemMissionCsReq = 1259; + public static final int GetEnhanceCommonRogueBuffInfoScRsp = 5645; + public static final int TakeChallengeTargetRewardCsReq = 1759; + public static final int EnterFantasticStoryActivityStageScRsp = 4932; + public static final int DeleteBlacklistCsReq = 2940; + public static final int LeaveRogueScRsp = 1897; + public static final int GetRogueEndlessActivityDataScRsp = 6055; + public static final int InteractPropCsReq = 1471; + public static final int SetTurnFoodScRsp = 590; + public static final int TakeOffRelicCsReq = 338; + public static final int PlayerLoginFinishCsReq = 60; + public static final int SetRedPointStatusScNotify = 10; + public static final int GetChapterCsReq = 432; + public static final int RogueChallengeRefreshAssistListScRsp = 2672; + public static final int InteractTreasureDungeonGridCsReq = 4450; + public static final int GetFriendRecommendListInfoCsReq = 2950; + public static final int GetExpeditionDataScRsp = 2555; + public static final int EntityBindPropScRsp = 1490; + public static final int SyncTaskCsReq = 1248; + public static final int TradeChessRogueMiracleScRsp = 5500; + public static final int ChessRogueGoAheadScRsp = 5449; + public static final int ChessRogueUpdateAllowedSelectCellScNotify = 5511; + public static final int GetBattleCollegeDataScRsp = 5755; + public static final int RogueChallengeActivityBuffChooseCsReq = 2640; + public static final int BoxingClubChallengeUpdateScNotify = 4293; + public static final int SyncRogueBuffSelectInfoScNotify = 1828; + public static final int GetRogueAdventureRoomInfoCsReq = 5668; + public static final int SpringRecoverCsReq = 1412; + public static final int ReforgeRogueBuffScRsp = 1877; + public static final int PlayerLoginFinishScRsp = 3; + public static final int UpdateChessRogueMiracleScNotify = 5493; + public static final int WaypointShowNewCsNotify = 488; + public static final int RepairRogueMiracleScRsp = 5649; + public static final int SetForbidOtherApplyFriendScRsp = 2920; + public static final int CancelActivityExpeditionScRsp = 2559; + public static final int AlleyTakeEventRewardCsReq = 4715; + public static final int ChessRogueCheatRollScRsp = 5581; + public static final int GetLevelRewardTakenListScRsp = 43; + public static final int DailyActiveInfoNotify = 3332; + public static final int GetAssistHistoryCsReq = 2915; + public static final int TakePictureCsReq = 4132; + public static final int MarkChatEmojiScRsp = 3963; + public static final int SceneEntityUpdateScNotify = 1428; + public static final int RevcMsgScNotify = 3971; + public static final int GetPlayerDetailInfoCsReq = 2971; + public static final int StartTrialActivityScRsp = 2687; + public static final int ChessRogueGiveUpRollScRsp = 5518; + public static final int ReviveRogueAvatarCsReq = 1850; + public static final int UnlockChatBubbleScNotify = 5132; + public static final int GmTalkScNotify = 97; + public static final int ChessRogueLeaveCsReq = 5542; + public static final int BuyNpcStuffScRsp = 4370; + public static final int ChessRogueUpdateMoneyInfoScNotify = 5559; + public static final int RogueModifierUpdateNotify = 5397; + public static final int GetAetherDivideInfoScRsp = 4863; + public static final int SelectChessRogueBonusScRsp = 5497; + public static final int SyncChessRogueBonusSelectInfoScNotify = 5461; + public static final int PlayerReturnTakeRewardCsReq = 4588; + public static final int EquipAetherDividePassiveSkillCsReq = 4856; + public static final int PlayerLoginCsReq = 89; + public static final int TakeFightActivityRewardCsReq = 3648; + public static final int SetLineupNameCsReq = 738; + public static final int GetRogueHandbookDataCsReq = 1847; + public static final int SceneUpdatePositionVersionNotify = 1463; + public static final int SceneCastSkillScRsp = 1448; + public static final int UnlockSkilltreeCsReq = 332; + public static final int GetTutorialCsReq = 1689; + public static final int HandleFriendCsReq = 2993; + public static final int FinishChessRogueSubStoryScRsp = 5464; + public static final int BatchMarkChatEmojiScRsp = 3968; + public static final int GroupStateChangeScRsp = 1466; + public static final int ExchangeGachaCeilingCsReq = 1988; + public static final int GetMonsterResearchActivityDataScRsp = 2638; + public static final int FinishPlotCsReq = 1189; + public static final int MultipleDropInfoScNotify = 4671; + public static final int GetPhoneDataCsReq = 5189; + public static final int PrivateMsgOfflineUsersScNotify = 3970; + public static final int GetChessRogueBuffEnhanceInfoCsReq = 5470; + public static final int GetFirstTalkByPerformanceNpcCsReq = 2180; + public static final int SyncTaskScRsp = 1288; + public static final int ChessRogueGiveUpScRsp = 5544; + public static final int GetRogueScoreRewardInfoCsReq = 1844; + public static final int GetRndOptionScRsp = 3455; + public static final int SyncRogueHandbookMiracleUnlockScNotify = 5630; + public static final int SetClientRaidTargetCountCsReq = 2259; + public static final int GetPlayerReplayInfoScRsp = 3570; + public static final int ChessRogueReRollDiceCsReq = 5551; + public static final int AvatarExpUpCsReq = 371; + public static final int PunkLordRaidTimeOutScNotify = 3250; + public static final int GetUpdatedArchiveDataCsReq = 2371; + public static final int UnlockPhoneThemeScNotify = 5197; + public static final int SetStuffToAreaCsReq = 4332; + public static final int QuitRogueCsReq = 1802; + public static final int GetBasicInfoCsReq = 57; + public static final int GetPunkLordDataScRsp = 3246; + public static final int SetMissionEventProgressCsReq = 1233; + public static final int SpringTransferCsReq = 1468; + public static final int ChessRogueLeaveScRsp = 5472; + public static final int StartPunkLordRaidScRsp = 3270; + public static final int SetFriendRemarkNameScRsp = 2945; + public static final int AetherDivideSpiritExpUpCsReq = 4843; + public static final int SyncChessRogueBuffSelectInfoScNotify = 5567; + public static final int SelectChessRogueMiracleScRsp = 5586; + public static final int RepairRogueMiracleCsReq = 5625; + public static final int DailyRefreshNotify = 77; + public static final int SetCurWaypointScRsp = 470; + public static final int GetRogueInitialScoreScRsp = 1835; + public static final int SelectChessRogueSubStoryCsReq = 5520; + public static final int SwitchAetherDivideLineUpSlotScRsp = 4804; + public static final int SyncChessRogueMiracleInfoScNotify = 5527; + public static final int SelectRogueDialogueEventCsReq = 1860; + public static final int SecurityReportCsReq = 4180; + public static final int SharePunkLordMonsterScRsp = 3248; + public static final int FightActivityDataChangeScNotify = 3671; + public static final int GetCurSceneInfoCsReq = 1488; + public static final int PrepareRogueAdventureRoomCsReq = 5655; + public static final int GetCurSceneInfoScRsp = 1497; + public static final int SelectChatBubbleScRsp = 5170; + public static final int RaidKickByServerScNotify = 2204; + public static final int SetAssistCsReq = 2936; + public static final int GetPlayerReplayInfoCsReq = 3571; + public static final int GetFriendApplyListInfoScRsp = 2948; + public static final int GetGachaCeilingCsReq = 1932; + public static final int FinishSectionIdCsReq = 2788; + public static final int AlleyOrderChangedScNotify = 4750; + public static final int ReviveRogueAvatarScRsp = 1804; + public static final int SetStuffToAreaScRsp = 4348; + public static final int TakeMailAttachmentCsReq = 888; + public static final int SyncRogueMapRoomScNotify = 1834; + public static final int TakeCityShopRewardCsReq = 1532; + public static final int SummonPunkLordMonsterScRsp = 3297; + public static final int SyncRogueBuffReforgeInfoScNotify = 1857; + public static final int GetBagScRsp = 555; + public static final int PlayerHeartBeatScRsp = 95; + public static final int ReserveStaminaExchangeScRsp = 24; + public static final int SelectChessRogueBuffCsReq = 5540; + public static final int GetDailyActiveInfoScRsp = 3370; + public static final int GetEnhanceCommonRogueBuffInfoCsReq = 5684; + public static final int ReturnLastTownCsReq = 1484; + public static final int AetherDivideRefreshEndlessScRsp = 4883; + public static final int GetPrivateChatHistoryCsReq = 3932; + public static final int TakeChallengeRaidRewardCsReq = 2297; + public static final int FinishItemIdCsReq = 2732; + public static final int TeleportToMissionResetPointCsReq = 1230; + public static final int BBNMGMFJMNG = 189; + public static final int ChessRogueUpdateReviveInfoScNotify = 5563; + public static final int TreasureDungeonFinishScNotify = 4455; + public static final int LeaveRaidScRsp = 2270; + public static final int TakeActivityExpeditionRewardScRsp = 2556; + public static final int RegionStopScNotify = 38; + public static final int GetMailCsReq = 889; + public static final int ChessRogueQueryAeonDimensionsScRsp = 5403; + public static final int StartBoxingClubBattleCsReq = 4232; + public static final int UpgradeAreaStatScRsp = 4365; + public static final int EnteredSceneChangeScNotify = 1462; + public static final int QuitBattleCsReq = 171; + public static final int MarkItemScRsp = 542; + public static final int TakeQuestRewardScRsp = 970; + public static final int RefreshTriggerByClientScNotify = 1422; + public static final int EnterRogueEndlessActivityStageCsReq = 6071; + public static final int EnterActivityBattleStageScRsp = 2690; + public static final int SyncRogueDialogueEventDataScNotify = 1816; + public static final int SyncChessRogueMiracleRepairInfoScNotify = 5486; + public static final int GetLoginActivityCsReq = 2689; + public static final int PrepareRogueAdventureRoomScRsp = 5671; + public static final int ChessRogueSelectCellScRsp = 5574; + public static final int MissionEventRewardScNotify = 1246; + public static final int GetRecyleTimeScRsp = 509; + public static final int TradeRogueMiracleCsReq = 1853; + public static final int AddChessRogueBuffScNotify = 5476; + public static final int TakeChallengeRewardScRsp = 1765; + public static final int SpringTransferScRsp = 1456; + public static final int GetRogueBuffEnhanceInfoCsReq = 1843; + public static final int ExchangeRogueRewardKeyCsReq = 1837; + public static final int FinishSectionIdScRsp = 2797; + public static final int RankUpAvatarCsReq = 368; + public static final int UseItemCsReq = 588; + public static final int GetAuthkeyScRsp = 46; + public static final int TakeRogueEndlessActivityPointRewardScRsp = 6088; + public static final int GetChessRogueStoryInfoScRsp = 5471; + public static final int RemoveRogueMiracleScNotify = 1864; + public static final int ApplyFriendScRsp = 2997; + public static final int ActivateFarmElementScRsp = 1420; + public static final int GetTutorialScRsp = 1655; + public static final int ShareScRsp = 4155; + public static final int GetAlleyInfoScRsp = 4755; + public static final int AetherDivideRefreshEndlessCsReq = 4881; + public static final int ChessRogueConfirmRollScRsp = 5590; + public static final int RankUpEquipmentCsReq = 528; + public static final int CurTrialActivityScNotify = 2621; + public static final int UnlockBackGroundMusicScRsp = 3148; + public static final int GetChatFriendHistoryCsReq = 3988; + public static final int GetShareDataCsReq = 4171; + public static final int GetFightActivityDataCsReq = 3689; + public static final int DelSaveRaidScNotify = 2250; + public static final int GetKilledPunkLordMonsterDataScRsp = 3240; + public static final int FinishTutorialScRsp = 1693; + public static final int TrainVisitorBehaviorFinishScRsp = 3755; + public static final int FightTreasureDungeonMonsterCsReq = 4446; + public static final int PlayerReturnSignCsReq = 4555; + public static final int ComposeLimitNumCompleteNotify = 525; + public static final int FantasticStoryActivityBattleEndScNotify = 4948; + public static final int EnterRogueEndlessActivityStageScRsp = 6070; + public static final int EnterSectionScRsp = 1409; + public static final int StartBattleCollegeCsReq = 5770; + public static final int SendMsgCsReq = 3989; + public static final int EnhanceRogueBuffScRsp = 1892; + public static final int LockRelicCsReq = 546; + public static final int MarkChatEmojiCsReq = 3980; + public static final int SetGroupCustomSaveDataScRsp = 1487; + public static final int SetNicknameScRsp = 84; + public static final int GetTrainVisitorBehaviorCsReq = 3771; + public static final int DropRogueBuffScRsp = 5681; + public static final int DailyTaskDataScNotify = 1297; + public static final int GetNpcStatusCsReq = 2771; + public static final int StartRaidScRsp = 2255; + public static final int GetLevelRewardCsReq = 33; + public static final int TakeChallengeTargetRewardScRsp = 1768; + public static final int GetRogueHandbookDataScRsp = 1841; + public static final int GetAllSaveRaidCsReq = 2246; + public static final int TakeLoginActivityRewardScRsp = 2670; + public static final int QuitTreasureDungeonCsReq = 4443; + public static final int PlayerReturnPointChangeScNotify = 4570; + public static final int ChessRogueUpdateLevelBaseInfoScNotify = 5463; + public static final int DailyFirstMeetPamScRsp = 3470; + public static final int SetGenderCsReq = 39; + public static final int FinishChapterScNotify = 4971; + public static final int QueryProductInfoScRsp = 76; + public static final int GetQuestDataScRsp = 955; + public static final int CancelTurnFoodScRsp = 572; + public static final int GetSaveLogisticsMapCsReq = 4749; + public static final int ClearAetherDividePassiveSkillCsReq = 4846; + public static final int QuitRogueScRsp = 1881; + public static final int GetRogueAeonInfoScRsp = 1867; + public static final int SetFriendRemarkNameCsReq = 2984; + public static final int ChessRogueRollDiceCsReq = 5479; + public static final int ChessRogueRollDiceScRsp = 5409; + public static final int InterruptMissionEventCsReq = 1245; + public static final int EnhanceCommonRogueBuffScRsp = 5633; + public static final int DressAvatarScRsp = 393; + public static final int SelectChessRogueMiracleCsReq = 5442; + public static final int AntiAddictScNotify = 50; + public static final int SelectChessRogueSubStoryScRsp = 5406; + public static final int TakeAssistRewardScRsp = 2990; + public static final int ChessRogueCheatRollCsReq = 5445; + public static final int ServerAnnounceNotify = 49; + public static final int OpenTreasureDungeonGridScRsp = 4465; + public static final int GetNpcTakenRewardCsReq = 2189; + public static final int GetStageLineupCsReq = 789; + public static final int FinishChessRogueSubStoryCsReq = 5555; + public static final int RogueChallengeActivityBuffChooseScRsp = 2692; + public static final int StartFinishMainMissionScNotify = 1249; + public static final int SpringRefreshCsReq = 1438; + public static final int ChessRogueEnterCellScRsp = 5401; + public static final int GetQuestRecordCsReq = 988; + public static final int ChangeLineupLeaderCsReq = 768; + public static final int PromoteAvatarScRsp = 397; + public static final int GetRogueEndlessActivityDataCsReq = 6089; + public static final int AetherDivideFinishChallengeScNotify = 4809; + public static final int ChessRogueQueryScRsp = 5512; + public static final int GetBattleCollegeDataCsReq = 5789; + public static final int FinishTalkMissionCsReq = 1271; + public static final int FinishPerformSectionIdCsReq = 2728; + public static final int SetAetherDivideLineUpScRsp = 4868; + public static final int RankUpAvatarScRsp = 356; + public static final int LockRelicScRsp = 538; + public static final int GetSceneMapInfoScRsp = 1478; + public static final int RankUpEquipmentScRsp = 593; + public static final int StartBattleCollegeScRsp = 5732; + public static final int AlleyEventEffectNotify = 4793; + public static final int SyncRogueMiracleRepairInfoScNotify = 5609; + public static final int TakeAllRewardScRsp = 3028; + public static final int SyncRoguePickAvatarInfoScNotify = 1882; + public static final int ChessRogueSelectBpScRsp = 5427; + public static final int ChessRogueSelectBpCsReq = 5528; + public static final int TextJoinBatchSaveCsReq = 3832; + public static final int LogisticsDetonateStarSkiffCsReq = 4718; + public static final int GetExpeditionDataCsReq = 2589; + public static final int SyncRogueCommonMiracleDisplayScNotify = 5646; + public static final int TradeRogueMiracleScRsp = 1813; + public static final int ChessRogueReRollDiceScRsp = 5509; + public static final int GetFirstTalkByPerformanceNpcScRsp = 2163; + public static final int GetFriendRecommendListInfoScRsp = 2904; + public static final int PunkLordDataChangeNotify = 3236; + public static final int RogueModifierAddNotify = 5371; + public static final int GetAssistHistoryScRsp = 2942; + public static final int GetAetherDivideInfoCsReq = 4880; + public static final int AetherDivideRefreshEndlessScNotify = 4815; + public static final int DestroyItemScRsp = 502; + public static final int PromoteEquipmentCsReq = 571; + public static final int EnterSectionCsReq = 1430; + public static final int AetherDivideLineupScNotify = 4802; + public static final int SpringRefreshScRsp = 1450; + public static final int AlleyShipUsedCountScNotify = 4702; + public static final int UseTreasureDungeonItemScRsp = 4445; + public static final int SelectPhoneThemeCsReq = 5148; + public static final int GateServerScNotify = 87; + public static final int GetSingleRedDotParamGroupCsReq = 5932; + public static final int TextJoinBatchSaveScRsp = 3848; + public static final int SyncClientResVersionScRsp = 197; + public static final int PlayerReturnTakePointRewardCsReq = 4532; + public static final int GetCurChallengeCsReq = 1793; + public static final int GetRogueAdventureRoomInfoScRsp = 5656; + public static final int SyncRogueFinishScNotify = 1856; + public static final int ExchangeRogueBuffWithMiracleScRsp = 5604; + public static final int ChessRogueUpdateDiceInfoScNotify = 5421; + public static final int GetRogueScoreRewardInfoScRsp = 1826; + public static final int PlayerSyncScNotify = 689; + public static final int AlleyGuaranteedFundsScRsp = 4783; + public static final int TakeRogueMiracleHandbookRewardScRsp = 1807; + public static final int GetTrialActivityDataScRsp = 2612; + public static final int SellItemScRsp = 504; + public static final int SetIsDisplayAvatarInfoCsReq = 2888; + public static final int TakeOffRelicScRsp = 350; + public static final int GetChatEmojiListScRsp = 3993; + public static final int GetAlleyInfoCsReq = 4789; + public static final int GetSecretKeyInfoScRsp = 98; + public static final int SetPlayerInfoScRsp = 72; + public static final int GetCurChallengeScRsp = 1780; + public static final int TakeOffAvatarSkinScRsp = 340; + public static final int LogisticsScoreRewardSyncInfoScNotify = 4790; + public static final int TakeKilledPunkLordMonsterScoreCsReq = 3225; + public static final int GetFriendListInfoScRsp = 2955; + public static final int SyncChessRogueMiracleTradeInfoScNotify = 5418; + public static final int RemoveChessRogueBuffScNotify = 5474; + public static final int ChessRogueStartCsReq = 5577; + public static final int DressRelicAvatarScRsp = 346; + public static final int HeroBasicTypeChangedNotify = 35; + public static final int GetMultipleDropInfoScRsp = 4655; + public static final int GetNpcStatusScRsp = 2770; + public static final int ChessRogueEnterCellCsReq = 5475; + public static final int SetAssistScRsp = 2902; + public static final int TrialBackGroundMusicScRsp = 3197; + public static final int RetcodeNotify = 99; + public static final int SecurityReportScRsp = 4163; + public static final int DoGachaScRsp = 1970; + public static final int SyncRogueEventHandbookScNotify = 1854; + public static final int EnterTreasureDungeonScRsp = 4468; + public static final int GetBoxingClubInfoScRsp = 4255; + public static final int GetRndOptionCsReq = 3489; + public static final int StartAetherDivideStageBattleCsReq = 4884; + public static final int ChessRogueGoAheadCsReq = 5578; + public static final int TakeChallengeRaidRewardScRsp = 2228; + public static final int MissionRewardScNotify = 1232; + public static final int TakePrestigeRewardCsReq = 4780; + public static final int EnterSceneByServerScNotify = 1452; + public static final int UnlockSkilltreeScRsp = 348; + public static final int EnterAetherDivideSceneCsReq = 4889; + public static final int TextJoinQueryCsReq = 3871; + public static final int SelectRogueBuffScRsp = 1880; + public static final int AcceptExpeditionScRsp = 2570; + public static final int PlayerReturnTakePointRewardScRsp = 4548; + public static final int SyncRogueBuffDropInfoScNotify = 5636; + public static final int UpgradeAreaCsReq = 4359; + public static final int SwitchAetherDivideLineUpSlotCsReq = 4850; + public static final int MarkItemCsReq = 515; + public static final int AcceptMissionEventCsReq = 1238; + public static final int ExchangeRogueBuffWithMiracleCsReq = 5650; + public static final int GetAllLineupDataScRsp = 784; + public static final int GetPunkLordDataCsReq = 3265; + public static final int PlayerLogoutCsReq = 71; + public static final int TakeBpRewardCsReq = 3070; + public static final int SelectRogueDialogueEventScRsp = 1803; + public static final int CancelMarkItemNotify = 518; + public static final int TakeChallengeRewardCsReq = 1756; + public static final int FinishTutorialGuideScRsp = 1663; + public static final int ChessRogueStartScRsp = 5506; + public static final int EnterRogueMapRoomCsReq = 1890; + public static final int GetPunkLordBattleRecordCsReq = 3202; + public static final int ChessRogueUpdateAeonModifierValueScNotify = 5485; + public static final int GetLoginChatInfoScRsp = 3965; + public static final int SetCurInteractEntityCsReq = 1436; + public static final int EnterTrialActivityStageScRsp = 2673; + public static final int RogueNpcDisappearCsReq = 5663; + public static final int PickRogueAvatarScRsp = 1846; + public static final int GetMissionEventDataScRsp = 1265; + public static final int GetRogueTalentInfoScRsp = 1801; + public static final int BattleLogReportCsReq = 193; + public static final int UpdatePlayerSettingScRsp = 23; + public static final int StartFinishSubMissionScNotify = 1225; + public static final int TakeRogueEventHandbookRewardScRsp = 1858; + public static final int StartChallengeScRsp = 1770; + public static final int FinishFirstTalkNpcScRsp = 2197; + public static final int FeatureSwitchClosedScNotify = 53; + public static final int GameplayCounterCountDownScRsp = 1426; + public static final int SyncEntityBuffChangeListScNotify = 1459; + public static final int StartAetherDivideSceneBattleScRsp = 4848; + public static final int TakeRogueEndlessActivityAllBonusRewardScRsp = 6028; + public static final int MuseumRandomEventSelectCsReq = 4345; + public static final int FinishTutorialCsReq = 1628; + public static final int AlleyTakeEventRewardScRsp = 4742; + public static final int PunkLordBattleResultScNotify = 3243; + public static final int BuyRogueShopBuffScRsp = 5680; + public static final int TakeOffEquipmentScRsp = 363; + public static final int GetChessRogueStoryAeonTalkInfoCsReq = 5443; + public static final int LastSpringRefreshTimeNotify = 1404; + public static final int CurAssistChangedNotify = 2979; + public static final int GetFriendApplyListInfoCsReq = 2932; + public static final int OpenRogueChestCsReq = 1873; + public static final int TakeOffEquipmentCsReq = 380; + public static final int DeleteFriendCsReq = 2959; + public static final int GetAvatarDataCsReq = 389; + public static final int ExpUpRelicScRsp = 565; + public static final int ChallengeLineupNotify = 1763; + public static final int SwapLineupScRsp = 793; + public static final int GetSpringRecoverDataCsReq = 1457; + public static final int BuyBpLevelScRsp = 3088; + public static final int AvatarExpUpScRsp = 370; + public static final int ComposeSelectedRelicCsReq = 533; + public static final int ChangeLineupLeaderScRsp = 756; + public static final int GetVideoVersionKeyScRsp = 52; + public static final int DelMailScRsp = 848; + public static final int MarkReadMailCsReq = 871; + public static final int SyncRogueAreaUnlockScNotify = 1810; + public static final int GetEnteredSceneCsReq = 1467; + public static final int GetQuestDataCsReq = 989; + public static final int SyncLineupNotify = 780; + public static final int ChessRogueLayerAccountInfoNotify = 5598; + public static final int EnterAetherDivideSceneScRsp = 4855; + public static final int AcceptMissionEventScRsp = 1250; + public static final int EnhanceChessRogueBuffScRsp = 5522; + public static final int GetLevelRewardScRsp = 40; + public static final int DressRelicAvatarCsReq = 365; + public static final int SceneEntityTeleportCsReq = 1498; + public static final int FinishFirstTalkByPerformanceNpcScRsp = 2168; + public static final int AlleyPlacingGameScRsp = 4768; + public static final int PlayerReturnStartScNotify = 4589; + public static final int GetPhoneDataScRsp = 5155; + public static final int EnterRogueMapRoomScRsp = 1879; + public static final int ChessRogueQuitScRsp = 5561; + public static final int ComposeSelectedRelicScRsp = 540; + public static final int GetPunkLordBattleRecordScRsp = 3281; + public static final int GetSaveRaidCsReq = 2256; + public static final int GetLoginChatInfoCsReq = 3956; + public static final int SetForbidOtherApplyFriendCsReq = 2985; + public static final int CancelExpeditionScRsp = 2548; + public static final int SetGameplayBirthdayCsReq = 5; + public static final int SetCurInteractEntityScRsp = 1402; + public static final int ChessRogueGiveUpRollCsReq = 5440; + public static final int InterruptMissionEventScRsp = 1243; + public static final int GetTutorialGuideCsReq = 1671; + public static final int GetCurLineupDataCsReq = 771; + public static final int EnterFantasticStoryActivityStageCsReq = 4970; + public static final int GetCurBattleInfoCsReq = 132; + public static final int DoGachaCsReq = 1971; + public static final int GetPlayerReturnMultiDropInfoCsReq = 4670; + public static final int GetAllRedDotDataCsReq = 5989; + public static final int GetMainMissionCustomValueCsReq = 1281; + public static final int ChessRogueQueryCsReq = 5456; + public static final int GetSceneMapInfoCsReq = 1494; + public static final int FinishCurTurnScRsp = 4363; + public static final int EquipAetherDividePassiveSkillScRsp = 4865; + public static final int GetDailyActiveInfoCsReq = 3371; + public static final int ChallengeSettleNotify = 1788; + public static final int SyncRogueStatusScNotify = 1851; + public static final int PromoteAvatarCsReq = 388; + public static final int BattlePassInfoNotify = 3089; + public static final int CancelActivityExpeditionCsReq = 2563; + public static final int SetIsDisplayAvatarInfoScRsp = 2897; + public static final int PickRogueAvatarCsReq = 1865; + public static final int GetRogueShopMiracleInfoScRsp = 5632; + public static final int StartCocoonStageCsReq = 1442; + public static final int GetFantasticStoryActivityDataCsReq = 4989; + public static final int AetherDivideTakeChallengeRewardScRsp = 4818; + public static final int EntityBindPropCsReq = 1439; + public static final int GetShopListCsReq = 1589; + public static final int GetArchiveDataCsReq = 2389; + public static final int GetShopListScRsp = 1555; + public static final int PrestigeLevelUpCsReq = 4784; + public static final int FinishChallengeScRsp = 1728; + public static final int SyncRogueVirtualItemInfoScNotify = 1875; + public static final int GameplayCounterUpdateScNotify = 1461; + public static final int ChessRogueQuestFinishNotify = 5596; + public static final int SyncChessRogueMainStoryFinishScNotify = 5489; + public static final int AcceptMainMissionCsReq = 1236; + public static final int DropChessRogueBuffScRsp = 5535; + public static final int TextJoinQueryScRsp = 3870; + public static final int MuseumFundsChangedScNotify = 4338; + public static final int GetCurAssistScRsp = 2983; + public static final int GetHeroBasicTypeInfoCsReq = 81; + public static final int TriggerHealVoiceCsReq = 4188; + public static final int RogueModifierDelNotify = 5328; + public static final int ExchangeRogueRewardKeyScRsp = 1895; + public static final int GetMarkItemListScRsp = 583; + public static final int GetChallengeRaidInfoScRsp = 2288; + public static final int DressAvatarSkinCsReq = 345; + public static final int DressAvatarSkinScRsp = 343; + public static final int GetAllLineupDataCsReq = 704; + public static final int GetAvatarDataScRsp = 355; + public static final int ExpUpEquipmentCsReq = 580; + public static final int SceneCastSkillCsReq = 1432; + public static final int SyncChessRogueBuffReforgeInfoScNotify = 5597; + public static final int EnterAdventureScRsp = 1355; + public static final int SyncRogueMiracleHandbookScNotify = 1827; + public static final int UseTreasureDungeonItemCsReq = 4484; + public static final int StartAetherDivideStageBattleScRsp = 4845; + public static final int CancelCacheNotifyCsReq = 4128; + public static final int RemoveStuffFromAreaScRsp = 4397; + public static final int AcceptExpeditionCsReq = 2571; + public static final int LogisticsGameScRsp = 4770; + public static final int UpdateRedDotDataScRsp = 5970; + public static final int ClearAetherDividePassiveSkillScRsp = 4838; + public static final int GetMissionStatusScRsp = 1284; + public static final int AcceptActivityExpeditionCsReq = 2593; + public static final int AetherDivideSkillItemScNotify = 4849; + public static final int UnlockBackGroundMusicCsReq = 3132; + public static final int RefreshTriggerByClientCsReq = 1406; + public static final int SwapLineupCsReq = 728; + public static final int StartAetherDivideChallengeBattleCsReq = 4888; + public static final int FinishRogueDialogueGroupCsReq = 1811; + public static final int LogisticsGameCsReq = 4771; + public static final int PlayerReturnTakeRewardScRsp = 4597; + public static final int MuseumRandomEventStartScNotify = 4350; + public static final int GetAssistListScRsp = 2949; + public static final int ComposeItemScRsp = 568; + public static final int MarkReadMailScRsp = 870; + public static final int SwapRogueBuffScRsp = 1849; + public static final int RemoveRogueBuffScNotify = 1830; + public static final int TakeRogueEndlessActivityAllBonusRewardCsReq = 6097; + public static final int TakeCityShopRewardScRsp = 1548; + public static final int RefreshTriggerByClientScRsp = 1401; + public static final int RogueModifierStageStartNotify = 5393; + public static final int SetGameplayBirthdayScRsp = 12; + public static final int RogueModifierSelectCellCsReq = 5370; + public static final int RepairChessRogueMiracleScRsp = 5425; + public static final int PlayerReturnForceFinishScNotify = 4580; + public static final int JoinLineupCsReq = 732; + public static final int ChessRogueConfirmRollCsReq = 5411; + public static final int MuseumRandomEventQueryCsReq = 4304; + public static final int SyncRogueBonusSelectInfoScNotify = 1876; + public static final int PlayerHeartBeatCsReq = 37; + public static final int UpdateRedDotDataCsReq = 5971; + public static final int GetPlatformPlayerInfoScRsp = 2935; + public static final int StartPunkLordRaidCsReq = 3271; + public static final int GetPlatformPlayerInfoCsReq = 2972; + public static final int ExpUpRelicCsReq = 556; + public static final int GetNpcMessageGroupCsReq = 2789; + public static final int StartAlleyEventCsReq = 4788; + public static final int GetBasicInfoScRsp = 91; + public static final int GetGachaInfoScRsp = 1955; + public static final int SelectRogueMiracleScRsp = 1839; + public static final int SetClientPausedCsReq = 1479; + public static final int PVEBattleResultCsReq = 189; + public static final int PVEBattleResultScRsp = 155; + public static final int FinishQuestCsReq = 993; + public static final int GetPlayerBoardDataScRsp = 2855; + public static final int MuseumDispatchFinishedScNotify = 4333; + public static final int ChessRogueUpdateUnlockLevelScNotify = 5599; + public static final int RogueEndlessActivityBattleEndScNotify = 6032; + public static final int GetCurLineupDataScRsp = 770; + public static final int ExchangeStaminaCsReq = 68; + public static final int RaidInfoNotify = 2232; + public static final int SummonPunkLordMonsterCsReq = 3288; + public static final int TakeMonsterResearchActivityRewardCsReq = 2684; + public static final int ChessRogueEnterScRsp = 5562; + public static final int GetChallengeRaidInfoCsReq = 2248; + public static final int SetAssistAvatarScRsp = 2859; + public static final int SetLanguageCsReq = 9; + public static final int GetHeroBasicTypeInfoScRsp = 83; + public static final int GetCurBattleInfoScRsp = 148; + public static final int TakeExpeditionRewardScRsp = 2597; + public static final int TakeAllApRewardCsReq = 3348; + public static final int TakePrestigeRewardScRsp = 4763; + public static final int EnterRogueScRsp = 1848; + public static final int SceneEntityMoveScNotify = 1480; + public static final int ChessRogueQueryAeonDimensionsCsReq = 5465; + public static final int TradeChessRogueMiracleCsReq = 5415; + public static final int RollRogueBuffCsReq = 1863; + public static final int GmTalkCsReq = 93; + public static final int UpdateRogueMiracleScNotify = 1898; + public static final int EnterFightActivityStageCsReq = 3670; + public static final int UnlockTutorialScRsp = 1648; + public static final int LeaveTrialActivityCsReq = 2653; + public static final int FinishAeonDialogueGroupScRsp = 1862; + public static final int DropRogueBuffCsReq = 5602; + public static final int VirtualLineupDestroyNotify = 745; + public static final int EnableRogueTalentScRsp = 1819; + public static final int SelectRogueBuffCsReq = 1893; + public static final int SyncRogueRewardInfoScNotify = 1817; + public static final int GetJukeboxDataCsReq = 3189; + public static final int SetHeroBasicTypeScRsp = 2; + public static final int GetFantasticStoryActivityDataScRsp = 4955; + public static final int TakeChapterRewardCsReq = 497; + public static final int GetExhibitScNotify = 4393; + public static final int GetFirstTalkNpcScRsp = 2148; + public static final int TrainVisitorRewardSendNotify = 3748; + public static final int AcceptActivityExpeditionScRsp = 2580; + public static final int SelectChessRogueBuffScRsp = 5430; + public static final int SetAetherDivideLineUpCsReq = 4859; + public static final int BuyRogueShopMiracleScRsp = 5628; + public static final int PlayBackGroundMusicScRsp = 3170; + public static final int TextJoinSaveCsReq = 3889; + public static final int SyncApplyFriendScNotify = 2928; + public static final int StartAlleyEventScRsp = 4797; + public static final int SearchPlayerScRsp = 2909; + public static final int SyncHandleFriendScNotify = 2963; + public static final int BattleLogReportScRsp = 180; + public static final int MuseumInfoChangedScNotify = 4346; + public static final int OpenRogueChestScRsp = 1899; + public static final int SetTurnFoodCsReq = 539; + public static final int GetRogueShopMiracleInfoCsReq = 5670; + public static final int GetMissionEventDataCsReq = 1256; + public static final int TakeApRewardCsReq = 3389; + public static final int TakeTalkRewardCsReq = 2171; + public static final int LeaveAetherDivideSceneCsReq = 4871; + public static final int RollRogueBuffScRsp = 1859; + public static final int EnterAdventureCsReq = 1389; + public static final int ExpUpEquipmentScRsp = 563; + public static final int MuseumTakeCollectRewardScRsp = 4325; + public static final int SyncChessRogueMiracleSelectInfoScNotify = 5565; + public static final int GetRogueTalentInfoCsReq = 1806; + public static final int MissionGroupWarnScNotify = 1263; + public static final int TakeRogueAeonLevelRewardScRsp = 1900; + public static final int SyncRogueMiracleTradeInfoScNotify = 1887; + public static final int GetRogueInfoScRsp = 1855; + public static final int SubmitMonsterResearchActivityMaterialCsReq = 2650; + public static final int GetMarkItemListCsReq = 581; + public static final int HandleFriendScRsp = 2980; + public static final int ShareCsReq = 4189; + public static final int GetSecretKeyInfoCsReq = 64; + public static final int GetEnteredSceneScRsp = 1474; + public static final int GetChatEmojiListCsReq = 3928; + public static final int TakeQuestOptionalRewardScRsp = 959; + public static final int FinishItemIdScRsp = 2748; + public static final int ScenePlaneEventScNotify = 1410; + public static final int ChessRogueQueryBpScRsp = 5410; + public static final int FinishFirstTalkByPerformanceNpcCsReq = 2159; + public static final int EnterFightActivityStageScRsp = 3632; + public static final int GetWaypointCsReq = 489; + public static final int ChallengeRaidNotify = 2293; + public static final int AlleyShipmentEventEffectsScNotify = 4725; + public static final int TakeAssistRewardCsReq = 2939; + public static final int SearchPlayerCsReq = 2930; + public static final int ReplaceChessRogueMiracleDisplayScNotify = 5543; + public static final int GetMuseumInfoScRsp = 4355; + public static final int CancelExpeditionCsReq = 2532; + public static final int RogueChallengeBattleResultScNotify = 2635; + public static final int StartAetherDivideChallengeBattleScRsp = 4897; + public static final int PrestigeLevelUpScRsp = 4745; + public static final int GetAetherDivideChallengeInfoCsReq = 4892; + public static final int DeleteBlacklistScRsp = 2992; + public static final int GetBagCsReq = 589; + public static final int EnterRogueCsReq = 1832; + public static final int GetPlayerDetailInfoScRsp = 2970; + public static final int AlleyPlacingGameCsReq = 4759; + public static final int SetLanguageScRsp = 25; + public static final int ReturnLastTownScRsp = 1445; + public static final int GetShareDataScRsp = 4170; + public static final int LeaveRogueCsReq = 1888; + public static final int GetChessRogueStoryAeonTalkInfoScRsp = 5480; + public static final int RogueChallengeActivityDataCsReq = 2643; + public static final int ChessRogueChangeyAeonDimensionNotify = 5592; + public static final int GetTutorialGuideScRsp = 1670; + public static final int PlayBackGroundMusicCsReq = 3171; + public static final int SetHeroBasicTypeCsReq = 36; + public static final int AddEquipmentScNotify = 592; + public static final int LockEquipmentScRsp = 548; + public static final int ReforgeChessRogueBuffCsReq = 5600; + public static final int ChessRogueCellUpdateNotify = 5514; + public static final int SharePunkLordMonsterCsReq = 3232; + public static final int RecoverAllLineupCsReq = 1481; + public static final int FinishRogueDialogueGroupScRsp = 1814; + public static final int ChessRogueQuitCsReq = 5533; + public static final int EnhanceRogueBuffCsReq = 1840; + public static final int GetQuestRecordScRsp = 997; + public static final int AlleyEventChangeNotify = 4728; + public static final int GetKilledPunkLordMonsterDataCsReq = 3233; + public static final int SetDisplayAvatarCsReq = 2832; + public static final int InteractTreasureDungeonGridScRsp = 4404; + public static final int ChessRogueEnterNextLayerScRsp = 5525; + public static final int TakeFightActivityRewardScRsp = 3688; + public static final int AlleyFundsScNotify = 4743; + public static final int SyncRogueAdventureRoomInfoScNotify = 5689; + public static final int GetUpdatedArchiveDataScRsp = 2370; + public static final int TakeKilledPunkLordMonsterScoreScRsp = 3249; + public static final int ApplyFriendCsReq = 2988; + public static final int SubmitMonsterResearchActivityMaterialScRsp = 2604; + public static final int ReplaceLineupCsReq = 743; + public static final int QueryProductInfoCsReq = 34; + public static final int GetPlayerBoardDataCsReq = 2889; + public static final int UnlockAvatarSkinScNotify = 392; + public static final int TakeTalkRewardScRsp = 2170; + public static final int GetReplayTokenCsReq = 3589; + public static final int GetChallengeCsReq = 1789; } \ No newline at end of file diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerPlayerGetTokenCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerPlayerGetTokenCsReq.java index 1933431..63c24df 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerPlayerGetTokenCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerPlayerGetTokenCsReq.java @@ -20,7 +20,7 @@ public class HandlerPlayerGetTokenCsReq extends PacketHandler { var req = PlayerGetTokenCsReq.parseFrom(data); // Authenticate - Account account = LunarRail.getAccountDatabase().getObjectByField(Account.class, "_id", req.getUid()); + Account account = LunarRail.getAccountDatabase().getObjectByField(Account.class, "_id", req.getAccountUid()); if (account == null || !account.getComboToken().equals(req.getToken())) { return; } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerSceneCastSkillCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerSceneCastSkillCsReq.java index c8815b8..9155e6a 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerSceneCastSkillCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerSceneCastSkillCsReq.java @@ -20,7 +20,7 @@ public class HandlerSceneCastSkillCsReq extends PacketHandler { boolean castedSkill = false; // Check if player casted a maze skill - if (req.getSkillIndex() > 0 && session.getPlayer().getScene().getAvatarEntityIds().contains(req.getAttackerId())) { + if (req.getSkillIndex() > 0 && session.getPlayer().getScene().getAvatarEntityIds().contains(req.getCasterId())) { // Spend one skill point session.getPlayer().getCurrentLineup().removeMp(1); session.send(new PacketSceneCastSkillMpUpdateScNotify(req.getAttackedGroupId(), session.getPlayer().getLineupManager().getMp())); @@ -35,7 +35,7 @@ public class HandlerSceneCastSkillCsReq extends PacketHandler { } if (req.hasAttackedEntityIdList()) { - session.getServer().getBattleService().startBattle(session.getPlayer(), req.getAttackerId(), req.getAttackedGroupId(), castedSkill, req.getAttackedEntityIdList()); + session.getServer().getBattleService().startBattle(session.getPlayer(), req.getCasterId(), req.getAttackedGroupId(), castedSkill, req.getAttackedEntityIdList()); } else { session.send(new PacketSceneCastSkillScRsp(req.getAttackedGroupId())); } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketPVEBattleResultScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketPVEBattleResultScRsp.java index 119f719..60717cb 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketPVEBattleResultScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketPVEBattleResultScRsp.java @@ -32,6 +32,7 @@ public class PacketPVEBattleResultScRsp extends BasePacket { // Battle result var data = PVEBattleResultScRsp.newInstance() .setUnk1(ItemList.newInstance()) + .setUnk2(ItemList.newInstance()) .setUnk3(ItemList.newInstance()) .setDropData(dropData) .setResVersion(Integer.toString(req.getClientResVersion())) diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSetHeadIconScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSetHeadIconScRsp.java index 6810e78..c34e954 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSetHeadIconScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSetHeadIconScRsp.java @@ -19,7 +19,7 @@ public class PacketSetHeadIconScRsp extends BasePacket { super(CmdId.SetHeadIconScRsp); var data = SetHeadIconScRsp.newInstance() - .setId(headIconId); + .setCurrentHeadIconId(headIconId); this.setData(data); }